From dda57af14e1a38ce88545d72ec132af2d1a49e17 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 18 Jan 2023 10:41:28 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3Bug=20#3257?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 30 +++++++++++++++--------------- options/locale/locale_en-US.ini | 2 +- web_src/vuepages/langs/config/en-US.js | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 11f6d9d01..b01080cc6 100644 --- a/models/user_business_analysis.go +++ b/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) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ecd2598b7..1044876d7 100755 --- a/options/locale/locale_en-US.ini +++ b/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 diff --git a/web_src/vuepages/langs/config/en-US.js b/web_src/vuepages/langs/config/en-US.js index 7e6dc25bc..81e9bf50b 100644 --- a/web_src/vuepages/langs/config/en-US.js +++ b/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', From 1cfc1cf65cceb53e99dae7f8d22ed5e6bb585ee3 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 18 Jan 2023 15:02:00 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3id=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/ai_model_manage.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go index d55370ea1..caad4c62c 100644 --- a/models/ai_model_manage.go +++ b/models/ai_model_manage.go @@ -237,7 +237,8 @@ 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 + "'") + sess.ID(id) + //sess.Select("*").Table(new(AiModelConvert)).Where("id='" + id + "'") aiModelManageConvertList := make([]*AiModelConvert, 0) err := sess.Find(&aiModelManageConvertList) if err == nil { From 2e0ea2e20097d9a5985d2bc98aba331f2a1c3123 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 18 Jan 2023 15:11:34 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3id=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/ai_model_manage.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go index caad4c62c..98c67274a 100644 --- a/models/ai_model_manage.go +++ b/models/ai_model_manage.go @@ -237,8 +237,8 @@ func QueryModelConvertByName(name string, repoId int64) ([]*AiModelConvert, erro func QueryModelConvertById(id string) (*AiModelConvert, error) { sess := x.NewSession() defer sess.Close() - sess.ID(id) - //sess.Select("*").Table(new(AiModelConvert)).Where("id='" + id + "'") + sess.Table(new(AiModelConvert)).ID(id) + //sess.Select("*").Table(new(AiModelConvert)).Where("id = ?", id) aiModelManageConvertList := make([]*AiModelConvert, 0) err := sess.Find(&aiModelManageConvertList) if err == nil { From 00b3f9dc46d100fb190a2d323490f848c98e014e Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 18 Jan 2023 15:15:56 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3SQL=E6=B3=A8=E5=85=A5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/ai_model_manage.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go index 98c67274a..c1ab3afab 100644 --- a/models/ai_model_manage.go +++ b/models/ai_model_manage.go @@ -237,15 +237,19 @@ func QueryModelConvertByName(name string, repoId int64) ([]*AiModelConvert, erro func QueryModelConvertById(id string) (*AiModelConvert, error) { sess := x.NewSession() defer sess.Close() - sess.Table(new(AiModelConvert)).ID(id) - //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 isExist { + return re, nil } + //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 + // } + //} return nil, err } From f9c2043f227ae68637b169342a00c8e2a6b3cd07 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 18 Jan 2023 15:19:37 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3SQL=E6=B3=A8=E5=85=A5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/ai_model_manage.go | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go index c1ab3afab..502d3aadb 100644 --- a/models/ai_model_manage.go +++ b/models/ai_model_manage.go @@ -242,30 +242,16 @@ func QueryModelConvertById(id string) (*AiModelConvert, error) { if isExist { return re, nil } - //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 - // } - //} return nil, err } 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 isExist { + return re, nil } return nil, err } From 686c514c7d334fab0f1ad40cf118b6ba170ab081 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 18 Jan 2023 15:23:37 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3SQL=E6=B3=A8=E5=85=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/ai_model_manage.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go index 502d3aadb..24ee0c78f 100644 --- a/models/ai_model_manage.go +++ b/models/ai_model_manage.go @@ -239,7 +239,7 @@ func QueryModelConvertById(id string) (*AiModelConvert, error) { defer sess.Close() re := new(AiModelConvert) isExist, err := sess.Table(new(AiModelConvert)).ID(id).Get(re) - if isExist { + if err == nil && isExist { return re, nil } return nil, err @@ -250,7 +250,7 @@ func QueryModelById(id string) (*AiModelManage, error) { defer sess.Close() re := new(AiModelManage) isExist, err := sess.Table(new(AiModelManage)).ID(id).Get(re) - if isExist { + if err == nil && isExist { return re, nil } return nil, err