Merge pull request '解决相关Bug' (#3589) from zouap into V20230215

Reviewed-on: https://openi.pcl.ac.cn/OpenI/aiforge/pulls/3589
Reviewed-by: ychao_1983 <ychao_1983@sina.com>

models/ai_model_manage.go

@@ -237,13 +237,10 @@ func QueryModelConvertByName(name string, repoId int64) ([]*AiModelConvert, erro
 func QueryModelConvertById(id string) (*AiModelConvert, error) {
 	sess := x.NewSession()
 	defer sess.Close()
-	sess.Select("*").Table(new(AiModelConvert)).Where("id='" + id + "'")
-	aiModelManageConvertList := make([]*AiModelConvert, 0)
-	err := sess.Find(&aiModelManageConvertList)
-	if err == nil {
-		if len(aiModelManageConvertList) == 1 {
-			return aiModelManageConvertList[0], nil
-		}
+	re := new(AiModelConvert)
+	isExist, err := sess.Table(new(AiModelConvert)).ID(id).Get(re)
+	if err == nil && isExist {
+		return re, nil
 	}
 	return nil, err
 }
@@ -251,16 +248,10 @@ func QueryModelConvertById(id string) (*AiModelConvert, error) {
 func QueryModelById(id string) (*AiModelManage, error) {
 	sess := x.NewSession()
 	defer sess.Close()
-	sess.Select("*").Table("ai_model_manage").
-		Where("id='" + id + "'")
-	aiModelManageList := make([]*AiModelManage, 0)
-	err := sess.Find(&aiModelManageList)
-	if err == nil {
-		if len(aiModelManageList) == 1 {
-			return aiModelManageList[0], nil
-		}
-	} else {
-		log.Info("error=" + err.Error())
+	re := new(AiModelManage)
+	isExist, err := sess.Table(new(AiModelManage)).ID(id).Get(re)
+	if err == nil && isExist {
+		return re, nil
 	}
 	return nil, err
 }

models/user_business_analysis.go

@@ -846,13 +846,17 @@ func RefreshUserYearTable(pageStartTime time.Time, pageEndTime time.Time) {
 			scoreMap["codescore"] = codescore
 			cloudBrainInfo := getCloudBrainInfo(&dateRecordAll, CloudBrainTaskItemMap, scoreMap)
 			playARoll := getPlayARoll(bonusMap, dateRecordAll.Name, scoreMap)
+			exteral := 0
+			if int(subTime.Hours())%24 > 0 {
+				exteral = 1
+			}
 			re := &UserSummaryCurrentYear{
 				ID:             dateRecordAll.ID,
 				Name:           dateRecordAll.Name,
 				Email:          dateRecordAll.Email,
 				Phone:          dateRecordAll.Phone,
 				RegistDate:     dateRecordAll.RegistDate,
-				DateCount:      int(subTime.Hours()) / 24,
+				DateCount:      int(subTime.Hours())/24 + exteral,
 				MostActiveDay:  mostActiveDay,
 				RepoInfo:       repoInfo,
 				DataSetInfo:    dataSetInfo,
@@ -870,17 +874,6 @@ func RefreshUserYearTable(pageStartTime time.Time, pageEndTime time.Time) {
 	log.Info("update user year data finished. ")
 }
 
-func isUserYearData(tableName string) bool {
-	if tableName == "user_business_analysis_current_year" {
-		currentTimeNow := time.Now()
-		if currentTimeNow.Year() >= 2023 {
-			return false
-		}
-		return true
-	}
-	return false
-}
-
 func getBonusWeekDataMap() map[int64][]int {
 	bonusMap := make(map[int64][]int)
 	url := setting.RecommentRepoAddr + "bonus/weekdata/record.txt"
@@ -2307,7 +2300,7 @@ func queryUserCreateRepo(start_unix int64, end_unix int64) (map[int64]int, map[s
 	var indexTotal int64
 	indexTotal = 0
 	for {
-		sess.Select("id,owner_id,name,is_private,clone_cnt").Table("repository").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
+		sess.Select("id,owner_id,name,is_private,clone_cnt,alias").Table("repository").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
 		repoList := make([]*Repository, 0)
 		sess.Find(&repoList)
 		log.Info("query Repository size=" + fmt.Sprint(len(repoList)))
@@ -2530,6 +2523,13 @@ func queryUserModelConvert(start_unix int64, end_unix int64) map[int64]int {
 	return resultMap
 }
 
+func isBenchMark(JobType string) bool {
+	if JobType == "BENCHMARK" || JobType == "MODELSAFETY" || JobType == "SNN4IMAGENET" || JobType == "BRAINSCORE" || JobType == "SNN4ECOSET" {
+		return true
+	}
+	return false
+}
+
 func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[string]int) {
 	sess := x.NewSession()
 	defer sess.Close()
@@ -2565,7 +2565,7 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s
 					setMapKey("NpuTrainJob", cloudTaskRecord.UserID, 1, resultItemMap)
 				} else if cloudTaskRecord.JobType == "INFERENCE" {
 					setMapKey("NpuInferenceJob", cloudTaskRecord.UserID, 1, resultItemMap)
-				} else if cloudTaskRecord.JobType == "BENCHMARK" || cloudTaskRecord.JobType == "MODELSAFETY" {
+				} else if isBenchMark(cloudTaskRecord.JobType) {
 					setMapKey("GpuBenchMarkJob", cloudTaskRecord.UserID, 1, resultItemMap)
 				} else {
 					setMapKey("NpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap)
@@ -2576,7 +2576,7 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s
 					setMapKey("GpuTrainJob", cloudTaskRecord.UserID, 1, resultItemMap)
 				} else if cloudTaskRecord.JobType == "INFERENCE" {
 					setMapKey("GpuInferenceJob", cloudTaskRecord.UserID, 1, resultItemMap)
-				} else if cloudTaskRecord.JobType == "BENCHMARK" || cloudTaskRecord.JobType == "MODELSAFETY" {
+				} else if isBenchMark(cloudTaskRecord.JobType) {
 					setMapKey("GpuBenchMarkJob", cloudTaskRecord.UserID, 1, resultItemMap)
 				} else {
 					setMapKey("GpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap)

options/locale/locale_en-US.ini

@@ -1174,7 +1174,7 @@ modelarts.train_job.new_train=New Train Task
 modelarts.train_job.new_infer=New Inference Task
 modelarts.train_job.config=Configuration information
 modelarts.train_job.new=New train Task
-modelarts.train_job.new_place=The description should not exceed 256 characters
+modelarts.train_job.new_place=The description should not exceed 255 characters
 modelarts.model_name=Model Name
 modelarts.model_size=Model Size
 modelarts.import_model=Import Model

web_src/vuepages/langs/config/en-US.js

@@ -239,7 +239,7 @@ const en = {
     modelLabel: 'Model label',
     modelLabelInputTips: 'Input labels, multiple labels are separated by spaces',
     modelDescr: 'Model description',
-    modelDescrInputTips: 'The description should not exceed 256 characters',
+    modelDescrInputTips: 'The description should not exceed 255 characters',
     confirm: 'Confirm',
     cancel: 'Cancel',
     modelCreateFailed: 'Model create failed',