From 59bb691f3b9a84bb392c969e73f131ecb7674b4f Mon Sep 17 00:00:00 2001
From: shaohuzhang1 <shaohu.zhang@fit2cloud.com>
Date: Fri, 22 Mar 2024 19:58:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A8=A1=E5=9E=8B=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/views/template/component/ModelCard.vue | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/ui/src/views/template/component/ModelCard.vue b/ui/src/views/template/component/ModelCard.vue
index 1192b829f..ee0abc1cb 100644
--- a/ui/src/views/template/component/ModelCard.vue
+++ b/ui/src/views/template/component/ModelCard.vue
@@ -6,9 +6,9 @@
         <auto-tooltip :content="model.name" style="max-width: 40%">
           {{ model.name }}
         </auto-tooltip>
-        <div class="flex align-center" v-if="model.status === 'ERROR'">
+        <div class="flex align-center" v-if="currentModel.status === 'ERROR'">
           <el-tag type="danger" class="ml-8">失败</el-tag>
-          <el-tooltip effect="dark" :content="model?.meta?.message" placement="top">
+          <el-tooltip effect="dark" :content="errMessage" placement="top">
             <el-icon class="danger ml-4" size="20"><Warning /></el-icon>
           </el-tooltip>
         </div>
@@ -28,9 +28,7 @@
       </ul>
     </div>
     <!-- progress -->
-    <div class="progress-mask" v-if="model.status === 'DOWNLOAD'">
-      <!-- <el-progress type="circle" :percentage="progress" />
-      <p>正在下载 <span class="dotting"></span></p> -->
+    <div class="progress-mask" v-if="currentModel.status === 'DOWNLOAD'">
       <el-progress type="dashboard" :percentage="progress" class="percentage">
         <template #default="{ percentage }">
           <span class="percentage-value">{{ percentage }}%</span>
@@ -44,7 +42,7 @@
         <el-tooltip effect="dark" content="修改" placement="top">
           <el-button text @click.stop="openEditModel">
             <el-icon>
-              <component :is="model.status === 'ERROR' ? 'RefreshRight' : 'EditPen'" />
+              <component :is="currentModel.status === 'ERROR' ? 'RefreshRight' : 'EditPen'" />
             </el-icon>
           </el-button>
         </el-tooltip>
@@ -72,13 +70,31 @@ const props = defineProps<{
 }>()
 const downModel = ref<Model>()
 
-const progress = computed(() => {
+const currentModel = computed(() => {
   if (downModel.value) {
-    const down_model_chunk = downModel.value.meta['down_model_chunk']
+    return downModel.value
+  } else {
+    return props.model
+  }
+})
+
+const errMessage = computed(() => {
+  if (currentModel.value.meta && currentModel.value.meta.message) {
+    if (currentModel.value.meta.message === 'pull model manifest: file does not exist') {
+      return `${currentModel.value.model_name} 模型在Ollama不存在`
+    }
+    return currentModel.value.meta.message
+  }
+})
+const progress = computed(() => {
+  if (currentModel.value) {
+    const down_model_chunk = currentModel.value.meta['down_model_chunk']
     if (down_model_chunk) {
-      const maxObj = down_model_chunk.reduce((prev: any, current: any) => {
-        return (prev.index || 0) > (current.index || 0) ? prev : current
-      })
+      const maxObj = down_model_chunk
+        .filter((chunk: any) => chunk.index > 1)
+        .reduce((prev: any, current: any) => {
+          return (prev.index || 0) > (current.index || 0) ? prev : current
+        })
       return maxObj.progress?.toFixed(1)
     }
     return 0
@@ -115,7 +131,7 @@ const icon = computed(() => {
  */
 const initInterval = () => {
   interval = setInterval(() => {
-    if (props.model.status === 'DOWNLOAD') {
+    if (currentModel.value.status === 'DOWNLOAD') {
       ModelApi.getModelMetaById(props.model.id).then((ok) => {
         downModel.value = ok.data
       })