Merge remote-tracking branch 'origin/model-refactor' into zouap_dev

Signed-off-by: zouap <zouap@pcl.ac.cn>

models/ai_model_manage.go

@@ -1370,8 +1370,8 @@ const (
 	AimodelSearchOrferByDerivative    AimodelSearchOrder = "derivative_count DESC,name ASC"
 	AimodelSearchOrderBySizeAsc       AimodelSearchOrder = "size ASC,name ASC"
 	AimodelSearchOrderBySizeDesc      AimodelSearchOrder = "size DESC,name ASC"
-	AimodelSearchOrderByAliasAsc      AimodelSearchOrder = "alias ASC COLLATE 'zh_CN', id ASC"
-	AimodelSearchOrderByAliasDesc     AimodelSearchOrder = "alias DESC COLLATE 'zh_CN', id ASC"
+	AimodelSearchOrderByAliasAsc      AimodelSearchOrder = `alias COLLATE "zh-x-icu" ASC, id ASC`
+	AimodelSearchOrderByAliasDesc     AimodelSearchOrder = `alias COLLATE "zh-x-icu" DESC, id ASC`
 )
 
 func (d AimodelSearchOrder) String() string {

models/dataset_registry.go

@@ -105,8 +105,8 @@ const (
 	DatasetSearchOrderByUseCount       DatasetSearchOrder = "use_count DESC,name ASC"
 	DatasetSearchOrderBySizeAsc        DatasetSearchOrder = "size ASC,name ASC"
 	DatasetSearchOrderBySizeDesc       DatasetSearchOrder = "size DESC,name ASC"
-	DatasetSearchOrderByAliasAsc       DatasetSearchOrder = "alias ASC COLLATE 'zh_CN', id ASC"
-	DatasetSearchOrderByAliasDesc      DatasetSearchOrder = "alias DESC COLLATE 'zh_CN', id ASC"
+	DatasetSearchOrderByAliasAsc       DatasetSearchOrder = `alias COLLATE "zh-x-icu" ASC, id ASC`
+	DatasetSearchOrderByAliasDesc      DatasetSearchOrder = `alias COLLATE "zh-x-icu" DESC, id ASC`
 )
 
 const (

models/user_business_analysis.go

@@ -2496,7 +2496,7 @@ func queryUserModel(start_unix int64, end_unix int64) map[int64]int {
 	var indexTotal int64
 	indexTotal = 0
 	for {
-		sess.Select("id,user_id").Table("ai_model_manage").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
+		sess.Select("id,owner_id").Table("ai_model_manage").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
 		aiModelList := make([]*AiModelManage, 0)
 		sess.Find(&aiModelList)
 		log.Info("query AiModelManage size=" + fmt.Sprint(len(aiModelList)))

options/locale/locale_en-US.ini

@@ -3429,9 +3429,13 @@ task_c2net_gpudebugjob1=`created ILUVATAR-GPGPU type debugging task <a href="%s/
 task_c2net_gpudebugjob2=`created METAX-GPGPU type debugging task <a href="%s/grampus/notebook/%s">%s</a>`
 task_c2ent_onlineinferjob=`created GPU type online inference task <a href="%s/grampus/onlineinfer/%s">%s</a>`
 task_c2ent_modelexperience=`created %s type online experience task <a href="%s/%s">%s</a>`
+task_c2ent_modelexperience_d=`created online experience task <a href="%s/%s">%s</a>`
 task_c2ent_loratrain=`created %s type CV fineunte task <a href="%s/%s">%s</a>`
+task_c2ent_loratrain_d=`created CV fineunte task <a href="%s/%s">%s</a>`
 task_c2ent_comfyui=`created %s type Comfy UI task <a href="%s/%s">%s</a>`
+task_c2ent_comfyui_d=`created Comfy UI task <a href="%s/%s">%s</a>`
 task_c2ent_sftfinetune=`created %s type NLP fineunte task <a href="%s/%s">%s</a>`
+task_c2ent_sftfinetune_d=`created NLP fineunte task <a href="%s/%s">%s</a>`
 task_c2ent_modelevaluate=`created %s type Model evaluation task <a href="%s/%s">%s</a>`
 task_c2ent_modelevaluate_d=`created Model evaluation task <a href="%s/%s">%s</a>`
 task_c2net_cpusupercomputejob=`created CPU type HPC task <a href="%s/supercompute/job/%s">%s</a>`

options/locale/locale_zh-CN.ini

@@ -3452,9 +3452,13 @@ task_c2net_gpudebugjob1=`创建了ILUVATAR-GPGPU类型调试任务 <a href="%s/g
 task_c2net_gpudebugjob2=`创建了METAX-GPGPU类型调试任务 <a href="%s/grampus/notebook/%s">%s</a>`
 task_c2ent_onlineinferjob=`创建了GPU类型在线推理任务 <a href="%s/grampus/onlineinfer/%s">%s</a>`
 task_c2ent_modelexperience=`创建了%s类型在线体验任务 <a href="%s/%s">%s</a>`
+task_c2ent_modelexperience_d=`创建了在线体验任务 <a href="%s/%s">%s</a>`
 task_c2ent_loratrain=`创建了%s类型CV微调任务 <a href="%s/%s">%s</a>`
+task_c2ent_loratrain_d=`创建了CV微调任务 <a href="%s/%s">%s</a>`
 task_c2ent_comfyui=`创建了%s类型Comfy UI任务 <a href="%s/%s">%s</a>`
+task_c2ent_comfyui_d=`创建了Comfy UI任务 <a href="%s/%s">%s</a>`
 task_c2ent_sftfinetune=`创建了%s类型NLP微调任务 <a href="%s/%s">%s</a>`
+task_c2ent_sftfinetune_d=`创建了NLP微调任务 <a href="%s/%s">%s</a>`
 task_c2ent_modelevaluate=`创建了%s类型模型评测任务 <a href="%s/%s">%s</a>`
 task_c2ent_modelevaluate_d=`创建了模型评测任务 <a href="%s/%s">%s</a>`
 task_c2net_cpusupercomputejob=`创建了CPU类型超算任务 <a href="%s/supercompute/job/%s">%s</a>`

public/home/search.js

@@ -671,7 +671,7 @@ function displayModelResult(page, jsonResult, onlyReturnNum, keyword) {
           <div class="ui right metas" style="color:#767676">${engineMap[recordMap['engine']] || 'Other'}</div>
           <div class="ui header">
             <a class="name" href="/explore/models/${recordMap["owerName"]}/${recordMap["real_name"]}" target="_blank">
-              ${recordMap["name"]}
+              ${recordMap["title"]}
             </a>
           </div>
           <div class="description">

routers/api/v1/hf_model/file_transfer.go

@@ -36,17 +36,16 @@ func StartTransferFilesAPI(ctx *context.APIContext) {
 		return
 	}
 
+	modelIds := make(map[string]bool)
 	// 更新文件状态并记录心跳时间
 	for _, file := range waitlist {
-		err = models.UpdateHfFileStatusAndHeartbeat(file.ID, models.HfTransferStatusOngoing, time.Now(), heartbeatSec)
-		if err != nil {
-			log.Error("[hf_model] failed to update: %v", err)
-			resp.Msg = err.Error()
-			ctx.JSON(http.StatusOK, resp)
-			return
+		models.UpdateHfFileStatusAndHeartbeat(file.ID, models.HfTransferStatusOngoing, time.Now(), heartbeatSec)
+		if _, exists := modelIds[file.ModelId]; !exists {
+			modelIds[file.ModelId] = true
 		}
 	}
 
+	go setAimodelsOngoing(modelIds)
 	// 返回响应
 	resp.Code = 1
 	resp.Msg = "success"
@@ -186,3 +185,12 @@ func CompleteAiModel(modelId string) (bool, error) {
 	}
 	return isComplete, nil
 }
+
+func setAimodelsOngoing(modelIdsMap map[string]bool) {
+	for id := range modelIdsMap {
+		err := models.UpdateAimodelByStatus(id, models.HfTransferStatusOngoing, "")
+		if err != nil {
+			log.Error("SetAimodelsOngoing failed: " + err.Error())
+		}
+	}
+}

routers/search.go

@@ -311,11 +311,10 @@ func searchRepo(ctx *context.Context, TableName string, Key string, Page int, Pa
 	if Key != "" {
 		boolQ := elastic.NewBoolQuery()
 		nameQuery := elastic.NewMatchQuery("alias", Key).Boost(1024).QueryName("f_first")
-		descriptionQuery := elastic.NewMatchQuery("description", Key).Boost(1.5).QueryName("f_second")
-		topicsQuery := elastic.NewMatchQuery("topics", Key).Boost(1).QueryName("f_third")
-		boolQ.Should(nameQuery, descriptionQuery, topicsQuery)
+		topicsQuery := elastic.NewMatchQuery("topics", Key).Boost(1).QueryName("f_second")
+		boolQ.Should(nameQuery, topicsQuery)
 
-		res, err := client.Search(TableName).Query(boolQ).SortBy(getSort(SortBy, ascending, "num_stars", false)...).From(from).Size(Size).Highlight(queryHighlight("alias", "description", "topics")).Do(ctx.Req.Context())
+		res, err := client.Search(TableName).Query(boolQ).SortBy(getSort(SortBy, ascending, "num_stars", false)...).From(from).Size(Size).Highlight(queryHighlight("alias", "topics")).Do(ctx.Req.Context())
 		if err == nil {
 			//searchJson, _ := json.Marshal(res)
 			//log.Info("searchJson=" + string(searchJson))
@@ -1304,10 +1303,10 @@ func searchModel(ctx *context.Context, TableName string, Key string, Page int, P
 	if Key != "" {
 		fileNameQuery := elastic.NewMatchQuery("file_name", Key).Boost(3).QueryName("f_first")
 		nameQuery := elastic.NewMatchQuery("name", Key).Boost(2).QueryName("f_second")
-		descQuery := elastic.NewMatchQuery("description", Key).Boost(1.5).QueryName("f_three")
+		descQuery := elastic.NewMatchQuery("alias", Key).Boost(1.5).QueryName("f_three")
 		labelQuery := elastic.NewMatchQuery("label", Key).Boost(1).QueryName("f_fourth")
 		boolQ.Should(fileNameQuery, nameQuery, descQuery, labelQuery)
-		res, err := client.Search(TableName).Query(boolQ).SortBy(getSort(SortBy, ascending, "updated_unix.keyword", false)...).From(from).Size(Size).Highlight(queryHighlight("file_name", "name", "description", "label")).Do(ctx.Req.Context())
+		res, err := client.Search(TableName).Query(boolQ).SortBy(getSort(SortBy, ascending, "updated_unix.keyword", false)...).From(from).Size(Size).Highlight(queryHighlight("file_name", "name", "alias", "label")).Do(ctx.Req.Context())
 		if err == nil {
 			//searchJson, _ := json.Marshal(res)
 			//log.Info("searchJson=" + string(searchJson))
@@ -1371,6 +1370,9 @@ func makePrivateModel(privateModels []*models.AiModelManage, res *SearchRes, Key
 		record["file_name"] = truncLongText(makeHighLight(Key, file_name), true)
 		record["name"] = makeHighLight(Key, model.Name)
 		record["title"] = makeHighLight(Key, model.Alias)
+		if record["title"] == "" {
+			record["title"] = record["name"]
+		}
 		record["real_name"] = model.Name
 		record["is_private"] = model.IsPrivate
 		record["description"] = truncLongText(makeHighLight(Key, model.Description), true)

templates/user/dashboard/feeds.tmpl

@@ -239,25 +239,25 @@
 							{{if .Cloudbrain}}
 								{{$.i18n.Tr "action.task_c2ent_sftfinetune" .Cloudbrain.ComputeResource (Printf "/modelbase/nlp/sft/detail/%s" .GetRepoPath) .Content .RefName | Str2html}}
 							{{else}}
-								{{$.i18n.Tr "action.task_c2ent_sftfinetune" "" "" "" "" | Str2html}}<span style="">{{.RefName}}{{$.i18n.Tr "repo.issues.deleted_milestone"}}</span>
+								{{$.i18n.Tr "action.task_c2ent_sftfinetune_d" "" "" "" | Str2html}}<span style="">{{.RefName}}{{$.i18n.Tr "repo.issues.deleted_milestone"}}</span>
 							{{end}}
 						{{else if eq .GetOpType 59}}
 							{{if .Cloudbrain}}
 								{{$.i18n.Tr "action.task_c2ent_modelexperience" "" (Printf "/modelbase/experience/%s" .GetRepoPath) .Content .RefName | Str2html}}
 							{{else}}
-								{{$.i18n.Tr "action.task_c2ent_modelexperience" "" "" "" | Str2html}}<span style="">{{.RefName}}{{$.i18n.Tr "repo.issues.deleted_milestone"}}</span>
+								{{$.i18n.Tr "action.task_c2ent_modelexperience_d" "" "" | Str2html}}<span style="">{{.RefName}}{{$.i18n.Tr "repo.issues.deleted_milestone"}}</span>
 							{{end}}
 						{{else if eq .GetOpType 60}}
 							{{if .Cloudbrain}}
 								{{$.i18n.Tr "action.task_c2ent_loratrain" .Cloudbrain.ComputeResource (Printf "/modelbase/cv/sft/detail/%s" .GetRepoPath) .Content .RefName | Str2html}}
 							{{else}}
-								{{$.i18n.Tr "action.task_c2ent_loratrain" "" "" "" "" | Str2html}}<span style="">{{.RefName}}{{$.i18n.Tr "repo.issues.deleted_milestone"}}</span>
+								{{$.i18n.Tr "action.task_c2ent_loratrain_d" "" "" "" | Str2html}}<span style="">{{.RefName}}{{$.i18n.Tr "repo.issues.deleted_milestone"}}</span>
 							{{end}}
 						{{else if eq .GetOpType 61}}
 							{{if .Cloudbrain}}
 								{{$.i18n.Tr "action.task_c2ent_comfyui" .Cloudbrain.ComputeResource (Printf "/modelbase/cv/comfyui/detail/%s" .GetRepoPath) .Content .RefName | Str2html}}
 							{{else}}
-								{{$.i18n.Tr "action.task_c2ent_comfyui" "" "" "" "" | Str2html}}<span style="">{{.RefName}}{{$.i18n.Tr "repo.issues.deleted_milestone"}}</span>
+								{{$.i18n.Tr "action.task_c2ent_comfyui_d" "" "" "" | Str2html}}<span style="">{{.RefName}}{{$.i18n.Tr "repo.issues.deleted_milestone"}}</span>
 							{{end}}
 						{{else if eq .GetOpType 62}}
 							{{$.i18n.Tr "action.create_datasets" (Printf "%s/%s" .Dataset.Owner.Name .Dataset.Name) (.Dataset.DisplayName) | Str2html}}

web_src/vuepages/components/square/RightItem.vue

@@ -90,8 +90,7 @@ export default {
   },
   watch: {
     data(val, oVal) {
-      console.log("xxxxxxxxxxxxx",val)
-      
+      this.updateData()
     }
   },
   methods: {