From 3952a2f60c04d6668e09826642fb2d3f117439e6 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 11 Jan 2023 16:31:17 +0800 Subject: [PATCH 1/7] =?UTF-8?q?#3088=20=E3=80=90=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E8=AF=84=E6=B5=8B=E3=80=91testing=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=A2=9E=E5=8A=A0=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- web_src/less/openi.less | 1 + 1 file changed, 1 insertion(+) diff --git a/web_src/less/openi.less b/web_src/less/openi.less index 141cd59e7..e80e864a4 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -298,6 +298,7 @@ footer .column { background-position: -496px -52px; background-position: -459px -52px; } +.TESTING, .RUNNING { display: inline-block; width: 18px; From 5153875bc7d4f897e690463e7042af73835fb713 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 11 Jan 2023 17:16:44 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/user/auth.go | 12 +++++++++--- web_src/less/openi.less | 1 - 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/routers/user/auth.go b/routers/user/auth.go index 9620cb969..d28ecdb3a 100755 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -276,7 +276,7 @@ func SignInPostAPI(ctx *context.Context) { func SignInPostCommon(ctx *context.Context, form auth.SignInForm) { ctx.Data["Title"] = ctx.Tr("sign_in") - + log.Info("here111") orderedOAuth2Names, oauth2Providers, err := models.GetActiveOAuth2Providers() if err != nil { ctx.ServerError("UserSignIn", err) @@ -291,7 +291,7 @@ func SignInPostCommon(ctx *context.Context, form auth.SignInForm) { ctx.Data["IsCourse"] = ctx.QueryBool("course") ctx.Data["EnableSSPI"] = models.IsSSPIEnabled() ctx.Data["EnableCloudBrain"] = true - + log.Info("here222") if ctx.HasError() { ctx.HTML(200, tplSignIn) return @@ -326,6 +326,7 @@ func SignInPostCommon(ctx *context.Context, form auth.SignInForm) { return } models.SaveLoginInfoToDb(ctx.Req.Request, u) + log.Info("here333") // If this user is enrolled in 2FA, we can't sign the user in just yet. // Instead, redirect them to the 2FA authentication page. _, err = models.GetTwoFactorByUID(u.ID) @@ -337,6 +338,7 @@ func SignInPostCommon(ctx *context.Context, form auth.SignInForm) { } return } + log.Info("here444") // User needs to use 2FA, save data and redirect to 2FA page. if err := ctx.Session.Set("twofaUid", u.ID); err != nil { ctx.ServerError("UserSignIn: Unable to set twofaUid in session", err) @@ -368,6 +370,7 @@ func SignInCloudBrainPost(ctx *context.Context, form auth.SignInForm) { // SignInPost response for sign in request func SignInPost(ctx *context.Context, form auth.SignInForm) { + log.Info("here99999") ctx.Data["PageIsLogin"] = true ctx.Data["SignInLink"] = setting.AppSubURL + "/user/login" ctx.Data["ActivityTpl"] = getActivityTpl() @@ -747,6 +750,7 @@ func handleSignInFull(ctx *context.Context, u *models.User, remember bool, obeyR // Register last login u.SetLastLogin() + log.Info("77777_2222") if err := models.UpdateUserCols(u, "last_login_unix"); err != nil { ctx.ServerError("UpdateUserCols", err) return setting.AppSubURL + "/dashboard" @@ -758,14 +762,16 @@ func handleSignInFull(ctx *context.Context, u *models.User, remember bool, obeyR ctx.RedirectToFirst(redirectToCourse) return redirectToCourse } + log.Info("77777_777") if redirectTo := ctx.GetCookie("redirect_to"); len(redirectTo) > 0 && !util.IsExternalURL(redirectTo) { + log.Info("77777_8888") ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL, "", setting.SessionConfig.Secure, true) if obeyRedirect { ctx.RedirectToFirst(redirectTo) } return redirectTo } - + log.Info("77777_99999") if obeyRedirect { ctx.Redirect(setting.AppSubURL + "/dashboard") } diff --git a/web_src/less/openi.less b/web_src/less/openi.less index e80e864a4..141cd59e7 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -298,7 +298,6 @@ footer .column { background-position: -496px -52px; background-position: -459px -52px; } -.TESTING, .RUNNING { display: inline-block; width: 18px; From dac7cab4777df290653ed778a346fe0cf0c0e6be Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 12 Jan 2023 15:55:55 +0800 Subject: [PATCH 3/7] =?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=B3=E7=94=A8=E6=88=B7=E5=A2=9E=E9=95=BF?= =?UTF-8?q?=E8=B6=8B=E5=8A=BF=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/user_business_analysis.go | 2 +- routers/user/auth.go | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index ee1b17544..b6d51f24b 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -1391,7 +1391,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time, useMetrics.TotalActivateRegistUser = getMapKeyStringValue("TotalActivateRegistUser", userMetrics) useMetrics.TotalHasActivityUser = getMapKeyStringValue("TotalHasActivityUser", userMetrics) useMetrics.CurrentDayRegistUser = getMapKeyStringValue("CurrentDayRegistUser", userMetrics) - count, err = sess.Where("type=0").Count(new(User)) + count, err = sess.Where("type=0 and created_unix<=" + fmt.Sprint(end_unix)).Count(new(User)) if err != nil { log.Info("query user error. return.") } diff --git a/routers/user/auth.go b/routers/user/auth.go index d28ecdb3a..52b2a77b5 100755 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -326,7 +326,6 @@ func SignInPostCommon(ctx *context.Context, form auth.SignInForm) { return } models.SaveLoginInfoToDb(ctx.Req.Request, u) - log.Info("here333") // If this user is enrolled in 2FA, we can't sign the user in just yet. // Instead, redirect them to the 2FA authentication page. _, err = models.GetTwoFactorByUID(u.ID) @@ -338,7 +337,6 @@ func SignInPostCommon(ctx *context.Context, form auth.SignInForm) { } return } - log.Info("here444") // User needs to use 2FA, save data and redirect to 2FA page. if err := ctx.Session.Set("twofaUid", u.ID); err != nil { ctx.ServerError("UserSignIn: Unable to set twofaUid in session", err) @@ -370,7 +368,6 @@ func SignInCloudBrainPost(ctx *context.Context, form auth.SignInForm) { // SignInPost response for sign in request func SignInPost(ctx *context.Context, form auth.SignInForm) { - log.Info("here99999") ctx.Data["PageIsLogin"] = true ctx.Data["SignInLink"] = setting.AppSubURL + "/user/login" ctx.Data["ActivityTpl"] = getActivityTpl() @@ -750,7 +747,6 @@ func handleSignInFull(ctx *context.Context, u *models.User, remember bool, obeyR // Register last login u.SetLastLogin() - log.Info("77777_2222") if err := models.UpdateUserCols(u, "last_login_unix"); err != nil { ctx.ServerError("UpdateUserCols", err) return setting.AppSubURL + "/dashboard" @@ -762,16 +758,13 @@ func handleSignInFull(ctx *context.Context, u *models.User, remember bool, obeyR ctx.RedirectToFirst(redirectToCourse) return redirectToCourse } - log.Info("77777_777") if redirectTo := ctx.GetCookie("redirect_to"); len(redirectTo) > 0 && !util.IsExternalURL(redirectTo) { - log.Info("77777_8888") ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL, "", setting.SessionConfig.Secure, true) if obeyRedirect { ctx.RedirectToFirst(redirectTo) } return redirectTo } - log.Info("77777_99999") if obeyRedirect { ctx.Redirect(setting.AppSubURL + "/dashboard") } From 9def35594b4b72200a2b9a37c25b95744f592077 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 12 Jan 2023 15:57:42 +0800 Subject: [PATCH 4/7] =?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=B3=E7=94=A8=E6=88=B7=E5=A2=9E=E9=95=BF?= =?UTF-8?q?=E8=B6=8B=E5=8A=BF=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 --- routers/user/auth.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/routers/user/auth.go b/routers/user/auth.go index 52b2a77b5..61f53e200 100755 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -276,7 +276,6 @@ func SignInPostAPI(ctx *context.Context) { func SignInPostCommon(ctx *context.Context, form auth.SignInForm) { ctx.Data["Title"] = ctx.Tr("sign_in") - log.Info("here111") orderedOAuth2Names, oauth2Providers, err := models.GetActiveOAuth2Providers() if err != nil { ctx.ServerError("UserSignIn", err) @@ -291,7 +290,6 @@ func SignInPostCommon(ctx *context.Context, form auth.SignInForm) { ctx.Data["IsCourse"] = ctx.QueryBool("course") ctx.Data["EnableSSPI"] = models.IsSSPIEnabled() ctx.Data["EnableCloudBrain"] = true - log.Info("here222") if ctx.HasError() { ctx.HTML(200, tplSignIn) return From caaf1426a8fdccec5bd24d652aa8aa4860e4edc1 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 12 Jan 2023 16:07:29 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E6=B5=8B?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index b6d51f24b..6649dec74 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -1043,6 +1043,7 @@ func getCloudBrainInfo(dateRecordAll UserBusinessAnalysisAll, CloudBrainTaskItem trainscore = float64(dateRecordAll.GpuTrainJob+dateRecordAll.NpuTrainJob) / float64(50) } cloudBrainInfo["inference_task_num"] = fmt.Sprint(dateRecordAll.NpuInferenceJob + CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_GpuInferenceJob"]) + cloudBrainInfo["benchmark_task_num"] = fmt.Sprint(dateRecordAll.GpuBenchMarkJob) cloudBrainInfo["card_runtime"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime) cloudBrainInfo["card_runtime_money"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime * 5) cloudBrainInfo["CloudBrainOne"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainOne"]) From 3eece6ec6dd599c74c43405f7b19aa276c71294c Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 12 Jan 2023 16:09:25 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E8=AF=84=E6=B5=8B=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 6649dec74..2b71826fe 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -2516,6 +2516,8 @@ 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" { + setMapKey("GpuBenchMarkJob", cloudTaskRecord.UserID, 1, resultItemMap) } else { setMapKey("NpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap) } From 72102c526e8ceee16cf92d24d86da52f7639cb1d Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 12 Jan 2023 16:28:09 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B9=B4=E5=BA=A6=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E8=AF=84=E6=B5=8B=E4=BB=BB=E5=8A=A1=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 2b71826fe..cf0ad7e1a 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -2516,7 +2516,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" { + } else if cloudTaskRecord.JobType == "BENCHMARK" || cloudTaskRecord.JobType == "MODELSAFETY" { setMapKey("GpuBenchMarkJob", cloudTaskRecord.UserID, 1, resultItemMap) } else { setMapKey("NpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap) @@ -2527,7 +2527,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" { + } else if cloudTaskRecord.JobType == "BENCHMARK" || cloudTaskRecord.JobType == "MODELSAFETY" { setMapKey("GpuBenchMarkJob", cloudTaskRecord.UserID, 1, resultItemMap) } else { setMapKey("GpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap)