From 77b19beab286461c4434da2f78467e1c18586f3d Mon Sep 17 00:00:00 2001 From: godo Date: Fri, 22 Nov 2024 21:42:44 +0800 Subject: [PATCH] change download model --- frontend/src/assets/list.scss | 7 +- frontend/src/components/ai/aimodel.vue | 54 +++++---- frontend/src/stores/model.ts | 161 ++++++++++++++----------- godo/model/data.go | 2 +- 4 files changed, 126 insertions(+), 98 deletions(-) diff --git a/frontend/src/assets/list.scss b/frontend/src/assets/list.scss index 1a8ddca..d1d346e 100644 --- a/frontend/src/assets/list.scss +++ b/frontend/src/assets/list.scss @@ -54,7 +54,12 @@ $shadow-color: rgba(0, 0, 0, 0.1); // 阴影颜色 margin-left: 24px; margin-right: 24px; // 增加外边距 } - +.ml-10{ + margin-left: 10px; +} +.mr-10{ + margin-right: 10px; +} .font-weight-bold { font-weight: bold; font-size: 18px; // 增大字体大小 diff --git a/frontend/src/components/ai/aimodel.vue b/frontend/src/components/ai/aimodel.vue index 361ab3d..7c36de1 100644 --- a/frontend/src/components/ai/aimodel.vue +++ b/frontend/src/components/ai/aimodel.vue @@ -18,10 +18,6 @@ const labelId = ref(0); const searchKey = ref(""); const currentCate = ref("all"); -const help_label = ref(); -const help_adddown = ref(); -const help_addlabel = ref(); -const help_showdown = ref(); const showDetail = ref(false); const detailModel = ref("") let downloadAbort:any = {}; @@ -40,15 +36,17 @@ function downAddUpdate(val:any) { } async function downLabel(modelData:any, labelData:any) { labelData = toRaw(labelData); + modelData = toRaw(modelData); + //console.log(modelData, labelData) const saveData = { model: modelData.model, label: labelData.name, action: labelData.action, - engine: labelData.engine, - url: modelData.url ?? [], - from: modelData.from ? modelData.from : labelData.from, + engine: modelData.info.engine, + url: modelData.info.url ?? [], + from: modelData.info.from, type: modelData.type ?? "", - file_name: modelData.file_name ?? "", + file_name: modelData.info.file_name ?? "", //options: modelData.options ?? {}, params: modelData.params ?? {}, info: modelData.info ?? {}, @@ -66,7 +64,7 @@ async function saveBox(modelData: any) { async function download(saveData:any) { saveData = toRaw(saveData); saveData.info = toRaw(saveData.info); - saveData.url = toRaw(saveData.url); + //saveData.url = toRaw(saveData.url); saveData.params = toRaw(saveData.params); downAdd.value = false; downLeft.value = true; @@ -76,7 +74,7 @@ async function download(saveData:any) { return; } //console.log(saveData); - const downUrl = config.modelDownApi; + const downUrl = config.apiUrl + "/ai/download"; try { const completion = await fetch(downUrl, { @@ -126,6 +124,7 @@ async function handleDown(modelData:any, completion:any) { const rawjson = new TextDecoder().decode(value); //console.log(rawjson); const msg = modelStore.parseMsg(rawjson); + //console.log(msg) if(msg.message && msg.code) { notifyError(msg.message); break; @@ -134,9 +133,14 @@ async function handleDown(modelData:any, completion:any) { continue; } modelData.status = msg.status; + if (msg.total && msg.completed && msg.total > 0) { - modelData.isLoading = 1; - modelData.progress = Math.ceil((msg.completed / msg.total) * 100); + if(msg.total == msg.completed){ + msg.status = "success" + }else{ + modelData.isLoading = 1; + modelData.progress = Math.ceil((msg.completed / msg.total) * 100); + } } else { modelData.progress = 0; } @@ -165,13 +169,9 @@ async function deleteModel(modelData: any) { //return const postData = { method: "POST", - body: JSON.stringify({ - url: modelData.url, - model: modelData.model, - engine: modelData.engine, - }), + body: JSON.stringify(modelData.info), }; - const delUrl = config.modelDeleteApi; + const delUrl = config.apiUrl + "/ai/delete"; const completion = await fetch(delUrl, postData); if (completion.status === 404) { notifyError(completion.statusText); @@ -246,7 +246,7 @@ function showModel(model: string) {
{{ val.model }}
-
+
- {{ val.status }} + {{ val.status }} @@ -310,15 +310,19 @@ function showModel(model: string) { @click.stop="downLeft = !downLeft" icon="Menu" circle - ref="help_showdown" /> - + + +