From 367a74503f1558e0bbd7c767468e293baf9e9950 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Fri, 14 Feb 2025 17:10:05 +0800
Subject: [PATCH] fix: Fix the problem of duplicate content display in the
 model list (#7872)

---
 backend/app/service/ai_tool.go                |  4 ++--
 backend/app/service/website_utils.go          | 24 +++++++++----------
 frontend/src/views/ai-tools/model/index.vue   |  8 ++++++-
 .../views/container/repo/operator/index.vue   |  2 +-
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/backend/app/service/ai_tool.go b/backend/app/service/ai_tool.go
index 47a075e0c..655dc8a8b 100644
--- a/backend/app/service/ai_tool.go
+++ b/backend/app/service/ai_tool.go
@@ -3,7 +3,6 @@ package service
 import (
 	"context"
 	"fmt"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
 	"io"
 	"os"
 	"os/exec"
@@ -11,6 +10,7 @@ import (
 	"strings"
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
+	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
 	"github.com/1Panel-dev/1Panel/backend/buserr"
 	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/1Panel-dev/1Panel/backend/global"
@@ -56,7 +56,7 @@ func (u *AIToolService) Search(req dto.SearchWithPage) (int64, []dto.OllamaModel
 		if parts[0] == "NAME" {
 			continue
 		}
-		modelMaps[parts[0]] = struct{}{}
+		modelMaps[strings.ReplaceAll(parts[0], ":", "-")] = struct{}{}
 		list = append(list, dto.OllamaModelInfo{Name: parts[0], Size: parts[2] + " " + parts[3], Modified: strings.Join(parts[4:], " ")})
 	}
 	entries, _ := os.ReadDir(path.Join(global.CONF.System.DataDir, "log", "AITools"))
diff --git a/backend/app/service/website_utils.go b/backend/app/service/website_utils.go
index 3f3987119..fe4226303 100644
--- a/backend/app/service/website_utils.go
+++ b/backend/app/service/website_utils.go
@@ -1150,17 +1150,17 @@ func GetAllowIps(website model.Website) []string {
 }
 
 func ConfigAIProxy(website model.Website) error {
-	nginxFull, err := getNginxFull(&website)
-	if err != nil {
-		return nil
-	}
-	config := nginxFull.SiteConfig.Config
-	server := config.FindServers()[0]
-	dirs := server.GetDirectives()
-	for _, dir := range dirs {
-		if dir.GetName() == "location" && dir.GetParameters()[0] == "/" {
-			server.UpdateRootProxy()
-		}
-	}
+	// nginxFull, err := getNginxFull(&website)
+	// if err != nil {
+	// 	return nil
+	// }
+	// config := nginxFull.SiteConfig.Config
+	// server := config.FindServers()[0]
+	// dirs := server.GetDirectives()
+	// for _, dir := range dirs {
+	// 	if dir.GetName() == "location" && dir.GetParameters()[0] == "/" {
+	// 		// server.UpdateRootProxy()
+	// 	}
+	// }
 	return nil
 }
diff --git a/frontend/src/views/ai-tools/model/index.vue b/frontend/src/views/ai-tools/model/index.vue
index 0824f3a41..daf4efbab 100644
--- a/frontend/src/views/ai-tools/model/index.vue
+++ b/frontend/src/views/ai-tools/model/index.vue
@@ -58,9 +58,15 @@
                 >
                     <el-table-column :label="$t('commons.table.name')" prop="name" min-width="90">
                         <template #default="{ row }">
-                            <el-text type="primary" class="cursor-pointer" @click="onLoad(row.name)">
+                            <el-text
+                                v-if="row.size !== '-'"
+                                type="primary"
+                                class="cursor-pointer"
+                                @click="onLoad(row.name)"
+                            >
                                 {{ row.name }}
                             </el-text>
+                            <span v-else>{{ row.name }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column :label="$t('file.size')" prop="size" />
diff --git a/frontend/src/views/container/repo/operator/index.vue b/frontend/src/views/container/repo/operator/index.vue
index 5611b3988..6c4c7df4c 100644
--- a/frontend/src/views/container/repo/operator/index.vue
+++ b/frontend/src/views/container/repo/operator/index.vue
@@ -54,7 +54,7 @@
                             :placeholder="'172.16.10.10:8081'"
                         ></el-input>
                         <span v-if="dialogData.rowData!.downloadUrl" class="input-help">
-                            Pull example: docker pull {{ dialogData.rowData!.downloadUrl }}/nginx
+                            docker pull {{ dialogData.rowData!.downloadUrl }}/nginx
                         </span>
                     </el-form-item>
                     <el-form-item :label="$t('commons.table.protocol')" prop="protocol">