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 @@ > 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'" > - Pull example: docker pull {{ dialogData.rowData!.downloadUrl }}/nginx + docker pull {{ dialogData.rowData!.downloadUrl }}/nginx