From 9998aeb0f9607f8ff20e0f5e590d403bec34cc1b Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 09:26:45 +0800 Subject: [PATCH 01/79] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain.go | 10 ++++++---- modules/modelarts/modelarts.go | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index cdd9698fe..cb2bd2837 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1045,6 +1045,7 @@ type CreateUserImageTrainJobParams struct { Description string `json:"job_desc"` Config UserImageConfig `json:"config"` WorkspaceID string `json:"workspace_id"` + Volume Volumes `json:"volumes"` } type UserImageConfig struct { @@ -1063,10 +1064,11 @@ type UserImageConfig struct { } type CreateTrainJobParams struct { - JobName string `json:"job_name"` - Description string `json:"job_desc"` - Config Config `json:"config"` - WorkspaceID string `json:"workspace_id"` + JobName string `json:"job_name"` + Description string `json:"job_desc"` + Config Config `json:"config"` + WorkspaceID string `json:"workspace_id"` + Volume Volumes `json:"volumes"` } type Config struct { diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index dd502dfd0..06d0836e2 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -66,6 +66,9 @@ const ( SortByCreateTime = "create_time" ConfigTypeCustom = "custom" TotalVersionCount = 1 + + VolumeSourcePath = "192.168.0.30:/" + VolumeDestPath = "/home/ma-user/sfs" ) var ( @@ -374,6 +377,13 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, }, + Volume: models.Volumes{ + Nfs: models.Nfs{ + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, + }, + }, }) } else { jobResult, createErr = createTrainJob(models.CreateTrainJobParams{ @@ -394,6 +404,13 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str }, Parameter: req.Parameters, }, + Volume: models.Volumes{ + Nfs: models.Nfs{ + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, + }, + }, }) } if createErr != nil { From 45c63b85d59b975819d385ea490f103abd60cb30 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 10:06:35 +0800 Subject: [PATCH 02/79] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/modelarts/modelarts.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 06d0836e2..57c92e990 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -68,7 +68,7 @@ const ( TotalVersionCount = 1 VolumeSourcePath = "192.168.0.30:/" - VolumeDestPath = "/home/ma-user/sfs" + VolumeDestPath = "/cache/sfs/" ) var ( From 46658293e5e673abb5e5a3ca16a679d4c0ddb7b8 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 10:12:46 +0800 Subject: [PATCH 03/79] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/modelarts/modelarts.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 57c92e990..cd2989e80 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -68,7 +68,7 @@ const ( TotalVersionCount = 1 VolumeSourcePath = "192.168.0.30:/" - VolumeDestPath = "/cache/sfs/" + VolumeDestPath = "/cache/" ) var ( From d4f4776ca333a70d3ad38e8323f0e823bdee596e Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 10:23:41 +0800 Subject: [PATCH 04/79] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/modelarts/modelarts.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index cd2989e80..41d9c57d2 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -68,7 +68,7 @@ const ( TotalVersionCount = 1 VolumeSourcePath = "192.168.0.30:/" - VolumeDestPath = "/cache/" + VolumeDestPath = "/cache/data/" ) var ( From dac33a75a81062b86a024502f624039954fa0a27 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 10:36:02 +0800 Subject: [PATCH 05/79] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain.go | 16 ++++++++-------- modules/modelarts/modelarts.go | 20 ++++++++------------ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index cb2bd2837..a517a7edf 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1045,7 +1045,7 @@ type CreateUserImageTrainJobParams struct { Description string `json:"job_desc"` Config UserImageConfig `json:"config"` WorkspaceID string `json:"workspace_id"` - Volume Volumes `json:"volumes"` + DataMount Nfs `json:"volumes"` } type UserImageConfig struct { @@ -1064,11 +1064,11 @@ type UserImageConfig struct { } type CreateTrainJobParams struct { - JobName string `json:"job_name"` - Description string `json:"job_desc"` - Config Config `json:"config"` - WorkspaceID string `json:"workspace_id"` - Volume Volumes `json:"volumes"` + JobName string `json:"job_name"` + Description string `json:"job_desc"` + Config Config `json:"config"` + WorkspaceID string `json:"workspace_id"` + DataMount Nfs `json:"volumes"` } type Config struct { @@ -1215,8 +1215,8 @@ type Volumes struct { type Nfs struct { ID string `json:"id"` - SourcePath string `json:"src_path"` - DestPath string `json:"dest_path"` + SourcePath string `json:"nfs_server_path"` + DestPath string `json:"local_path"` ReadOnly bool `json:"read_only"` } diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 41d9c57d2..39fdb6afc 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -377,12 +377,10 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, }, - Volume: models.Volumes{ - Nfs: models.Nfs{ - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, - }, + DataMount: models.Nfs{ + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, }, }) } else { @@ -404,12 +402,10 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str }, Parameter: req.Parameters, }, - Volume: models.Volumes{ - Nfs: models.Nfs{ - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, - }, + DataMount: models.Nfs{ + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, }, }) } From 7af655bea15b0937c42fb1a18ab3322c70209f68 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 10:43:37 +0800 Subject: [PATCH 06/79] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain.go | 10 +++++----- modules/modelarts/modelarts.go | 24 ++++++++++++++---------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index a517a7edf..cdd04cc01 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1045,7 +1045,6 @@ type CreateUserImageTrainJobParams struct { Description string `json:"job_desc"` Config UserImageConfig `json:"config"` WorkspaceID string `json:"workspace_id"` - DataMount Nfs `json:"volumes"` } type UserImageConfig struct { @@ -1061,6 +1060,7 @@ type UserImageConfig struct { CreateVersion bool `json:"create_version"` Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` + DataMount Volumes `json:"volumes"` } type CreateTrainJobParams struct { @@ -1068,7 +1068,6 @@ type CreateTrainJobParams struct { Description string `json:"job_desc"` Config Config `json:"config"` WorkspaceID string `json:"workspace_id"` - DataMount Nfs `json:"volumes"` } type Config struct { @@ -1082,9 +1081,10 @@ type Config struct { LogUrl string `json:"log_url"` //UserImageUrl string `json:"user_image_url"` //UserCommand string `json:"user_command"` - CreateVersion bool `json:"create_version"` - Flavor Flavor `json:"flavor"` - PoolID string `json:"pool_id"` + CreateVersion bool `json:"create_version"` + Flavor Flavor `json:"flavor"` + PoolID string `json:"pool_id"` + DataMount Volumes `json:"volumes"` } type CreateInferenceJobParams struct { JobName string `json:"job_name"` diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 39fdb6afc..a223f8708 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -376,11 +376,13 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Parameter: req.Parameters, UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, - }, - DataMount: models.Nfs{ - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, + DataMount: models.Volumes{ + Nfs: models.Nfs{ + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, + }, + }, }, }) } else { @@ -401,11 +403,13 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Code: req.Spec.SourceSpecId, }, Parameter: req.Parameters, - }, - DataMount: models.Nfs{ - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, + DataMount: models.Volumes{ + Nfs: models.Nfs{ + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, + }, + }, }, }) } From 6d11f68505abc7e63b30db397c519a47d0de1191 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 14:12:11 +0800 Subject: [PATCH 07/79] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain.go | 12 +++++++----- modules/modelarts/modelarts.go | 26 +++++++++++++++----------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index cdd04cc01..b3bfa1843 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1060,7 +1060,7 @@ type UserImageConfig struct { CreateVersion bool `json:"create_version"` Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` - DataMount Volumes `json:"volumes"` + Volumes Volumes `json:"volumes"` } type CreateTrainJobParams struct { @@ -1084,14 +1084,16 @@ type Config struct { CreateVersion bool `json:"create_version"` Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` - DataMount Volumes `json:"volumes"` + Volumes Volumes `json:"volumes"` } + type CreateInferenceJobParams struct { JobName string `json:"job_name"` Description string `json:"job_desc"` InfConfig InfConfig `json:"config"` WorkspaceID string `json:"workspace_id"` } + type CreateInfUserImageParams struct { JobName string `json:"job_name"` Description string `json:"job_desc"` @@ -1209,14 +1211,14 @@ type DataSource struct { } type Volumes struct { - Nfs Nfs `json:"nfs"` + Nfs []Nfs `json:"nfs"` HostPath HostPath `json:"host_path"` } type Nfs struct { ID string `json:"id"` - SourcePath string `json:"nfs_server_path"` - DestPath string `json:"local_path"` + SourcePath string `json:"src_path"` + DestPath string `json:"dest_path"` ReadOnly bool `json:"read_only"` } diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index a223f8708..e2ad865bf 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -68,7 +68,7 @@ const ( TotalVersionCount = 1 VolumeSourcePath = "192.168.0.30:/" - VolumeDestPath = "/cache/data/" + VolumeDestPath = "/cache/sfs/" ) var ( @@ -376,11 +376,13 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Parameter: req.Parameters, UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, - DataMount: models.Volumes{ - Nfs: models.Nfs{ - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, + Volumes: models.Volumes{ + Nfs: []models.Nfs{ + { + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, + }, }, }, }, @@ -403,11 +405,13 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Code: req.Spec.SourceSpecId, }, Parameter: req.Parameters, - DataMount: models.Volumes{ - Nfs: models.Nfs{ - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, + Volumes: models.Volumes{ + Nfs: []models.Nfs{ + { + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, + }, }, }, }, From e714383f13aa0e184a06da1f3c2fae663d5e2be3 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 14:19:37 +0800 Subject: [PATCH 08/79] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index b3bfa1843..28cf3cf89 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1217,8 +1217,8 @@ type Volumes struct { type Nfs struct { ID string `json:"id"` - SourcePath string `json:"src_path"` - DestPath string `json:"dest_path"` + SourcePath string `json:"nfs_server_path"` + DestPath string `json:"local_path"` ReadOnly bool `json:"read_only"` } From 814e3c50594133c190e795e386f9d46c385b371e Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 14:39:55 +0800 Subject: [PATCH 09/79] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain.go | 6 +++--- modules/modelarts/modelarts.go | 20 ++++++++------------ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 28cf3cf89..ee5ec6162 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1211,14 +1211,14 @@ type DataSource struct { } type Volumes struct { - Nfs []Nfs `json:"nfs"` + Nfs Nfs `json:"nfs"` HostPath HostPath `json:"host_path"` } type Nfs struct { ID string `json:"id"` - SourcePath string `json:"nfs_server_path"` - DestPath string `json:"local_path"` + SourcePath string `json:"src_path"` + DestPath string `json:"dest_path"` ReadOnly bool `json:"read_only"` } diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index e2ad865bf..dc5ba5b65 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -377,12 +377,10 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, Volumes: models.Volumes{ - Nfs: []models.Nfs{ - { - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, - }, + Nfs: models.Nfs{ + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, }, }, }, @@ -406,12 +404,10 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str }, Parameter: req.Parameters, Volumes: models.Volumes{ - Nfs: []models.Nfs{ - { - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, - }, + Nfs: models.Nfs{ + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, }, }, }, From a71ba7f2c9eac6a9ff8504e21e079aef7af5cd19 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 15:06:46 +0800 Subject: [PATCH 10/79] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A3=81=E7=9B=98=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/modelarts/resty.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index c38300606..ca7f40843 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -492,6 +492,7 @@ sendjob: SetResult(&result). Post(HOST + "/v1/" + setting.ProjectID + urlTrainJob) + log.Info("%s", createJobParams) if err != nil { return nil, fmt.Errorf("resty create train-job: %s", err) } From 0c54532060bfbbaab5264b1e5c2724f9a62a1c08 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 15:30:19 +0800 Subject: [PATCH 11/79] add --- modules/modelarts/resty.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index ca7f40843..7af6b42e8 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -492,7 +492,8 @@ sendjob: SetResult(&result). Post(HOST + "/v1/" + setting.ProjectID + urlTrainJob) - log.Info("%s", createJobParams) + log.Info("jochen10518", "%s", createJobParams) + if err != nil { return nil, fmt.Errorf("resty create train-job: %s", err) } From 4d76517dfaa0f986b1c905d1a2d3e1c5065dbc05 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 15:38:51 +0800 Subject: [PATCH 12/79] add --- modules/modelarts/resty.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index 7af6b42e8..a7d4910d8 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -492,8 +492,6 @@ sendjob: SetResult(&result). Post(HOST + "/v1/" + setting.ProjectID + urlTrainJob) - log.Info("jochen10518", "%s", createJobParams) - if err != nil { return nil, fmt.Errorf("resty create train-job: %s", err) } @@ -554,6 +552,7 @@ sendjob: SetResult(&result). Post(HOST + "/v1/" + setting.ProjectID + urlTrainJob) + log.Info("abcd", createJobParams) if err != nil { return nil, fmt.Errorf("resty create train-job: %s", err) } From fe24eafdcb82c2d8736ebdea8930ed926cc995fa Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 15:47:36 +0800 Subject: [PATCH 13/79] add --- modules/modelarts/resty.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index a7d4910d8..68a9c0797 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -483,7 +483,8 @@ func createTrainJobUserImage(createJobParams models.CreateUserImageTrainJobParam var result models.CreateTrainJobResult retry := 0 - + log.Info("abcd", createJobParams) + fmt.Print("abcd", createJobParams) sendjob: res, err := client.R(). SetHeader("Content-Type", "application/json"). @@ -544,6 +545,9 @@ func createTrainJob(createJobParams models.CreateTrainJobParams) (*models.Create retry := 0 + log.Info("abcd", createJobParams) + fmt.Print("abcd", createJobParams) + sendjob: res, err := client.R(). SetHeader("Content-Type", "application/json"). @@ -552,7 +556,6 @@ sendjob: SetResult(&result). Post(HOST + "/v1/" + setting.ProjectID + urlTrainJob) - log.Info("abcd", createJobParams) if err != nil { return nil, fmt.Errorf("resty create train-job: %s", err) } From b8281eb89be5328fc8cea7505acf7f14c268bb21 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 17:08:30 +0800 Subject: [PATCH 14/79] add --- models/cloudbrain.go | 1 + modules/modelarts/resty.go | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index ee5ec6162..2bae839cf 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1181,6 +1181,7 @@ type CreateConfigParams struct { LogUrl string `json:"log_url"` Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` + Volumes Volumes `json:"volumes"` } type Parameter struct { diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index 68a9c0797..de9c0b2b6 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -483,8 +483,7 @@ func createTrainJobUserImage(createJobParams models.CreateUserImageTrainJobParam var result models.CreateTrainJobResult retry := 0 - log.Info("abcd", createJobParams) - fmt.Print("abcd", createJobParams) + sendjob: res, err := client.R(). SetHeader("Content-Type", "application/json"). @@ -499,6 +498,7 @@ sendjob: req, _ := json.Marshal(createJobParams) log.Info("%s", req) + log.Info("postapi detail: %s", string(req)) if res.StatusCode() == http.StatusUnauthorized && retry < 1 { retry++ @@ -544,9 +544,7 @@ func createTrainJob(createJobParams models.CreateTrainJobParams) (*models.Create var result models.CreateTrainJobResult retry := 0 - - log.Info("abcd", createJobParams) - fmt.Print("abcd", createJobParams) + log.Info("postapi detail: %s", createJobParams) sendjob: res, err := client.R(). @@ -759,6 +757,7 @@ func CreateTrainJobConfig(req models.CreateConfigParams) (*models.CreateTrainJob var result models.CreateTrainJobConfigResult retry := 0 + log.Info("postapi detail: %s", req) sendjob: res, err := client.R(). From 6762b26cae7f5178e5980218ed9e805e243f0b6e Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 17:21:31 +0800 Subject: [PATCH 15/79] add --- modules/modelarts/resty.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index de9c0b2b6..75f16155f 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -497,8 +497,9 @@ sendjob: } req, _ := json.Marshal(createJobParams) - log.Info("%s", req) - log.Info("postapi detail: %s", string(req)) + log.Info("postapi json: %s", string(req)) + log.Info("postapi detail: %s", createJobParams) + log.Info("postapi detail: %s", createJobParams.Config.Volumes) if res.StatusCode() == http.StatusUnauthorized && retry < 1 { retry++ @@ -545,6 +546,7 @@ func createTrainJob(createJobParams models.CreateTrainJobParams) (*models.Create retry := 0 log.Info("postapi detail: %s", createJobParams) + log.Info("postapi detail: %s", createJobParams.Config.Volumes) sendjob: res, err := client.R(). @@ -757,7 +759,9 @@ func CreateTrainJobConfig(req models.CreateConfigParams) (*models.CreateTrainJob var result models.CreateTrainJobConfigResult retry := 0 + log.Info("postapi detail: %s", req) + log.Info("postapi detail: %s", req.Volumes) sendjob: res, err := client.R(). From 7fe5748f5950049c34a06c80dbc669b10fa99a3a Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 17:48:07 +0800 Subject: [PATCH 16/79] add --- modules/modelarts/modelarts.go | 3 +++ modules/modelarts/resty.go | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index dc5ba5b65..5ccb08c92 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -67,6 +67,7 @@ const ( ConfigTypeCustom = "custom" TotalVersionCount = 1 + VolumeID = "c6a73891-6a19-4a6a-a2e8-0d6baa72a7c5" VolumeSourcePath = "192.168.0.30:/" VolumeDestPath = "/cache/sfs/" ) @@ -378,6 +379,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str UserCommand: req.UserCommand, Volumes: models.Volumes{ Nfs: models.Nfs{ + ID: VolumeID, SourcePath: VolumeSourcePath, DestPath: VolumeDestPath, ReadOnly: false, @@ -405,6 +407,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Parameter: req.Parameters, Volumes: models.Volumes{ Nfs: models.Nfs{ + ID: VolumeID, SourcePath: VolumeSourcePath, DestPath: VolumeDestPath, ReadOnly: false, diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index 75f16155f..27c37b1e8 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -498,8 +498,8 @@ sendjob: req, _ := json.Marshal(createJobParams) log.Info("postapi json: %s", string(req)) - log.Info("postapi detail: %s", createJobParams) - log.Info("postapi detail: %s", createJobParams.Config.Volumes) + log.Info("postapi detail all: %s", createJobParams) + log.Info("postapi detail Volume: %s", createJobParams.Config.Volumes) if res.StatusCode() == http.StatusUnauthorized && retry < 1 { retry++ @@ -545,8 +545,8 @@ func createTrainJob(createJobParams models.CreateTrainJobParams) (*models.Create var result models.CreateTrainJobResult retry := 0 - log.Info("postapi detail: %s", createJobParams) - log.Info("postapi detail: %s", createJobParams.Config.Volumes) + log.Info("postapi detail all: %s", createJobParams) + log.Info("postapi detail Volume: %s", createJobParams.Config.Volumes) sendjob: res, err := client.R(). @@ -760,8 +760,8 @@ func CreateTrainJobConfig(req models.CreateConfigParams) (*models.CreateTrainJob retry := 0 - log.Info("postapi detail: %s", req) - log.Info("postapi detail: %s", req.Volumes) + log.Info("postapi detail all: %s", req) + log.Info("postapi detail Volume: %s", req.Volumes) sendjob: res, err := client.R(). From 11f0bbd4e42720bd5ae5851d3afd7b06ded348e1 Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 29 Nov 2022 09:20:10 +0800 Subject: [PATCH 17/79] add --- models/cloudbrain.go | 12 ++++++------ modules/modelarts/modelarts.go | 30 +++++++++++++++++------------- modules/modelarts/resty.go | 5 ----- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 2bae839cf..aba31f53c 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1060,7 +1060,7 @@ type UserImageConfig struct { CreateVersion bool `json:"create_version"` Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` - Volumes Volumes `json:"volumes"` + Volumes []Volumes `json:"volumes"` } type CreateTrainJobParams struct { @@ -1081,10 +1081,10 @@ type Config struct { LogUrl string `json:"log_url"` //UserImageUrl string `json:"user_image_url"` //UserCommand string `json:"user_command"` - CreateVersion bool `json:"create_version"` - Flavor Flavor `json:"flavor"` - PoolID string `json:"pool_id"` - Volumes Volumes `json:"volumes"` + CreateVersion bool `json:"create_version"` + Flavor Flavor `json:"flavor"` + PoolID string `json:"pool_id"` + Volumes []Volumes `json:"volumes"` } type CreateInferenceJobParams struct { @@ -1181,7 +1181,7 @@ type CreateConfigParams struct { LogUrl string `json:"log_url"` Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` - Volumes Volumes `json:"volumes"` + Volumes []Volumes `json:"volumes"` } type Parameter struct { diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 5ccb08c92..03378159a 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -69,7 +69,7 @@ const ( VolumeID = "c6a73891-6a19-4a6a-a2e8-0d6baa72a7c5" VolumeSourcePath = "192.168.0.30:/" - VolumeDestPath = "/cache/sfs/" + VolumeDestPath = "/cache/sfs" ) var ( @@ -377,12 +377,14 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Parameter: req.Parameters, UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, - Volumes: models.Volumes{ - Nfs: models.Nfs{ - ID: VolumeID, - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, + Volumes: []models.Volumes{ + { + Nfs: models.Nfs{ + ID: VolumeID, + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, + }, }, }, }, @@ -405,12 +407,14 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Code: req.Spec.SourceSpecId, }, Parameter: req.Parameters, - Volumes: models.Volumes{ - Nfs: models.Nfs{ - ID: VolumeID, - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, - ReadOnly: false, + Volumes: []models.Volumes{ + { + Nfs: models.Nfs{ + ID: VolumeID, + SourcePath: VolumeSourcePath, + DestPath: VolumeDestPath, + ReadOnly: false, + }, }, }, }, diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index 27c37b1e8..058641ddd 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -545,8 +545,6 @@ func createTrainJob(createJobParams models.CreateTrainJobParams) (*models.Create var result models.CreateTrainJobResult retry := 0 - log.Info("postapi detail all: %s", createJobParams) - log.Info("postapi detail Volume: %s", createJobParams.Config.Volumes) sendjob: res, err := client.R(). @@ -760,9 +758,6 @@ func CreateTrainJobConfig(req models.CreateConfigParams) (*models.CreateTrainJob retry := 0 - log.Info("postapi detail all: %s", req) - log.Info("postapi detail Volume: %s", req.Volumes) - sendjob: res, err := client.R(). SetHeader("Content-Type", "application/json"). From 5055eb8e5fb0a8f9b4eaf13b91df207686e0a2bf Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 29 Nov 2022 11:01:08 +0800 Subject: [PATCH 18/79] add --- modules/modelarts/modelarts.go | 34 +++++++++++++++++++++++++--------- modules/modelarts/resty.go | 2 ++ 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 03378159a..db31d45ec 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -67,9 +67,11 @@ const ( ConfigTypeCustom = "custom" TotalVersionCount = 1 - VolumeID = "c6a73891-6a19-4a6a-a2e8-0d6baa72a7c5" - VolumeSourcePath = "192.168.0.30:/" - VolumeDestPath = "/cache/sfs" + NfsID = "c6a73891-6a19-4a6a-a2e8-0d6baa72a7c5" + NfsSourcePath = "192.168.0.30:/" + NfsDestPath = "/cache/sfs" + HostSourcePath = "/mnt/sfs_turbo/data" + HostDestPath = "/cache/host" ) var ( @@ -380,9 +382,16 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Volumes: []models.Volumes{ { Nfs: models.Nfs{ - ID: VolumeID, - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, + ID: NfsID, + SourcePath: NfsSourcePath, + DestPath: NfsDestPath, + ReadOnly: false, + }, + }, + { + HostPath: models.HostPath{ + SourcePath: HostSourcePath, + DestPath: HostDestPath, ReadOnly: false, }, }, @@ -410,9 +419,16 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Volumes: []models.Volumes{ { Nfs: models.Nfs{ - ID: VolumeID, - SourcePath: VolumeSourcePath, - DestPath: VolumeDestPath, + ID: NfsID, + SourcePath: NfsSourcePath, + DestPath: NfsDestPath, + ReadOnly: false, + }, + }, + { + HostPath: models.HostPath{ + SourcePath: HostSourcePath, + DestPath: HostDestPath, ReadOnly: false, }, }, diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index 058641ddd..b05bb0f9b 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -546,6 +546,8 @@ func createTrainJob(createJobParams models.CreateTrainJobParams) (*models.Create retry := 0 + log.Info("postapi detail", createJobParams.Config.Volumes) + sendjob: res, err := client.R(). SetHeader("Content-Type", "application/json"). From 50f14ef3be16fb91d0bd7c6ef1127aeeb52e42bb Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 29 Nov 2022 11:09:37 +0800 Subject: [PATCH 19/79] add --- modules/modelarts/resty.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index b05bb0f9b..0dc7252e5 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -498,8 +498,6 @@ sendjob: req, _ := json.Marshal(createJobParams) log.Info("postapi json: %s", string(req)) - log.Info("postapi detail all: %s", createJobParams) - log.Info("postapi detail Volume: %s", createJobParams.Config.Volumes) if res.StatusCode() == http.StatusUnauthorized && retry < 1 { retry++ @@ -545,8 +543,7 @@ func createTrainJob(createJobParams models.CreateTrainJobParams) (*models.Create var result models.CreateTrainJobResult retry := 0 - - log.Info("postapi detail", createJobParams.Config.Volumes) + log.Info("postapi detail", createJobParams) sendjob: res, err := client.R(). From a32a705b0b713b642efb18b14bd6ce08e0b1620a Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 29 Nov 2022 11:25:50 +0800 Subject: [PATCH 20/79] add --- modules/modelarts/modelarts.go | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index db31d45ec..39ce8b826 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -67,11 +67,9 @@ const ( ConfigTypeCustom = "custom" TotalVersionCount = 1 - NfsID = "c6a73891-6a19-4a6a-a2e8-0d6baa72a7c5" - NfsSourcePath = "192.168.0.30:/" - NfsDestPath = "/cache/sfs" - HostSourcePath = "/mnt/sfs_turbo/data" - HostDestPath = "/cache/host" + NfsID = "c6a73891-6a19-4a6a-a2e8-0d6baa72a7c5" + NfsSourcePath = "192.168.0.30:/" + NfsDestPath = "/cache/sfs" ) var ( @@ -388,13 +386,6 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str ReadOnly: false, }, }, - { - HostPath: models.HostPath{ - SourcePath: HostSourcePath, - DestPath: HostDestPath, - ReadOnly: false, - }, - }, }, }, }) @@ -425,13 +416,6 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str ReadOnly: false, }, }, - { - HostPath: models.HostPath{ - SourcePath: HostSourcePath, - DestPath: HostDestPath, - ReadOnly: false, - }, - }, }, }, }) From 405cd970e689eebea9c9a1d20c43353914774cb5 Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 29 Nov 2022 11:56:37 +0800 Subject: [PATCH 21/79] add --- models/cloudbrain.go | 14 +++++++++----- modules/modelarts/modelarts.go | 32 +++++++++----------------------- modules/modelarts/resty.go | 5 +++-- 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index aba31f53c..bbc2298d3 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1060,7 +1060,9 @@ type UserImageConfig struct { CreateVersion bool `json:"create_version"` Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` - Volumes []Volumes `json:"volumes"` + ShareAddr string `json:"nas_share_addr"` + MountPath string `json:"nas_mount_path"` + NasType string `json:"nas_type"` } type CreateTrainJobParams struct { @@ -1081,10 +1083,12 @@ type Config struct { LogUrl string `json:"log_url"` //UserImageUrl string `json:"user_image_url"` //UserCommand string `json:"user_command"` - CreateVersion bool `json:"create_version"` - Flavor Flavor `json:"flavor"` - PoolID string `json:"pool_id"` - Volumes []Volumes `json:"volumes"` + CreateVersion bool `json:"create_version"` + Flavor Flavor `json:"flavor"` + PoolID string `json:"pool_id"` + ShareAddr string `json:"nas_share_addr"` + MountPath string `json:"nas_mount_path"` + NasType string `json:"nas_type"` } type CreateInferenceJobParams struct { diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 39ce8b826..b97ef6249 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -67,9 +67,9 @@ const ( ConfigTypeCustom = "custom" TotalVersionCount = 1 - NfsID = "c6a73891-6a19-4a6a-a2e8-0d6baa72a7c5" - NfsSourcePath = "192.168.0.30:/" - NfsDestPath = "/cache/sfs" + ShareAddr = "192.168.0.30:/" + MountPath = "/cache/sfs" + NasType = "nfs" ) var ( @@ -377,16 +377,9 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Parameter: req.Parameters, UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, - Volumes: []models.Volumes{ - { - Nfs: models.Nfs{ - ID: NfsID, - SourcePath: NfsSourcePath, - DestPath: NfsDestPath, - ReadOnly: false, - }, - }, - }, + ShareAddr: ShareAddr, + MountPath: MountPath, + NasType: NasType, }, }) } else { @@ -407,16 +400,9 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Code: req.Spec.SourceSpecId, }, Parameter: req.Parameters, - Volumes: []models.Volumes{ - { - Nfs: models.Nfs{ - ID: NfsID, - SourcePath: NfsSourcePath, - DestPath: NfsDestPath, - ReadOnly: false, - }, - }, - }, + ShareAddr: ShareAddr, + MountPath: MountPath, + NasType: NasType, }, }) } diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index 0dc7252e5..50f22b372 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -497,7 +497,7 @@ sendjob: } req, _ := json.Marshal(createJobParams) - log.Info("postapi json: %s", string(req)) + log.Info("postapi json: %s", req) if res.StatusCode() == http.StatusUnauthorized && retry < 1 { retry++ @@ -543,7 +543,8 @@ func createTrainJob(createJobParams models.CreateTrainJobParams) (*models.Create var result models.CreateTrainJobResult retry := 0 - log.Info("postapi detail", createJobParams) + req, _ := json.Marshal(createJobParams) + log.Info("postapi json: %s", req) sendjob: res, err := client.R(). From 8545f920d3267fa26e9a32418a75215c672314df Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 29 Nov 2022 14:28:29 +0800 Subject: [PATCH 22/79] add --- models/cloudbrain.go | 6 ++++++ modules/modelarts/modelarts.go | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index bbc2298d3..1790ef44b 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1155,6 +1155,9 @@ type TrainJobVersionConfig struct { Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` PreVersionId int64 `json:"pre_version_id"` + ShareAddr string `json:"nas_share_addr"` + MountPath string `json:"nas_mount_path"` + NasType string `json:"nas_type"` } type TrainJobVersionUserImageConfig struct { @@ -1170,6 +1173,9 @@ type TrainJobVersionUserImageConfig struct { PreVersionId int64 `json:"pre_version_id"` UserImageUrl string `json:"user_image_url"` UserCommand string `json:"user_command"` + ShareAddr string `json:"nas_share_addr"` + MountPath string `json:"nas_mount_path"` + NasType string `json:"nas_type"` } type CreateConfigParams struct { diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index b97ef6249..67c0b76c3 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -521,6 +521,9 @@ func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobReq, job PreVersionId: req.PreVersionId, UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, + ShareAddr: ShareAddr, + MountPath: MountPath, + NasType: NasType, }, }, jobId) } else { @@ -540,6 +543,9 @@ func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobReq, job }, Parameter: req.Parameters, PreVersionId: req.PreVersionId, + ShareAddr: ShareAddr, + MountPath: MountPath, + NasType: NasType, }, }, jobId) } From 46904fa4da33fd4ff54bce1efed4ab1ee79db9bf Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 8 Dec 2022 15:16:53 +0800 Subject: [PATCH 23/79] fix-3221 --- routers/api/v1/repo/cloudbrain.go | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index cd8340c41..d724149df 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -9,6 +9,7 @@ import ( "bufio" "encoding/json" "io" + "io/ioutil" "net/http" "os" "path" @@ -621,6 +622,19 @@ func CloudbrainDownloadLogFile(ctx *context.Context) { } } + existStr := "testduibudui+" + "" + if job.JobType == string(models.JobTypeTrain) || job.JobType == string(models.JobTypeInference) { + if job.Type == models.TypeCloudBrainOne { + result, err := cloudbrain.GetJob(job.JobID) + if err == nil && result != nil { + jobRes, _ := models.ConvertToJobResultPayload(result.Payload) + taskRoles := jobRes.TaskRoles + taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{})) + existStr = taskRes.TaskStatuses[0].ExitDiagnostics + } + } + } + logDir := "/model" if job.JobType == string(models.JobTypeInference) || job.JobType == string(models.JobTypeModelSafety) { logDir = cloudbrain.ResultPath @@ -638,17 +652,30 @@ func CloudbrainDownloadLogFile(ctx *context.Context) { } } if fileName != "" { - prefix := "/" + setting.CBCodePathPrefix + job.JobName + logDir - url, err := storage.Attachments.PresignedGetURL(prefix+"/"+fileName, fileName) + prefix := "/" + setting.CBCodePathPrefix + job.JobName + "/model" + filePath := setting.Attachment.Minio.RealPath + setting.Attachment.Minio.Bucket + prefix + "/" + fileName + // Read the file contents into a byte slice + data, err := ioutil.ReadFile(filePath) if err != nil { - log.Error("Get minio get SignedUrl failed: %v", err.Error(), ctx.Data["msgID"]) + ctx.ServerError("ReadFile", err) + return + } + + // Set the appropriate response headers + ctx.Resp.Header().Set("Content-Type", "application/octet-stream") + ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+fileName) + + // Write the file contents to the response + if _, err := ctx.Resp.Write(data); err != nil { + ctx.ServerError("Write", err) + return + } + if _, err := ctx.Resp.Write([]byte(existStr)); err != nil { + log.Error("Write failed: %v", err.Error(), ctx.Data["msgID"]) return } - log.Info("fileName=" + fileName) - http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusTemporaryRedirect) } else { log.Info("fileName is null.") - } } From e1716a0b6d2b137cb2dbfdb97ff3afcd7da3fcbe Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 8 Dec 2022 17:39:36 +0800 Subject: [PATCH 24/79] fix-3221 --- routers/api/v1/repo/cloudbrain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index d724149df..b55529b51 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -622,7 +622,7 @@ func CloudbrainDownloadLogFile(ctx *context.Context) { } } - existStr := "testduibudui+" + "" + existStr := "" if job.JobType == string(models.JobTypeTrain) || job.JobType == string(models.JobTypeInference) { if job.Type == models.TypeCloudBrainOne { result, err := cloudbrain.GetJob(job.JobID) From f8b6b19a8730a43e7f6dd192c056fbfa24a1a5a7 Mon Sep 17 00:00:00 2001 From: liuzx Date: Fri, 9 Dec 2022 11:29:25 +0800 Subject: [PATCH 25/79] fix-3241 --- routers/api/v1/repo/cloudbrain.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index b55529b51..a0dea0b86 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -765,6 +765,16 @@ func CloudbrainGetLog(ctx *context.APIContext) { content = content + ctx.Data["existStr"].(string) } + if (job.JobType == string(models.JobTypeTrain) || job.JobType == string(models.JobTypeInference)) && job.Type == models.TypeCloudBrainOne && job.Status == string(models.JobFailed) { + if ctx.Data["existStr"] != nil { + content = content + ctx.Data["existStr"].(string) + } + } else { + if ctx.Data["existStr"] != nil && result["Lines"].(int) < 50 { + content = content + ctx.Data["existStr"].(string) + } + } + logFileName := result["FileName"] //Logs can only be downloaded if the file exists From fc77e2417326dd840ce8079b2b44b510ddebb774 Mon Sep 17 00:00:00 2001 From: liuzx Date: Fri, 9 Dec 2022 11:44:32 +0800 Subject: [PATCH 26/79] fix-3241 --- routers/api/v1/repo/cloudbrain.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index a0dea0b86..89ebcc51a 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -761,10 +761,6 @@ func CloudbrainGetLog(ctx *context.APIContext) { content = result["Content"].(string) } - if ctx.Data["existStr"] != nil && result["Lines"].(int) < 50 { - content = content + ctx.Data["existStr"].(string) - } - if (job.JobType == string(models.JobTypeTrain) || job.JobType == string(models.JobTypeInference)) && job.Type == models.TypeCloudBrainOne && job.Status == string(models.JobFailed) { if ctx.Data["existStr"] != nil { content = content + ctx.Data["existStr"].(string) From 17af23793324aa0bd2c391cc3c96f76caecaf966 Mon Sep 17 00:00:00 2001 From: liuzx Date: Mon, 12 Dec 2022 16:14:31 +0800 Subject: [PATCH 27/79] fix-3220 --- routers/api/v1/repo/cloudbrain.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index 89ebcc51a..cd15dae98 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -764,6 +764,10 @@ func CloudbrainGetLog(ctx *context.APIContext) { if (job.JobType == string(models.JobTypeTrain) || job.JobType == string(models.JobTypeInference)) && job.Type == models.TypeCloudBrainOne && job.Status == string(models.JobFailed) { if ctx.Data["existStr"] != nil { content = content + ctx.Data["existStr"].(string) + if baseLine == "" && order == "desc" { + result["Lines"] = 1 + result["EndLine"] = 1 + } } } else { if ctx.Data["existStr"] != nil && result["Lines"].(int) < 50 { From a3a14e889b29009f66bcd1f63f215ed1f7d85eeb Mon Sep 17 00:00:00 2001 From: liuzx Date: Wed, 14 Dec 2022 09:48:42 +0800 Subject: [PATCH 28/79] fix-3220 --- routers/api/v1/repo/cloudbrain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index cd15dae98..c2c06dcff 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -764,7 +764,7 @@ func CloudbrainGetLog(ctx *context.APIContext) { if (job.JobType == string(models.JobTypeTrain) || job.JobType == string(models.JobTypeInference)) && job.Type == models.TypeCloudBrainOne && job.Status == string(models.JobFailed) { if ctx.Data["existStr"] != nil { content = content + ctx.Data["existStr"].(string) - if baseLine == "" && order == "desc" { + if baseLine == "" && order == "desc" && result["Lines"].(int) == 0 { result["Lines"] = 1 result["EndLine"] = 1 } From c3bf329a3adbc26dd87d91845a158e2a0dbc84c4 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 15 Dec 2022 10:52:14 +0800 Subject: [PATCH 29/79] fix-3393 --- routers/api/v1/repo/cloudbrain.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index c2c06dcff..2ab733e21 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -763,11 +763,13 @@ func CloudbrainGetLog(ctx *context.APIContext) { if (job.JobType == string(models.JobTypeTrain) || job.JobType == string(models.JobTypeInference)) && job.Type == models.TypeCloudBrainOne && job.Status == string(models.JobFailed) { if ctx.Data["existStr"] != nil { - content = content + ctx.Data["existStr"].(string) if baseLine == "" && order == "desc" && result["Lines"].(int) == 0 { result["Lines"] = 1 result["EndLine"] = 1 } + if ctx.Data["existStr"] != nil && result["Lines"].(int) < 60 { + content = content + ctx.Data["existStr"].(string) + } } } else { if ctx.Data["existStr"] != nil && result["Lines"].(int) < 50 { From 51a816eb54a24ebb72dfe0c3d76f4a63b471d8b9 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 15 Dec 2022 11:12:12 +0800 Subject: [PATCH 30/79] fix-3393 --- routers/api/v1/repo/cloudbrain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index 2ab733e21..bc194e2f3 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -767,7 +767,7 @@ func CloudbrainGetLog(ctx *context.APIContext) { result["Lines"] = 1 result["EndLine"] = 1 } - if ctx.Data["existStr"] != nil && result["Lines"].(int) < 60 { + if ctx.Data["existStr"] != nil && result["Lines"].(int) < 60 || ctx.Data["existStr"] != nil && result["Lines"] == 0 { content = content + ctx.Data["existStr"].(string) } } From b65a2f8b7e9b9f9aa6dd3b5a6e7394e60aec5c1c Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 15 Dec 2022 11:14:25 +0800 Subject: [PATCH 31/79] fix-3393 --- routers/api/v1/repo/cloudbrain.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index bc194e2f3..b1602958e 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -767,8 +767,11 @@ func CloudbrainGetLog(ctx *context.APIContext) { result["Lines"] = 1 result["EndLine"] = 1 } - if ctx.Data["existStr"] != nil && result["Lines"].(int) < 60 || ctx.Data["existStr"] != nil && result["Lines"] == 0 { + if ctx.Data["existStr"] != nil && result["Lines"].(int) < 60 { content = content + ctx.Data["existStr"].(string) + if result["Lines"].(int) == 0 { + result["Lines"] = 1 + } } } } else { From 7a3fd488d47685dd9c89aeb077ec86ea4243daec Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 15 Dec 2022 11:19:25 +0800 Subject: [PATCH 32/79] fix-3393 --- routers/api/v1/repo/cloudbrain.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index b1602958e..a5ac1873f 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -771,6 +771,8 @@ func CloudbrainGetLog(ctx *context.APIContext) { content = content + ctx.Data["existStr"].(string) if result["Lines"].(int) == 0 { result["Lines"] = 1 + startLine := ctx.QueryInt("base_line") + result["EndLine"] = startLine + 1 } } } From 81e4dbd2402873e945138d88d77e0e5805e36036 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 15 Dec 2022 11:23:38 +0800 Subject: [PATCH 33/79] fix-3393 --- routers/api/v1/repo/cloudbrain.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index a5ac1873f..44685a921 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -771,8 +771,8 @@ func CloudbrainGetLog(ctx *context.APIContext) { content = content + ctx.Data["existStr"].(string) if result["Lines"].(int) == 0 { result["Lines"] = 1 - startLine := ctx.QueryInt("base_line") - result["EndLine"] = startLine + 1 + // startLine := ctx.QueryInt("base_line") + // result["EndLine"] = startLine + 1 } } } From 9142f19cc236f9a1491f6151ce2df09776ea40d1 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 15 Dec 2022 11:28:22 +0800 Subject: [PATCH 34/79] fix-3393 --- routers/api/v1/repo/cloudbrain.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index 44685a921..2ab733e21 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -769,11 +769,6 @@ func CloudbrainGetLog(ctx *context.APIContext) { } if ctx.Data["existStr"] != nil && result["Lines"].(int) < 60 { content = content + ctx.Data["existStr"].(string) - if result["Lines"].(int) == 0 { - result["Lines"] = 1 - // startLine := ctx.QueryInt("base_line") - // result["EndLine"] = startLine + 1 - } } } } else { From 77a8f22e0224cab9cee2f32c1310de14a6723287 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 15 Dec 2022 11:34:39 +0800 Subject: [PATCH 35/79] fix-3393 --- routers/api/v1/repo/cloudbrain.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index 2ab733e21..b1602958e 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -769,6 +769,9 @@ func CloudbrainGetLog(ctx *context.APIContext) { } if ctx.Data["existStr"] != nil && result["Lines"].(int) < 60 { content = content + ctx.Data["existStr"].(string) + if result["Lines"].(int) == 0 { + result["Lines"] = 1 + } } } } else { From 0cd2bdae14de63888e4569fdf27cfeb69a08e468 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 15 Dec 2022 11:37:58 +0800 Subject: [PATCH 36/79] fix-3393 --- routers/api/v1/repo/cloudbrain.go | 1 + 1 file changed, 1 insertion(+) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index b1602958e..e5cfbc86c 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -771,6 +771,7 @@ func CloudbrainGetLog(ctx *context.APIContext) { content = content + ctx.Data["existStr"].(string) if result["Lines"].(int) == 0 { result["Lines"] = 1 + result["EndLine"] = result["StartLine"] } } } From 924c0a93258f58d4834313e1a95f3f7e21ff450f Mon Sep 17 00:00:00 2001 From: Gitea Date: Thu, 15 Dec 2022 14:49:31 +0800 Subject: [PATCH 37/79] modified modelart api --- modules/modelarts/modelarts.go | 36 ++++++++++++++++-------------------- modules/setting/setting.go | 6 ++++++ 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 746aca32e..9cc9dc1ed 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -71,10 +71,6 @@ const ( SortByCreateTime = "create_time" ConfigTypeCustom = "custom" TotalVersionCount = 1 - - ShareAddr = "192.168.0.30:/" - MountPath = "/cache/sfs" - NasType = "nfs" ) var ( @@ -285,7 +281,7 @@ func GenerateTask(ctx *context.Context, jobName, uuid, description, flavor strin return nil } -func GenerateNotebook2(ctx *context.Context, displayJobName, jobName, uuid, description, imageId string, spec *models.Specification, bootFile string,autoStopDurationInMs int64) (string, error) { +func GenerateNotebook2(ctx *context.Context, displayJobName, jobName, uuid, description, imageId string, spec *models.Specification, bootFile string, autoStopDurationInMs int64) (string, error) { if poolInfos == nil { json.Unmarshal([]byte(setting.PoolInfos), &poolInfos) } @@ -383,9 +379,9 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Parameter: req.Parameters, UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, - ShareAddr: ShareAddr, - MountPath: MountPath, - NasType: NasType, + ShareAddr: setting.ModelArtsShareAddr, + MountPath: setting.ModelArtsMountPath, + NasType: setting.ModelArtsNasType, }, }) } else { @@ -406,9 +402,9 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str Code: req.Spec.SourceSpecId, }, Parameter: req.Parameters, - ShareAddr: ShareAddr, - MountPath: MountPath, - NasType: NasType, + ShareAddr: setting.ModelArtsShareAddr, + MountPath: setting.ModelArtsMountPath, + NasType: setting.ModelArtsNasType, }, }) } @@ -527,9 +523,9 @@ func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobReq, job PreVersionId: req.PreVersionId, UserImageUrl: req.UserImageUrl, UserCommand: req.UserCommand, - ShareAddr: ShareAddr, - MountPath: MountPath, - NasType: NasType, + ShareAddr: setting.ModelArtsShareAddr, + MountPath: setting.ModelArtsMountPath, + NasType: setting.ModelArtsNasType, }, }, jobId) } else { @@ -549,9 +545,9 @@ func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobReq, job }, Parameter: req.Parameters, PreVersionId: req.PreVersionId, - ShareAddr: ShareAddr, - MountPath: MountPath, - NasType: NasType, + ShareAddr: setting.ModelArtsShareAddr, + MountPath: setting.ModelArtsMountPath, + NasType: setting.ModelArtsNasType, }, }, jobId) } @@ -988,14 +984,14 @@ func getJupyterBaseUrl(url string) string { } func getCookiesAndCsrf(jupyterUrl string) ([]*http.Cookie, string) { - log.Info("jupyter url:"+jupyterUrl) + log.Info("jupyter url:" + jupyterUrl) var cookies []*http.Cookie const retryTimes = 10 for i := 0; i < retryTimes; i++ { res, err := http.Get(jupyterUrl) if err != nil { - log.Error("browser jupyterUrl failed.",err) - if i==retryTimes-1{ + log.Error("browser jupyterUrl failed.", err) + if i == retryTimes-1 { return cookies, "" } diff --git a/modules/setting/setting.go b/modules/setting/setting.go index a473dad6a..601a20309 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -584,6 +584,9 @@ var ( TrainJobFLAVORINFOS string ModelArtsSpecialPools string ModelArtsMultiNode string + ModelArtsShareAddr string + ModelArtsMountPath string + ModelArtsNasType string //kanban IsCloudbrainTimingEnabled bool @@ -1542,6 +1545,9 @@ func NewContext() { TrainJobFLAVORINFOS = sec.Key("TrainJob_FLAVOR_INFOS").MustString("") ModelArtsSpecialPools = sec.Key("SPECIAL_POOL").MustString("") ModelArtsMultiNode = sec.Key("MULTI_NODE").MustString("") + ModelArtsShareAddr = sec.Key("ModelArts_Share_Addr").MustString("192.168.0.30:/") + ModelArtsMountPath = sec.Key("ModelArts_Mount_Path").MustString("/cache/sfs") + ModelArtsNasType = sec.Key("ModelArts_Nas_Type").MustString("nfs") sec = Cfg.Section("elk") ElkUrl = sec.Key("ELKURL").MustString("") From c95fa2e529d530e6b46fc7618e4b73c480224ca5 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 15 Dec 2022 14:53:50 +0800 Subject: [PATCH 38/79] =?UTF-8?q?=E8=A7=A3=E5=86=B3issue#3388?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/repo/aisafety.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go index 6176fcda5..55f25dba6 100644 --- a/routers/repo/aisafety.go +++ b/routers/repo/aisafety.go @@ -847,6 +847,9 @@ func createForGPU(ctx *context.Context, jobName string) error { codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath os.RemoveAll(codePath) + gitRepo, _ := git.OpenRepository(repo.RepoPath()) + commitID, _ := gitRepo.GetBranchCommitID(cloudbrain.DefaultBranchName) + if err := downloadCode(repo, codePath, cloudbrain.DefaultBranchName); err != nil { log.Error("downloadCode failed, %v", err, ctx.Data["MsgID"]) return errors.New("system error") @@ -891,7 +894,7 @@ func createForGPU(ctx *context.Context, jobName string) error { BranchName: cloudbrain.DefaultBranchName, BootFile: BootFile, Params: Params, - CommitID: "", + CommitID: commitID, ModelName: modelName, ModelVersion: modelVersion, CkptName: CkptName, From c45ffda6eb5f4df3caa0d1c02a4107b16cbf8ad6 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 15 Dec 2022 15:30:25 +0800 Subject: [PATCH 39/79] fix-3392 --- routers/api/v1/repo/cloudbrain.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index e5cfbc86c..ca4a8c747 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -766,13 +766,17 @@ func CloudbrainGetLog(ctx *context.APIContext) { if baseLine == "" && order == "desc" && result["Lines"].(int) == 0 { result["Lines"] = 1 result["EndLine"] = 1 + content = content + ctx.Data["existStr"].(string) } - if ctx.Data["existStr"] != nil && result["Lines"].(int) < 60 { + + if result["Lines"].(int) == 0 && result["StartLine"] == result["EndLine"] && result["StartLine"].(int) != 0 { content = content + ctx.Data["existStr"].(string) - if result["Lines"].(int) == 0 { - result["Lines"] = 1 - result["EndLine"] = result["StartLine"] - } + result["Lines"] = 1 + result["StartLine"] = result["StartLine"].(int) - 1 + } + if result["Lines"].(int) == 1 && result["StartLine"] == result["EndLine"] { + result["Lines"] = 0 + result["StartLine"] = result["StartLine"].(int) + 1 } } } else { From 692fbd896451344ccc5a45af46ab980cd88a3b00 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 15 Dec 2022 16:14:15 +0800 Subject: [PATCH 40/79] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/repo/ai_model_convert.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/ai_model_convert.go b/routers/repo/ai_model_convert.go index 9839a5041..36664458e 100644 --- a/routers/repo/ai_model_convert.go +++ b/routers/repo/ai_model_convert.go @@ -603,7 +603,7 @@ func stopModelConvert(id string) error { } func StopModelConvertApi(ctx *context.Context) { - id := ctx.Params(":id") + id := ctx.Query("id") log.Info("stop model convert start.id=" + id) err := stopModelConvert(id) if err == nil { From 4a07e0b7d08a7a4a1ef2adbb7b41a8d75de46c30 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 17:11:17 +0800 Subject: [PATCH 41/79] fix issue --- web_src/vuepages/pages/notebook/debug/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web_src/vuepages/pages/notebook/debug/index.vue b/web_src/vuepages/pages/notebook/debug/index.vue index 55afb57fa..388c2608d 100644 --- a/web_src/vuepages/pages/notebook/debug/index.vue +++ b/web_src/vuepages/pages/notebook/debug/index.vue @@ -344,7 +344,7 @@ export default { location.href=`${AppSubUrl}/authentication/wechat/bind` } if(err.response.status===401){ - location.href=`${AppSubUrl}/user/login` + location.href=`${AppSubUrl}/user/login?redirect_to=${location.href}?type=login` return } this.btnStatus[index]=0 @@ -411,6 +411,9 @@ export default { this.fileInfo.project_name = selfData.getAttribute('data-project') this.fileInfo.sign_name = selfData.getAttribute('data-name') let that = this; + if(new URLSearchParams(window.location.search).get("type")==='login'){ + that.dialogVisible = true; + } document .querySelector("#notebook-debug") .addEventListener("click", function () { From 787b9a44fb514b27a479db1279dad86d5fa2c163 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 17:17:30 +0800 Subject: [PATCH 42/79] fix issue --- templates/repo/grampus/trainjob/gpu/new.tmpl | 4 ++-- templates/repo/grampus/trainjob/npu/new.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/repo/grampus/trainjob/gpu/new.tmpl b/templates/repo/grampus/trainjob/gpu/new.tmpl index 0f935d086..fea74f5f7 100755 --- a/templates/repo/grampus/trainjob/gpu/new.tmpl +++ b/templates/repo/grampus/trainjob/gpu/new.tmpl @@ -90,14 +90,14 @@
- + CPU/GPU - + diff --git a/templates/repo/grampus/trainjob/npu/new.tmpl b/templates/repo/grampus/trainjob/npu/new.tmpl index 9da439cbd..8c974a09b 100755 --- a/templates/repo/grampus/trainjob/npu/new.tmpl +++ b/templates/repo/grampus/trainjob/npu/new.tmpl @@ -76,14 +76,14 @@
- + CPU/GPU - + From 1293309f96a5e51a50fe31f170554dcbcb4ec97e Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 17:34:38 +0800 Subject: [PATCH 43/79] fix issue --- public/home/home.js | 3 +++ templates/user/dashboard/feeds.tmpl | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/public/home/home.js b/public/home/home.js index aeb51b184..7805cacfc 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -294,7 +294,10 @@ function getTaskLink(record){ re = re + "/cloudbrain/train-job/" + record.Content; }else if(record.OpType == 32 || record.OpType == 33){ re = re + "/grampus/train-job/" + record.Content; + }else if(record.OpType == 39 || record.OpType == 40){ + re = re + "/grampus/notebook/" + record.Content; } + re = encodeURI(re); return re; } diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index c2da66ff5..dca6209c6 100755 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -72,9 +72,9 @@ {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} {{else if eq .GetOpType 24}} {{$.i18n.Tr "action.upload_dataset" .GetRepoLink .RefName | Str2html}} - {{else if eq .GetOpType 25}} + {{else if and (eq .GetOpType 25) (eq .GetOpType 39)}} {{$.i18n.Tr "action.task_gpudebugjob" .GetRepoLink .Content .RefName | Str2html}} - {{else if eq .GetOpType 26}} + {{else if and (eq .GetOpType 26) (eq .GetOpType 40)}} {{$.i18n.Tr "action.task_npudebugjob" .GetRepoLink .Content .RefName | Str2html}} {{else if eq .GetOpType 27}} {{$.i18n.Tr "action.task_nputrainjob" .GetRepoLink .Content .RefName | Str2html}} From 5626dd5033f2c632e2a5be53a0b674ff3e7ba9e6 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 17:39:05 +0800 Subject: [PATCH 44/79] fix issue --- templates/user/dashboard/feeds.tmpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index dca6209c6..09236eb51 100755 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -72,7 +72,9 @@ {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} {{else if eq .GetOpType 24}} {{$.i18n.Tr "action.upload_dataset" .GetRepoLink .RefName | Str2html}} + {{.GetOpType}} {{else if and (eq .GetOpType 25) (eq .GetOpType 39)}} + ----{{GetRepoLink}} {{.Content}} {{$.i18n.Tr "action.task_gpudebugjob" .GetRepoLink .Content .RefName | Str2html}} {{else if and (eq .GetOpType 26) (eq .GetOpType 40)}} {{$.i18n.Tr "action.task_npudebugjob" .GetRepoLink .Content .RefName | Str2html}} From b1db9ed6794267b65af5f59d6e8dc37bc407420e Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 17:41:42 +0800 Subject: [PATCH 45/79] fix issue --- templates/user/dashboard/feeds.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 09236eb51..b6c48140b 100755 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -74,7 +74,7 @@ {{$.i18n.Tr "action.upload_dataset" .GetRepoLink .RefName | Str2html}} {{.GetOpType}} {{else if and (eq .GetOpType 25) (eq .GetOpType 39)}} - ----{{GetRepoLink}} {{.Content}} + ----{{.GetRepoLink}} {{.Content}} {{$.i18n.Tr "action.task_gpudebugjob" .GetRepoLink .Content .RefName | Str2html}} {{else if and (eq .GetOpType 26) (eq .GetOpType 40)}} {{$.i18n.Tr "action.task_npudebugjob" .GetRepoLink .Content .RefName | Str2html}} From 77e653404025944247b5c0eadc2ec243f0b2e941 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 17:43:59 +0800 Subject: [PATCH 46/79] fix issue --- templates/user/dashboard/feeds.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index b6c48140b..7789e04ea 100755 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -12,6 +12,7 @@ {{else}} {{.ShortActUserName}} {{end}} + -=-=-={{.GetOpType}} {{if eq .GetOpType 1}} {{$.i18n.Tr "action.create_repo" .GetRepoLink .ShortRepoFullDisplayName | Str2html}} {{else if eq .GetOpType 2}} @@ -72,7 +73,7 @@ {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} {{else if eq .GetOpType 24}} {{$.i18n.Tr "action.upload_dataset" .GetRepoLink .RefName | Str2html}} - {{.GetOpType}} + {{else if and (eq .GetOpType 25) (eq .GetOpType 39)}} ----{{.GetRepoLink}} {{.Content}} {{$.i18n.Tr "action.task_gpudebugjob" .GetRepoLink .Content .RefName | Str2html}} From 64912dffa4e0e9ab431b17978696319881e693a3 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 17:47:55 +0800 Subject: [PATCH 47/79] fix issue --- templates/user/dashboard/feeds.tmpl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 7789e04ea..afb1f0139 100755 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -12,7 +12,6 @@ {{else}} {{.ShortActUserName}} {{end}} - -=-=-={{.GetOpType}} {{if eq .GetOpType 1}} {{$.i18n.Tr "action.create_repo" .GetRepoLink .ShortRepoFullDisplayName | Str2html}} {{else if eq .GetOpType 2}} @@ -73,11 +72,9 @@ {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} {{else if eq .GetOpType 24}} {{$.i18n.Tr "action.upload_dataset" .GetRepoLink .RefName | Str2html}} - - {{else if and (eq .GetOpType 25) (eq .GetOpType 39)}} - ----{{.GetRepoLink}} {{.Content}} + {{else if or (eq .GetOpType 25) (eq .GetOpType 39)}} {{$.i18n.Tr "action.task_gpudebugjob" .GetRepoLink .Content .RefName | Str2html}} - {{else if and (eq .GetOpType 26) (eq .GetOpType 40)}} + {{else if or (eq .GetOpType 26) (eq .GetOpType 40)}} {{$.i18n.Tr "action.task_npudebugjob" .GetRepoLink .Content .RefName | Str2html}} {{else if eq .GetOpType 27}} {{$.i18n.Tr "action.task_nputrainjob" .GetRepoLink .Content .RefName | Str2html}} From 7d440d6bb112a1222832fd23cee5e3ea4d74aaa1 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 17:55:10 +0800 Subject: [PATCH 48/79] fix issue --- public/home/home.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/home/home.js b/public/home/home.js index 7805cacfc..08f383ab7 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -247,7 +247,7 @@ document.onreadystatechange = function () { html += recordPrefix + actionName; html += " " + record.RefName + "" } - else if(record.OpType == "25" || record.OpType == "29"){ + else if(record.OpType == "25" || record.OpType == "29" || record.OpType == "39" || record.OpType == "40"){ html += recordPrefix + actionName; html += " " + record.RefName + "" } From a0d3fe698f0a68e5615e3d1658d582cb1ff6d9fd Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Thu, 15 Dec 2022 17:58:13 +0800 Subject: [PATCH 49/79] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/socketwrap/clientManager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/socketwrap/clientManager.go b/services/socketwrap/clientManager.go index 7470b1198..7bac92ab8 100755 --- a/services/socketwrap/clientManager.go +++ b/services/socketwrap/clientManager.go @@ -10,7 +10,7 @@ import ( "github.com/elliotchance/orderedmap" ) -var opTypes = []int{1, 2, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 17, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 35} +var opTypes = []int{1, 2, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 17, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 35, 39, 40} type ClientsManager struct { Clients *orderedmap.OrderedMap From ec16d9a34bb67c29f8c3c08dd36452163aea1d35 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 17:59:15 +0800 Subject: [PATCH 50/79] fix issue --- public/home/home.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/public/home/home.js b/public/home/home.js index 08f383ab7..066de8230 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -453,7 +453,9 @@ var actionNameZH={ "33":"创建了CPU/GPU类型训练任务", "35":"创建的数据集 {dataset} 被设置为推荐数据集", "36":"提交了镜像 {image}", - "37":"提交的镜像 {image} 被设置为推荐镜像", + "37": "提交的镜像 {image} 被设置为推荐镜像", + "39":"创建了CPU/GPU类型调试任务", + "40":"创建了NPU类型调试任务", }; var actionNameEN={ @@ -484,7 +486,9 @@ var actionNameEN={ "33":" created CPU/GPU type training task", "35":" created dataset {dataset} was set as recommended dataset", "36":"committed image {image}", - "37":"committed image {image} was set as recommended image", + "37": "committed image {image} was set as recommended image", + "39":" created CPU/GPU type debugging task ", + "40":" created NPU type debugging task ", }; var repoAndOrgZH={ From 863d8b548e3617d18b4a0b65d3816b62aebfc78b Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 18:10:37 +0800 Subject: [PATCH 51/79] fix issue --- web_src/vuepages/pages/notebook/debug/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/web_src/vuepages/pages/notebook/debug/index.vue b/web_src/vuepages/pages/notebook/debug/index.vue index 388c2608d..60397babe 100644 --- a/web_src/vuepages/pages/notebook/debug/index.vue +++ b/web_src/vuepages/pages/notebook/debug/index.vue @@ -412,6 +412,7 @@ export default { this.fileInfo.sign_name = selfData.getAttribute('data-name') let that = this; if(new URLSearchParams(window.location.search).get("type")==='login'){ + that.getNotebookInfo() that.dialogVisible = true; } document From e1bd2fb8695a25ab937bfac8378d21386eee5429 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 18:13:59 +0800 Subject: [PATCH 52/79] fix issue --- web_src/vuepages/pages/notebook/debug/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/vuepages/pages/notebook/debug/index.vue b/web_src/vuepages/pages/notebook/debug/index.vue index 60397babe..20af220f5 100644 --- a/web_src/vuepages/pages/notebook/debug/index.vue +++ b/web_src/vuepages/pages/notebook/debug/index.vue @@ -344,7 +344,7 @@ export default { location.href=`${AppSubUrl}/authentication/wechat/bind` } if(err.response.status===401){ - location.href=`${AppSubUrl}/user/login?redirect_to=${location.href}?type=login` + location.href=`${AppSubUrl}/user/login?redirect_to=${location.origin}${location.pathname}?type=login` return } this.btnStatus[index]=0 From f60ba3a5ff1fc90b8a2205dd70631a6c0e299a41 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 18:44:15 +0800 Subject: [PATCH 53/79] fix issue --- web_src/vuepages/pages/reward/point/utils.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web_src/vuepages/pages/reward/point/utils.js b/web_src/vuepages/pages/reward/point/utils.js index 800fd64e2..a2a94fec8 100644 --- a/web_src/vuepages/pages/reward/point/utils.js +++ b/web_src/vuepages/pages/reward/point/utils.js @@ -29,7 +29,11 @@ const getJobTypeLink = (record, type) => { const cloudbrain = type === 'INCREASE' ? record.Action?.Cloudbrain : record.Cloudbrain; switch (cloudbrain?.JobType) { case 'DEBUG': - if (cloudbrain.ComputeResource === 'CPU/GPU') { + console.log("cloudbrain") + if (cloudbrain.Type === 2) { + link += `/grampus/notebook/${cloudbrain.ID}`; + } + else if (cloudbrain.ComputeResource === 'CPU/GPU') { link += `/cloudbrain/${cloudbrain.ID}`; } else { link += `/modelarts/notebook/${cloudbrain.ID}`; From d6b301abda7c799c0f3b23bf758d4393818a0793 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 18:56:15 +0800 Subject: [PATCH 54/79] fix issue --- options/locale/locale_en-US.ini | 2 ++ options/locale/locale_zh-CN.ini | 2 ++ templates/user/dashboard/feeds.tmpl | 8 ++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index c42b9fcce..317a51f6d 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3120,6 +3120,8 @@ reject_pull_request = `suggested changes for %s#%[2]s` upload_dataset=`upload dataset %s` task_gpudebugjob=`created CPU/GPU type debugging task %s` task_npudebugjob=`created NPU type debugging task %s` +task_c2net_gpudebugjob=`created CPU/GPU type debugging task %s` +task_c2net_npudebugjob=`created NPU type debugging task %s` task_nputrainjob=`created NPU training task %s` task_inferencejob=`created reasoning task %s` task_benchmark=`created profiling task %s` diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 6f6332b03..b186966c1 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -3138,6 +3138,8 @@ reject_pull_request=`建议变更 %s#%[2]s` upload_dataset=`上传了数据集文件 %s` task_gpudebugjob=`创建了CPU/GPU类型调试任务 %s` task_npudebugjob=`创建了NPU类型调试任务 %s` +task_c2net_gpudebugjob=`创建了CPU/GPU类型调试任务 %s` +task_c2net_npudebugjob=`创建了NPU类型调试任务 %s` task_nputrainjob=`创建了NPU类型训练任务 %s` task_inferencejob=`创建了推理任务 %s` task_benchmark=`创建了评测任务 %s` diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index afb1f0139..2ab323935 100755 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -72,9 +72,9 @@ {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} {{else if eq .GetOpType 24}} {{$.i18n.Tr "action.upload_dataset" .GetRepoLink .RefName | Str2html}} - {{else if or (eq .GetOpType 25) (eq .GetOpType 39)}} + {{else if eq .GetOpType 25}} {{$.i18n.Tr "action.task_gpudebugjob" .GetRepoLink .Content .RefName | Str2html}} - {{else if or (eq .GetOpType 26) (eq .GetOpType 40)}} + {{else if eq .GetOpType 26)}} {{$.i18n.Tr "action.task_npudebugjob" .GetRepoLink .Content .RefName | Str2html}} {{else if eq .GetOpType 27}} {{$.i18n.Tr "action.task_nputrainjob" .GetRepoLink .Content .RefName | Str2html}} @@ -92,6 +92,10 @@ {{$.i18n.Tr "action.task_c2netgputrainjob" .GetRepoLink .Content .RefName | Str2html}} {{else if eq .GetOpType 35}} {{$.i18n.Tr "action.dataset_recommended" .GetRepoLink (index .GetIssueInfos 1 | RenderEmoji) | Str2html}} + {{else if eq .GetOpType 39}} + {{$.i18n.Tr "action.task_c2net_gpudebugjob" .GetRepoLink .Content .RefName | Str2html}} + {{else if eq .GetOpType 40}} + {{$.i18n.Tr "action.task_c2net_npudebugjob" .GetRepoLink .Content .RefName | Str2html}} {{end}}

{{if or (eq .GetOpType 5) (eq .GetOpType 18)}} From 0b908e4b278196f839bef052bb99959d58fd6b0e Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 18:56:58 +0800 Subject: [PATCH 55/79] fix issue --- templates/user/dashboard/feeds.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 2ab323935..a6b12da2d 100755 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -74,7 +74,7 @@ {{$.i18n.Tr "action.upload_dataset" .GetRepoLink .RefName | Str2html}} {{else if eq .GetOpType 25}} {{$.i18n.Tr "action.task_gpudebugjob" .GetRepoLink .Content .RefName | Str2html}} - {{else if eq .GetOpType 26)}} + {{else if eq .GetOpType 26}} {{$.i18n.Tr "action.task_npudebugjob" .GetRepoLink .Content .RefName | Str2html}} {{else if eq .GetOpType 27}} {{$.i18n.Tr "action.task_nputrainjob" .GetRepoLink .Content .RefName | Str2html}} From eedb59bd3c1a9b5c479797efbefd7dc469596194 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 19:01:28 +0800 Subject: [PATCH 56/79] fix issue --- templates/user/dashboard/feeds.tmpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index a6b12da2d..a421ccf22 100755 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -93,8 +93,10 @@ {{else if eq .GetOpType 35}} {{$.i18n.Tr "action.dataset_recommended" .GetRepoLink (index .GetIssueInfos 1 | RenderEmoji) | Str2html}} {{else if eq .GetOpType 39}} + {{.GetOpType}} {{$.i18n.Tr "action.task_c2net_gpudebugjob" .GetRepoLink .Content .RefName | Str2html}} {{else if eq .GetOpType 40}} + {{.GetOpType}} {{$.i18n.Tr "action.task_c2net_npudebugjob" .GetRepoLink .Content .RefName | Str2html}} {{end}}

From a34303b83eec0de36e8a53f721a0725840ca88bd Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 19:04:20 +0800 Subject: [PATCH 57/79] fix issue --- templates/user/dashboard/feeds.tmpl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index a421ccf22..3950fe277 100755 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -93,11 +93,9 @@ {{else if eq .GetOpType 35}} {{$.i18n.Tr "action.dataset_recommended" .GetRepoLink (index .GetIssueInfos 1 | RenderEmoji) | Str2html}} {{else if eq .GetOpType 39}} - {{.GetOpType}} - {{$.i18n.Tr "action.task_c2net_gpudebugjob" .GetRepoLink .Content .RefName | Str2html}} - {{else if eq .GetOpType 40}} - {{.GetOpType}} {{$.i18n.Tr "action.task_c2net_npudebugjob" .GetRepoLink .Content .RefName | Str2html}} + {{else if eq .GetOpType 40}} + {{$.i18n.Tr "action.task_c2net_gpudebugjob" .GetRepoLink .Content .RefName | Str2html}} {{end}}

{{if or (eq .GetOpType 5) (eq .GetOpType 18)}} From 1f56baff01fd243e6eea38a5d9eebee4947392d9 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 16 Dec 2022 09:57:26 +0800 Subject: [PATCH 58/79] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E6=8A=A5=E5=91=8A=E7=9A=84=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 229 ++++++++++++++++++++++++++++--------- models/user_business_struct.go | 9 ++ routers/repo/user_data_analysis.go | 12 ++ 3 files changed, 194 insertions(+), 56 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index ccefbf4f6..dd72fac4a 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -355,6 +355,7 @@ func QueryUserStaticDataForUserDefine(opts *UserBusinessAnalysisQueryOptions, wi OpenIIndexMap := queryUserRepoOpenIIndex(start_unix, end_unix) CloudBrainTaskMap, CloudBrainTaskItemMap := queryCloudBrainTask(start_unix, end_unix) AiModelManageMap := queryUserModel(start_unix, end_unix) + AiModelConvertMap := queryUserModelConvert(start_unix, end_unix) CollectDataset, CollectedDataset := queryDatasetStars(start_unix, end_unix) RecommendDataset, _ := queryRecommedDataSet(start_unix, end_unix) @@ -427,6 +428,7 @@ func QueryUserStaticDataForUserDefine(opts *UserBusinessAnalysisQueryOptions, wi dateRecord.GpuBenchMarkJob = getMapKeyStringValue(fmt.Sprint(dateRecord.ID)+"_GpuBenchMarkJob", CloudBrainTaskItemMap) dateRecord.CloudBrainRunTime = getMapKeyStringValue(fmt.Sprint(dateRecord.ID)+"_CloudBrainRunTime", CloudBrainTaskItemMap) dateRecord.CommitModelCount = getMapValue(dateRecord.ID, AiModelManageMap) + dateRecord.ModelConvertCount = getMapValue(dateRecord.ID, AiModelConvertMap) dateRecord.CollectDataset = getMapValue(dateRecord.ID, CollectDataset) dateRecord.CollectedDataset = getMapValue(dateRecord.ID, CollectedDataset) @@ -546,6 +548,7 @@ func QueryUserStaticDataPage(opts *UserBusinessAnalysisQueryOptions) ([]*UserBus resultMap[userRecord.ID].CommitDatasetSize += userRecord.CommitDatasetSize resultMap[userRecord.ID].CommitDatasetNum += userRecord.CommitDatasetNum resultMap[userRecord.ID].CommitModelCount += userRecord.CommitModelCount + resultMap[userRecord.ID].ModelConvertCount += userRecord.ModelConvertCount resultMap[userRecord.ID].SolveIssueCount += userRecord.SolveIssueCount resultMap[userRecord.ID].EncyclopediasCount += userRecord.EncyclopediasCount resultMap[userRecord.ID].CreateRepoCount += userRecord.CreateRepoCount @@ -583,7 +586,7 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS startTime := currentTimeNow.AddDate(0, 0, -1) CodeMergeCountMap := queryPullRequest(start_unix, end_unix) - CommitCountMap, mostActiveMap := queryCommitAction(start_unix, end_unix, 5) + CommitCountMap, _ := queryCommitAction(start_unix, end_unix, 5) IssueCountMap := queryCreateIssue(start_unix, end_unix) CommentCountMap := queryComment(start_unix, end_unix) @@ -599,29 +602,25 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS //log.Info("CommitCodeSizeMapJson=" + string(CommitCodeSizeMapJson)) } //CommitCodeSizeMap := queryCommitCodeSize(StartTimeNextDay.Unix(), EndTimeNextDay.Unix()) - CommitDatasetSizeMap, CommitDatasetNumMap, dataSetDownloadMap := queryDatasetSize(start_unix, end_unix) + CommitDatasetSizeMap, CommitDatasetNumMap, _ := queryDatasetSize(start_unix, end_unix) SolveIssueCountMap := querySolveIssue(start_unix, end_unix) - CreateRepoCountMap, DetailInfoMap, MostDownloadMap := queryUserCreateRepo(start_unix, end_unix) + CreateRepoCountMap, _, _ := queryUserCreateRepo(start_unix, end_unix) LoginCountMap := queryLoginCount(start_unix, end_unix) OpenIIndexMap := queryUserRepoOpenIIndex(startTime.Unix(), end_unix) CloudBrainTaskMap, CloudBrainTaskItemMap := queryCloudBrainTask(start_unix, end_unix) AiModelManageMap := queryUserModel(start_unix, end_unix) + AiModelConvertMap := queryUserModelConvert(start_unix, end_unix) CollectDataset, CollectedDataset := queryDatasetStars(start_unix, end_unix) - RecommendDataset, CreatedDataset := queryRecommedDataSet(start_unix, end_unix) + RecommendDataset, _ := queryRecommedDataSet(start_unix, end_unix) CollectImage, CollectedImage := queryImageStars(start_unix, end_unix) RecommendImage := queryRecommedImage(start_unix, end_unix) InvitationMap := queryUserInvitationCount(start_unix, end_unix) DataDate := currentTimeNow.Format("2006-01-02") + " 00:01" - bonusMap := make(map[string]map[string]int) - if isUserYearData(tableName) { - bonusMap = getBonusMap() - log.Info("truncate all data from table:user_summary_current_year ") - statictisSess.Exec("TRUNCATE TABLE user_summary_current_year") - } + cond := "type != 1 and is_active=true" count, err := sess.Where(cond).Count(new(User)) if err != nil { @@ -687,6 +686,7 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS dateRecordAll.GpuBenchMarkJob = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_GpuBenchMarkJob", CloudBrainTaskItemMap) dateRecordAll.CloudBrainRunTime = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_CloudBrainRunTime", CloudBrainTaskItemMap) dateRecordAll.CommitModelCount = getMapValue(dateRecordAll.ID, AiModelManageMap) + dateRecordAll.ModelConvertCount = getMapValue(dateRecordAll.ID, AiModelConvertMap) dateRecordAll.CollectDataset = getMapValue(dateRecordAll.ID, CollectDataset) dateRecordAll.CollectedDataset = getMapValue(dateRecordAll.ID, CollectedDataset) dateRecordAll.RecommendDataset = getMapValue(dateRecordAll.ID, RecommendDataset) @@ -719,37 +719,6 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS userMetrics["TotalHasActivityUser"] = getMapKeyStringValue("TotalHasActivityUser", userMetrics) + 1 } } - if isUserYearData(tableName) { - //年度数据 - subTime := time.Now().UTC().Sub(dateRecordAll.RegistDate.AsTime().UTC()) - mostActiveDay := "" - if userInfo, ok := mostActiveMap[dateRecordAll.ID]; ok { - mostActiveDay = getMostActiveJson(userInfo) - } - scoreMap := make(map[string]float64) - repoInfo := getRepoDetailInfo(DetailInfoMap, dateRecordAll.ID, MostDownloadMap) - dataSetInfo, datasetscore := getDataSetInfo(dateRecordAll.ID, CreatedDataset, dataSetDownloadMap, CommitDatasetNumMap, CollectedDataset) - scoreMap["datasetscore"] = datasetscore - codeInfo, codescore := getCodeInfo(dateRecordAll) - scoreMap["codescore"] = codescore - cloudBrainInfo := getCloudBrainInfo(dateRecordAll, CloudBrainTaskItemMap, scoreMap) - playARoll := getPlayARoll(bonusMap, dateRecordAll.Name, scoreMap) - re := &UserSummaryCurrentYear{ - ID: dateRecordAll.ID, - Name: dateRecordAll.Name, - Email: dateRecordAll.Email, - Phone: dateRecordAll.Phone, - RegistDate: dateRecordAll.RegistDate, - DateCount: int(subTime.Hours()) / 24, - MostActiveDay: mostActiveDay, - RepoInfo: repoInfo, - DataSetInfo: dataSetInfo, - CodeInfo: codeInfo, - CloudBrainInfo: cloudBrainInfo, - PlayARoll: playARoll, - } - statictisSess.Insert(re) - } } if len(dateRecordBatch) > 0 { err := insertTable(dateRecordBatch, tableName, statictisSess) @@ -779,6 +748,127 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS log.Info("refresh data finished.tableName=" + tableName + " total record:" + fmt.Sprint(insertCount)) } +func RefreshUserYearTable(pageStartTime time.Time, pageEndTime time.Time) { + sess := x.NewSession() + defer sess.Close() + log.Info("RefreshUserYearTable start....") + statictisSess := xStatistic.NewSession() + defer statictisSess.Close() + + log.Info("UserYear StartTime:" + pageStartTime.Format("2006-01-02 15:04:05")) + log.Info("UserYear EndTime time:" + pageEndTime.Format("2006-01-02 15:04:05")) + + start_unix := pageStartTime.Unix() + end_unix := pageEndTime.Unix() + + CodeMergeCountMap := queryPullRequest(start_unix, end_unix) + CommitCountMap, mostActiveMap := queryCommitAction(start_unix, end_unix, 5) + IssueCountMap := queryCreateIssue(start_unix, end_unix) + + CommentCountMap := queryComment(start_unix, end_unix) + + CommitCodeSizeMap, err := GetAllUserKPIStats(pageStartTime, pageEndTime) + if err != nil { + log.Info("query commit code errr.") + } else { + log.Info("query commit code size, len=" + fmt.Sprint(len(CommitCodeSizeMap))) + } + CommitDatasetSizeMap, CommitDatasetNumMap, dataSetDownloadMap := queryDatasetSize(start_unix, end_unix) + SolveIssueCountMap := querySolveIssue(start_unix, end_unix) + CreateRepoCountMap, DetailInfoMap, MostDownloadMap := queryUserCreateRepo(start_unix, end_unix) + + CloudBrainTaskMap, CloudBrainTaskItemMap := queryCloudBrainTask(start_unix, end_unix) + + _, CollectedDataset := queryDatasetStars(start_unix, end_unix) + _, CreatedDataset := queryRecommedDataSet(start_unix, end_unix) + + bonusMap := getBonusMap() + log.Info("truncate all data from table:user_summary_current_year ") + statictisSess.Exec("TRUNCATE TABLE user_summary_current_year") + + cond := "type != 1 and is_active=true" + count, err := sess.Where(cond).Count(new(User)) + if err != nil { + log.Info("query user error. return.") + return + } + var indexTotal int64 + indexTotal = 0 + for { + sess.Select("`user`.*").Table("user").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal)) + userList := make([]*User, 0) + sess.Find(&userList) + for _, userRecord := range userList { + var dateRecordAll UserBusinessAnalysisAll + dateRecordAll.ID = userRecord.ID + dateRecordAll.Email = userRecord.Email + dateRecordAll.Phone = userRecord.PhoneNumber + dateRecordAll.RegistDate = userRecord.CreatedUnix + dateRecordAll.Name = userRecord.Name + + dateRecordAll.CodeMergeCount = getMapValue(dateRecordAll.ID, CodeMergeCountMap) + dateRecordAll.CommitCount = getMapValue(dateRecordAll.ID, CommitCountMap) + dateRecordAll.IssueCount = getMapValue(dateRecordAll.ID, IssueCountMap) + dateRecordAll.CommentCount = getMapValue(dateRecordAll.ID, CommentCountMap) + + if _, ok := CommitCodeSizeMap[dateRecordAll.Email]; !ok { + dateRecordAll.CommitCodeSize = 0 + } else { + dateRecordAll.CommitCodeSize = int(CommitCodeSizeMap[dateRecordAll.Email].CommitLines) + } + //dateRecordAll.CommitCodeSize = getMapValue(dateRecordAll.ID, CommitCodeSizeMap) + dateRecordAll.CommitDatasetSize = getMapValue(dateRecordAll.ID, CommitDatasetSizeMap) + dateRecordAll.CommitDatasetNum = getMapValue(dateRecordAll.ID, CommitDatasetNumMap) + dateRecordAll.SolveIssueCount = getMapValue(dateRecordAll.ID, SolveIssueCountMap) + dateRecordAll.CreateRepoCount = getMapValue(dateRecordAll.ID, CreateRepoCountMap) + + dateRecordAll.CloudBrainTaskNum = getMapValue(dateRecordAll.ID, CloudBrainTaskMap) + dateRecordAll.GpuDebugJob = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_GpuDebugJob", CloudBrainTaskItemMap) + dateRecordAll.NpuDebugJob = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_NpuDebugJob", CloudBrainTaskItemMap) + dateRecordAll.GpuTrainJob = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_GpuTrainJob", CloudBrainTaskItemMap) + dateRecordAll.NpuTrainJob = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_NpuTrainJob", CloudBrainTaskItemMap) + dateRecordAll.NpuInferenceJob = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_NpuInferenceJob", CloudBrainTaskItemMap) + dateRecordAll.GpuBenchMarkJob = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_GpuBenchMarkJob", CloudBrainTaskItemMap) + dateRecordAll.CloudBrainRunTime = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_CloudBrainRunTime", CloudBrainTaskItemMap) + + //年度数据 + subTime := time.Now().UTC().Sub(dateRecordAll.RegistDate.AsTime().UTC()) + mostActiveDay := "" + if userInfo, ok := mostActiveMap[dateRecordAll.ID]; ok { + mostActiveDay = getMostActiveJson(userInfo) + } + scoreMap := make(map[string]float64) + repoInfo := getRepoDetailInfo(DetailInfoMap, dateRecordAll.ID, MostDownloadMap) + dataSetInfo, datasetscore := getDataSetInfo(dateRecordAll.ID, CreatedDataset, dataSetDownloadMap, CommitDatasetNumMap, CollectedDataset) + scoreMap["datasetscore"] = datasetscore + codeInfo, codescore := getCodeInfo(dateRecordAll) + scoreMap["codescore"] = codescore + cloudBrainInfo := getCloudBrainInfo(dateRecordAll, CloudBrainTaskItemMap, scoreMap) + playARoll := getPlayARoll(bonusMap, dateRecordAll.Name, scoreMap) + re := &UserSummaryCurrentYear{ + ID: dateRecordAll.ID, + Name: dateRecordAll.Name, + Email: dateRecordAll.Email, + Phone: dateRecordAll.Phone, + RegistDate: dateRecordAll.RegistDate, + DateCount: int(subTime.Hours()) / 24, + MostActiveDay: mostActiveDay, + RepoInfo: repoInfo, + DataSetInfo: dataSetInfo, + CodeInfo: codeInfo, + CloudBrainInfo: cloudBrainInfo, + PlayARoll: playARoll, + } + statictisSess.Insert(re) + } + indexTotal += PAGE_SIZE + if indexTotal >= count { + break + } + } + log.Info("update user year data finished. ") +} + func isUserYearData(tableName string) bool { if tableName == "user_business_analysis_current_year" { currentTimeNow := time.Now() @@ -998,7 +1088,7 @@ func insertTable(dateRecords []UserBusinessAnalysisAll, tableName string, static insertBatchSql := "INSERT INTO public." + tableName + "(id, count_date, code_merge_count, commit_count, issue_count, comment_count, focus_repo_count, star_repo_count, watched_count, gitea_age_month, commit_code_size, commit_dataset_size, " + - "commit_model_count, solve_issue_count, encyclopedias_count, regist_date, create_repo_count, login_count, open_i_index, email, name, data_date,cloud_brain_task_num,gpu_debug_job,npu_debug_job,gpu_train_job,npu_train_job,npu_inference_job,gpu_bench_mark_job,cloud_brain_run_time,commit_dataset_num,user_index,user_location,focus_other_user,collect_dataset,collected_dataset,recommend_dataset,collect_image,collected_image,recommend_image,user_index_primitive,phone,invitation_user_num) " + + "commit_model_count, solve_issue_count, encyclopedias_count, regist_date, create_repo_count, login_count, open_i_index, email, name, data_date,cloud_brain_task_num,gpu_debug_job,npu_debug_job,gpu_train_job,npu_train_job,npu_inference_job,gpu_bench_mark_job,cloud_brain_run_time,commit_dataset_num,user_index,user_location,focus_other_user,collect_dataset,collected_dataset,recommend_dataset,collect_image,collected_image,recommend_image,user_index_primitive,phone,invitation_user_num,model_convert_count) " + "VALUES" for i, record := range dateRecords { @@ -1007,7 +1097,7 @@ func insertTable(dateRecords []UserBusinessAnalysisAll, tableName string, static ", " + fmt.Sprint(record.WatchedCount) + ", " + fmt.Sprint(record.GiteaAgeMonth) + ", " + fmt.Sprint(record.CommitCodeSize) + ", " + fmt.Sprint(record.CommitDatasetSize) + ", " + fmt.Sprint(record.CommitModelCount) + ", " + fmt.Sprint(record.SolveIssueCount) + ", " + fmt.Sprint(record.EncyclopediasCount) + ", " + fmt.Sprint(record.RegistDate) + ", " + fmt.Sprint(record.CreateRepoCount) + ", " + fmt.Sprint(record.LoginCount) + ", " + fmt.Sprint(record.OpenIIndex) + ", '" + record.Email + "', '" + record.Name + "', '" + record.DataDate + "'," + fmt.Sprint(record.CloudBrainTaskNum) + "," + fmt.Sprint(record.GpuDebugJob) + "," + fmt.Sprint(record.NpuDebugJob) + "," + fmt.Sprint(record.GpuTrainJob) + "," + fmt.Sprint(record.NpuTrainJob) + "," + fmt.Sprint(record.NpuInferenceJob) + "," + fmt.Sprint(record.GpuBenchMarkJob) + "," + fmt.Sprint(record.CloudBrainRunTime) + "," + fmt.Sprint(record.CommitDatasetNum) + "," + fmt.Sprint(record.UserIndex) + ",'" + record.UserLocation + "'," + - fmt.Sprint(record.FocusOtherUser) + "," + fmt.Sprint(record.CollectDataset) + "," + fmt.Sprint(record.CollectedDataset) + "," + fmt.Sprint(record.RecommendDataset) + "," + fmt.Sprint(record.CollectImage) + "," + fmt.Sprint(record.CollectedImage) + "," + fmt.Sprint(record.RecommendImage) + "," + fmt.Sprint(record.UserIndexPrimitive) + ",'" + record.Phone + "'" + "," + fmt.Sprint(record.InvitationUserNum) + ")" + fmt.Sprint(record.FocusOtherUser) + "," + fmt.Sprint(record.CollectDataset) + "," + fmt.Sprint(record.CollectedDataset) + "," + fmt.Sprint(record.RecommendDataset) + "," + fmt.Sprint(record.CollectImage) + "," + fmt.Sprint(record.CollectedImage) + "," + fmt.Sprint(record.RecommendImage) + "," + fmt.Sprint(record.UserIndexPrimitive) + ",'" + record.Phone + "'" + "," + fmt.Sprint(record.InvitationUserNum) + "," + fmt.Sprint(record.ModelConvertCount) + ")" if i < (len(dateRecords) - 1) { insertBatchSql += "," } @@ -1098,6 +1188,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time, OpenIIndexMap := queryUserRepoOpenIIndex(start_unix, end_unix) CloudBrainTaskMap, CloudBrainTaskItemMap := queryCloudBrainTask(start_unix, end_unix) AiModelManageMap := queryUserModel(start_unix, end_unix) + AiModelConvertMap := queryUserModelConvert(start_unix, end_unix) CollectDataset, CollectedDataset := queryDatasetStars(start_unix, end_unix) RecommendDataset, _ := queryRecommedDataSet(start_unix, end_unix) @@ -1179,7 +1270,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time, dateRecord.GpuBenchMarkJob = getMapKeyStringValue(fmt.Sprint(dateRecord.ID)+"_GpuBenchMarkJob", CloudBrainTaskItemMap) dateRecord.CloudBrainRunTime = getMapKeyStringValue(fmt.Sprint(dateRecord.ID)+"_CloudBrainRunTime", CloudBrainTaskItemMap) dateRecord.CommitModelCount = getMapValue(dateRecord.ID, AiModelManageMap) - + dateRecord.ModelConvertCount = getMapValue(dateRecord.ID, AiModelConvertMap) dateRecord.CollectDataset = getMapValue(dateRecord.ID, CollectDataset) dateRecord.CollectedDataset = getMapValue(dateRecord.ID, CollectedDataset) dateRecord.RecommendDataset = getMapValue(dateRecord.ID, RecommendDataset) @@ -1368,6 +1459,7 @@ func getUserIndexFromAnalysisAll(dateRecord UserBusinessAnalysisAll, ParaWeight result += float64(dateRecord.CreateRepoCount) * getParaWeightValue("CreateRepoCount", ParaWeight, 0.05) result += float64(dateRecord.CloudBrainTaskNum) * getParaWeightValue("CloudBrainTaskNum", ParaWeight, 0.3) result += float64(dateRecord.CommitModelCount) * getParaWeightValue("CommitModelCount", ParaWeight, 0.2) + result += float64(dateRecord.ModelConvertCount) * getParaWeightValue("ModelConvertCount", ParaWeight, 0.2) result += dateRecord.OpenIIndex * getParaWeightValue("OpenIIndex", ParaWeight, 0.1) result += float64(dateRecord.CollectDataset) * getParaWeightValue("CollectDataset", ParaWeight, 0.1) @@ -1393,6 +1485,7 @@ func getUserActivateAll(dateRecord UserBusinessAnalysisAll) int { result += dateRecord.CreateRepoCount result += dateRecord.CloudBrainTaskNum result += dateRecord.CommitModelCount + result += dateRecord.ModelConvertCount result += dateRecord.CommitDatasetNum result += dateRecord.FocusOtherUser result += dateRecord.CollectDataset @@ -1414,6 +1507,7 @@ func getUserActivate(dateRecord UserBusinessAnalysis) int { result += dateRecord.CreateRepoCount result += dateRecord.CloudBrainTaskNum result += dateRecord.CommitModelCount + result += dateRecord.ModelConvertCount result += dateRecord.CommitDatasetNum result += dateRecord.FocusOtherUser result += dateRecord.CollectDataset @@ -1450,6 +1544,7 @@ func getUserIndex(dateRecord UserBusinessAnalysis, ParaWeight map[string]float64 result += float64(dateRecord.CreateRepoCount) * getParaWeightValue("CreateRepoCount", ParaWeight, 0.05) result += float64(dateRecord.CloudBrainTaskNum) * getParaWeightValue("CloudBrainTaskNum", ParaWeight, 0.3) result += float64(dateRecord.CommitModelCount) * getParaWeightValue("CommitModelCount", ParaWeight, 0.2) + result += float64(dateRecord.ModelConvertCount) * getParaWeightValue("ModelConvertCount", ParaWeight, 0.2) result += dateRecord.OpenIIndex * getParaWeightValue("OpenIIndex", ParaWeight, 0.1) result += float64(dateRecord.CollectDataset) * getParaWeightValue("CollectDataset", ParaWeight, 0.1) @@ -1494,10 +1589,6 @@ func getInt(str string) int { return int(re) } -func CounDataByDate(wikiCountMap map[string]int, startTime time.Time, endTime time.Time) { - CounDataByDateAndReCount(wikiCountMap, startTime, endTime, false) -} - func querySolveIssue(start_unix int64, end_unix int64) map[int64]int { sess := x.NewSession() defer sess.Close() @@ -2108,8 +2199,8 @@ func queryUserCreateRepo(start_unix int64, end_unix int64) (map[int64]int, map[s detailInfoMap[key] = getMapKeyStringValue(key, detailInfoMap) + int(repoRecord.CloneCnt) key = fmt.Sprint(repoRecord.OwnerID) + "_most_download" - if int(repoRecord.CloneCnt) > getMapKeyStringValue(key, detailInfoMap) { - detailInfoMap[key] = int(repoRecord.CloneCnt) + if int(repoRecord.GitCloneCnt) > getMapKeyStringValue(key, detailInfoMap) { + detailInfoMap[key] = int(repoRecord.GitCloneCnt) mostDownloadMap[repoRecord.OwnerID] = repoRecord.DisplayName() } } @@ -2278,6 +2369,38 @@ func queryUserModel(start_unix int64, end_unix int64) map[int64]int { return resultMap } +func queryUserModelConvert(start_unix int64, end_unix int64) map[int64]int { + sess := x.NewSession() + defer sess.Close() + resultMap := make(map[int64]int) + cond := " created_unix>=" + fmt.Sprint(start_unix) + " and created_unix<=" + fmt.Sprint(end_unix) + count, err := sess.Where(cond).Count(new(AiModelConvert)) + if err != nil { + log.Info("query AiModelConvert error. return.") + return resultMap + } + var indexTotal int64 + indexTotal = 0 + for { + sess.Select("id,user_id").Table("ai_model_convert").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal)) + aiModelList := make([]*AiModelConvert, 0) + sess.Find(&aiModelList) + log.Info("query AiModelConvert size=" + fmt.Sprint(len(aiModelList))) + for _, aiModelRecord := range aiModelList { + if _, ok := resultMap[aiModelRecord.UserId]; !ok { + resultMap[aiModelRecord.UserId] = 1 + } else { + resultMap[aiModelRecord.UserId] += 1 + } + } + indexTotal += PAGE_SIZE + if indexTotal >= count { + break + } + } + return resultMap +} + func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[string]int) { sess := x.NewSession() defer sess.Close() @@ -2443,9 +2566,3 @@ func GetContentFromPromote(url string) (string, error) { allLineStr := string(bytes) return allLineStr, nil } - -func QueryLast30DaysHighestIndexUsers(size int) ([]int64, error) { - userIds := make([]int64, 0) - err := xStatistic.Table("user_business_analysis_last30_day").Cols("id").OrderBy("user_index desc").Limit(size).Find(&userIds) - return userIds, err -} diff --git a/models/user_business_struct.go b/models/user_business_struct.go index 9dcc12342..00c7f6176 100644 --- a/models/user_business_struct.go +++ b/models/user_business_struct.go @@ -89,6 +89,7 @@ type UserBusinessAnalysisCurrentYear struct { Phone string `xorm:"NULL"` InvitationUserNum int `xorm:"NOT NULL DEFAULT 0"` + ModelConvertCount int `xorm:"NOT NULL DEFAULT 0"` } type UserBusinessAnalysisLast30Day struct { @@ -157,6 +158,7 @@ type UserBusinessAnalysisLast30Day struct { Phone string `xorm:"NULL"` InvitationUserNum int `xorm:"NOT NULL DEFAULT 0"` + ModelConvertCount int `xorm:"NOT NULL DEFAULT 0"` } type UserBusinessAnalysisLastMonth struct { @@ -225,6 +227,7 @@ type UserBusinessAnalysisLastMonth struct { Phone string `xorm:"NULL"` InvitationUserNum int `xorm:"NOT NULL DEFAULT 0"` + ModelConvertCount int `xorm:"NOT NULL DEFAULT 0"` } type UserBusinessAnalysisCurrentMonth struct { @@ -293,6 +296,7 @@ type UserBusinessAnalysisCurrentMonth struct { Phone string `xorm:"NULL"` InvitationUserNum int `xorm:"NOT NULL DEFAULT 0"` + ModelConvertCount int `xorm:"NOT NULL DEFAULT 0"` } type UserBusinessAnalysisCurrentWeek struct { @@ -362,6 +366,7 @@ type UserBusinessAnalysisCurrentWeek struct { Phone string `xorm:"NULL"` InvitationUserNum int `xorm:"NOT NULL DEFAULT 0"` + ModelConvertCount int `xorm:"NOT NULL DEFAULT 0"` } type UserBusinessAnalysisYesterday struct { @@ -431,6 +436,7 @@ type UserBusinessAnalysisYesterday struct { Phone string `xorm:"NULL"` InvitationUserNum int `xorm:"NOT NULL DEFAULT 0"` + ModelConvertCount int `xorm:"NOT NULL DEFAULT 0"` } type UserBusinessAnalysisLastWeek struct { @@ -500,6 +506,7 @@ type UserBusinessAnalysisLastWeek struct { Phone string `xorm:"NULL"` InvitationUserNum int `xorm:"NOT NULL DEFAULT 0"` + ModelConvertCount int `xorm:"NOT NULL DEFAULT 0"` } type UserAnalysisPara struct { @@ -616,6 +623,7 @@ type UserBusinessAnalysisAll struct { Phone string `xorm:"NULL"` InvitationUserNum int `xorm:"NOT NULL DEFAULT 0"` + ModelConvertCount int `xorm:"NOT NULL DEFAULT 0"` } type UserBusinessAnalysis struct { @@ -704,4 +712,5 @@ type UserBusinessAnalysis struct { Phone string `xorm:"NULL"` InvitationUserNum int `xorm:"NOT NULL DEFAULT 0"` + ModelConvertCount int `xorm:"NOT NULL DEFAULT 0"` } diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go index a6de283a4..8121f167c 100755 --- a/routers/repo/user_data_analysis.go +++ b/routers/repo/user_data_analysis.go @@ -21,6 +21,7 @@ import ( const ( PAGE_SIZE = 2000 Excel_File_Path = "/useranalysis/" + USER_YEAR = 2022 ) func getUserMetricsExcelHeader(ctx *context.Context) map[string]string { @@ -104,6 +105,7 @@ func getExcelHeader(ctx *context.Context) map[string]string { excelHeader = append(excelHeader, ctx.Tr("user.static.CloudBrainRunTime")) excelHeader = append(excelHeader, ctx.Tr("user.static.CommitDatasetNum")) excelHeader = append(excelHeader, ctx.Tr("user.static.CommitModelCount")) + excelHeader = append(excelHeader, ctx.Tr("user.static.ModelConvertCount")) excelHeader = append(excelHeader, ctx.Tr("user.static.FocusOtherUser")) excelHeader = append(excelHeader, ctx.Tr("user.static.CollectDataset")) @@ -178,6 +180,8 @@ func writeExcel(row int, xlsx *excelize.File, sheetName string, userRecord *mode tmp = tmp + 1 xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.CommitModelCount) tmp = tmp + 1 + xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.ModelConvertCount) + tmp = tmp + 1 xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.FocusOtherUser) tmp = tmp + 1 xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.CollectDataset) @@ -256,6 +260,8 @@ func writeExcelPage(row int, xlsx *excelize.File, sheetName string, userRecord * tmp = tmp + 1 xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.CommitModelCount) tmp = tmp + 1 + xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.ModelConvertCount) + tmp = tmp + 1 xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.FocusOtherUser) tmp = tmp + 1 xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.CollectDataset) @@ -714,6 +720,12 @@ func TimingCountDataByDateAndReCount(date string, isReCount bool) { log.Info("startTime time:" + startTime.Format("2006-01-02 15:04:05")) log.Info("endTime time:" + endTime.Format("2006-01-02 15:04:05")) warnEmailMessage := "用户统计信息入库失败，请尽快定位。" + + startYear := time.Date(USER_YEAR, 1, 1, 0, 0, 0, 1, t.Location()) + endYear := startYear.AddDate(1, 0, 0) + + models.RefreshUserYearTable(startYear, endYear) + //query wiki data log.Info("start to time count data") wikiMap, err := queryWikiCountMap(startTime, endTime) From ea2c19a81297b7d33280fdd30d89d7751b2f6112 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 16 Dec 2022 10:06:10 +0800 Subject: [PATCH 59/79] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E6=8A=A5=E5=91=8A=E6=95=B0=E6=8D=AE=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=96=B9=E5=BC=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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index dd72fac4a..0cbcfba8f 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -2566,3 +2566,9 @@ func GetContentFromPromote(url string) (string, error) { allLineStr := string(bytes) return allLineStr, nil } + +func QueryLast30DaysHighestIndexUsers(size int) ([]int64, error) { + userIds := make([]int64, 0) + err := xStatistic.Table("user_business_analysis_last30_day").Cols("id").OrderBy("user_index desc").Limit(size).Find(&userIds) + return userIds, err +} From 916ca4b6814cea081902c073917b34133c198998 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 16 Dec 2022 10:09:46 +0800 Subject: [PATCH 60/79] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=AC=A1=E6=95=B0=E3=80=82?= 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 0cbcfba8f..d5ab871ce 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -2199,8 +2199,8 @@ func queryUserCreateRepo(start_unix int64, end_unix int64) (map[int64]int, map[s detailInfoMap[key] = getMapKeyStringValue(key, detailInfoMap) + int(repoRecord.CloneCnt) key = fmt.Sprint(repoRecord.OwnerID) + "_most_download" - if int(repoRecord.GitCloneCnt) > getMapKeyStringValue(key, detailInfoMap) { - detailInfoMap[key] = int(repoRecord.GitCloneCnt) + if int(repoRecord.CloneCnt) > getMapKeyStringValue(key, detailInfoMap) { + detailInfoMap[key] = int(repoRecord.CloneCnt) mostDownloadMap[repoRecord.OwnerID] = repoRecord.DisplayName() } } From 2f342a45eadb15082666414728f77ed08f7fc31b Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Fri, 16 Dec 2022 10:42:43 +0800 Subject: [PATCH 61/79] =?UTF-8?q?npu=E8=B0=83=E8=AF=95=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=94=B9=E4=B8=BAhttps=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/repo/modelarts.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 828590564..19b61cb44 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -346,9 +346,12 @@ func NotebookShow(ctx *context.Context) { } func GetModelDownload(task *models.Cloudbrain) models.ModelDownload { + index := strings.Index(task.PreTrainModelUrl, "/") + key := task.PreTrainModelUrl[index+1:] + task.CkptName + url, _ := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, key) modelDownload := models.ModelDownload{ Name: task.CkptName, - DownloadLink: "s3://" + task.PreTrainModelUrl + task.CkptName, + DownloadLink: url, IsDelete: false, } From d57b42cf8990f7ddc78d662d5d8e9c6adf0f125e Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 16 Dec 2022 15:48:51 +0800 Subject: [PATCH 62/79] fix issue --- templates/user/dashboard/cloudbrains.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl index 9af17fb54..d2d13d054 100755 --- a/templates/user/dashboard/cloudbrains.tmpl +++ b/templates/user/dashboard/cloudbrains.tmpl @@ -195,7 +195,7 @@ + data-repopath='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .Cloudbrain.Type 2}}/grampus/notebook{{else}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}/{{$JobID}}/'> {{$.i18n.Tr "repo.debug"}} {{else}} @@ -203,7 +203,7 @@ + data-repopath='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .Cloudbrain.Type 2}}/grampus/notebook{{else}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}/{{$JobID}}/'> {{$.i18n.Tr "repo.debug_again"}} {{end}} @@ -227,9 +227,9 @@ {{if eq .JobType "DEBUG" "BENCHMARK" "SNN4IMAGENET" "BRAINSCORE"}}
{{$.CsrfTokenHtml}} - {{$.i18n.Tr "repo.stop"}} @@ -274,7 +274,7 @@
{{else}}
{{$.CsrfTokenHtml}} Date: Fri, 16 Dec 2022 16:00:06 +0800 Subject: [PATCH 63/79] fix issue --- templates/user/dashboard/cloudbrains.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl index d2d13d054..50e185db2 100755 --- a/templates/user/dashboard/cloudbrains.tmpl +++ b/templates/user/dashboard/cloudbrains.tmpl @@ -195,7 +195,7 @@ + data-repopath='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .Cloudbrain.Type 2}}/grampus/notebook{{else}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}{{end}}/{{$JobID}}/'> {{$.i18n.Tr "repo.debug"}} {{else}} @@ -203,7 +203,7 @@ + data-repopath='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .Cloudbrain.Type 2}}/grampus/notebook{{else}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}{{end}}/{{$JobID}}/'> {{$.i18n.Tr "repo.debug_again"}} {{end}} From 4313cad8fd57734a580fdad22bf815bef3de0ed4 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 16 Dec 2022 16:02:23 +0800 Subject: [PATCH 64/79] fix issue --- templates/user/dashboard/cloudbrains.tmpl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl index 50e185db2..1b6054a54 100755 --- a/templates/user/dashboard/cloudbrains.tmpl +++ b/templates/user/dashboard/cloudbrains.tmpl @@ -274,7 +274,7 @@
{{else}}
{{$.CsrfTokenHtml}}
- {{end}} - + {{end}}
From c3c8a24d8535146c84e5d83013796cbe510dcb03 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 16 Dec 2022 16:22:35 +0800 Subject: [PATCH 65/79] fix issue --- templates/user/dashboard/cloudbrains.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl index 1b6054a54..d3ad336c7 100755 --- a/templates/user/dashboard/cloudbrains.tmpl +++ b/templates/user/dashboard/cloudbrains.tmpl @@ -279,7 +279,7 @@ {{$.CsrfTokenHtml}} {{$.i18n.Tr "repo.delete"}} From b5b673486a1d83aed841807d0df2e0a6fd3ccb39 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 16 Dec 2022 16:30:20 +0800 Subject: [PATCH 66/79] fix issue --- templates/admin/cloudbrain/list.tmpl | 32 +++++++++++++++---------------- templates/user/dashboard/cloudbrains.tmpl | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 94f80c0fa..aa959b6db 100755 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -141,7 +141,7 @@
+ data-repopath='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .Cloudbrain.Type 2}}/grampus/notebook{{else}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}{{end}}/{{$JobID}}/'> {{$.i18n.Tr "repo.debug"}} {{else}} @@ -242,7 +242,7 @@ + data-repopath='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .Cloudbrain.Type 2}}/grampus/notebook{{else}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}{{end}}/{{$JobID}}/'> {{$.i18n.Tr "repo.debug_again"}} {{end}} @@ -268,8 +268,8 @@ {{$.CsrfTokenHtml}} + data-repopath='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .Cloudbrain.Type 2}}/grampus/notebook{{else}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else if eq .JobType "BENCHMARK" }}/cloudbrain/benchmark{{else if eq .ComputeResource "NPU" }}/modelarts/notebook{{end}}{{end}}/{{$JobID}}/stop' + data-jobid="{{$JobID}}" data-bootfile="{{.BootFile}}"> {{$.i18n.Tr "repo.stop"}} @@ -304,17 +304,17 @@ {{else}} -
- {{$.CsrfTokenHtml}} - - {{$.i18n.Tr "repo.delete"}} - -
+
+ {{$.CsrfTokenHtml}} + + {{$.i18n.Tr "repo.delete"}} + +
{{end}}
diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl index d3ad336c7..e2f0a252e 100755 --- a/templates/user/dashboard/cloudbrains.tmpl +++ b/templates/user/dashboard/cloudbrains.tmpl @@ -123,7 +123,7 @@
Date: Fri, 16 Dec 2022 16:44:50 +0800 Subject: [PATCH 67/79] fix issue --- web_src/js/features/cloudbrainShow.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web_src/js/features/cloudbrainShow.js b/web_src/js/features/cloudbrainShow.js index 4a6351a4f..26ccc0deb 100644 --- a/web_src/js/features/cloudbrainShow.js +++ b/web_src/js/features/cloudbrainShow.js @@ -867,6 +867,9 @@ export default async function initCloudrainSow() { }); $("#model_checkpoint").append(html); $("#select_model_checkpoint").removeClass("loading"); + if (html) { + $("#select_model_checkpoint").removeClass("error"); + } const initVersionText = $( "#model_checkpoint div.item:first-child" ).text(); From 891b3ef91c5b3db10341dc0ade80af0879c77929 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Fri, 16 Dec 2022 16:52:26 +0800 Subject: [PATCH 68/79] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/cloudbrain/cloudbrainTask/count.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/cloudbrain/cloudbrainTask/count.go b/services/cloudbrain/cloudbrainTask/count.go index 372afc7d9..4ae742c3a 100644 --- a/services/cloudbrain/cloudbrainTask/count.go +++ b/services/cloudbrain/cloudbrainTask/count.go @@ -16,7 +16,7 @@ type StatusInfo struct { var CloudbrainOneNotFinalStatuses = []string{string(models.JobWaiting), string(models.JobRunning)} var CloudbrainTwoNotFinalStatuses = []string{string(models.ModelArtsTrainJobInit), string(models.ModelArtsTrainJobImageCreating), string(models.ModelArtsTrainJobSubmitTrying), string(models.ModelArtsTrainJobWaiting), string(models.ModelArtsTrainJobRunning), string(models.ModelArtsTrainJobScaling), string(models.ModelArtsTrainJobCheckInit), string(models.ModelArtsTrainJobCheckRunning), string(models.ModelArtsTrainJobCheckRunningCompleted)} -var GrampusNotFinalStatuses = []string{models.GrampusStatusWaiting, models.GrampusStatusRunning, models.GrampusStatusStopping} +var GrampusNotFinalStatuses = []string{models.GrampusStatusWaiting, models.GrampusStatusRunning} var StatusInfoDict = map[string]StatusInfo{string(models.JobTypeDebug) + "-" + strconv.Itoa(models.TypeCloudBrainOne): { CloudBrainTypes: []int{models.TypeCloudBrainOne}, JobType: []models.JobType{models.JobTypeDebug}, From 11e0a27db49d3afdffeba928f72a949a355066cc Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 16 Dec 2022 17:33:01 +0800 Subject: [PATCH 69/79] fix issue --- templates/admin/cloudbrain/list.tmpl | 2 +- templates/user/dashboard/cloudbrains.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index aa959b6db..04e8a62e8 100755 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -98,7 +98,7 @@
{{if eq .JobType "DEBUG"}} {{.DisplayJobName}} diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl index e2f0a252e..60bc0ea24 100755 --- a/templates/user/dashboard/cloudbrains.tmpl +++ b/templates/user/dashboard/cloudbrains.tmpl @@ -80,7 +80,7 @@
{{if eq .JobType "DEBUG"}} {{.DisplayJobName}} From b8edf90782bbc10df8a05f9bc796a6787111fcff Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 16 Dec 2022 17:48:10 +0800 Subject: [PATCH 70/79] fix issue --- templates/admin/cloudbrain/list.tmpl | 2 +- templates/user/dashboard/cloudbrains.tmpl | 2 +- web_src/js/features/cloudrbanin.js | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 04e8a62e8..755fb0637 100755 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -135,7 +135,7 @@
- {{if .Cluster}}{{.Cluster}}{{else}}--{{end}} + {{if .Cluster}}{{.Cluster}}{{else}}--{{end}}
- {{if .Cluster}}{{.Cluster}}{{else}}--{{end}} + {{if .Cluster}}{{.Cluster}}{{else}}--{{end}}
Date: Fri, 16 Dec 2022 17:52:36 +0800 Subject: [PATCH 71/79] fix issue --- templates/admin/cloudbrain/list.tmpl | 4 ++-- templates/user/dashboard/cloudbrains.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 755fb0637..f6d20216a 100755 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -135,7 +135,7 @@
- {{if .Cluster}}{{.Cluster}}{{else}}--{{end}} + {{if .Cluster}}{{.Cluster}}{{else}}--{{end}}
- {{if .AiCenter}}{{.AiCenter}}{{else}}--{{end}} + {{if .AiCenter}}{{.AiCenter}}{{else}}--{{end}}
diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl index 72ca0fd6e..5d9b79269 100755 --- a/templates/user/dashboard/cloudbrains.tmpl +++ b/templates/user/dashboard/cloudbrains.tmpl @@ -117,7 +117,7 @@
- {{if .Cluster}}{{.Cluster}}{{else}}--{{end}} + {{if .Cluster}}{{.Cluster}}{{else}}--{{end}}
- {{if .AiCenter}}{{.AiCenter}}{{else}}--{{end}} + {{if .AiCenter}}{{.AiCenter}}{{else}}--{{end}}
From e6e8dfd8881790daff3fb297954037acb76b9836 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Mon, 19 Dec 2022 09:44:04 +0800 Subject: [PATCH 72/79] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/repo/grampus.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go index df56cfa94..14db1a50d 100755 --- a/routers/repo/grampus.go +++ b/routers/repo/grampus.go @@ -958,7 +958,7 @@ func GrampusStopJob(ctx *context.Context) { if task.Status == models.GrampusStatusStopped || task.Status == models.GrampusStatusFailed || task.Status == models.GrampusStatusSucceeded { log.Error("the job(%s) has been stopped", task.JobName, ctx.Data["msgID"]) resultCode = "-1" - errorMsg = "System error" + errorMsg = ctx.Tr("cloudbrain.Already_stopped") break } @@ -966,7 +966,7 @@ func GrampusStopJob(ctx *context.Context) { if err != nil { log.Error("StopJob(%s) failed:%v", task.JobName, err, ctx.Data["msgID"]) resultCode = strconv.Itoa(res.ErrorCode) - errorMsg = res.ErrorMsg + errorMsg = ctx.Tr("cloudbrain.Stopped_failed") break } oldStatus := task.Status From 2b7ee8225d995be6edf556b95d46d300594d9659 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 19 Dec 2022 10:14:03 +0800 Subject: [PATCH 73/79] fix issue --- templates/repo/cloudbrain/new.tmpl | 76 ++------------------------ templates/repo/grampus/notebook/gpu/new.tmpl | 63 ++-------------------- templates/repo/grampus/notebook/npu/new.tmpl | 79 ++-------------------------- templates/repo/modelarts/notebook/new.tmpl | 70 +----------------------- web_src/js/standalone/cloudbrainNew.js | 14 +++++ 5 files changed, 25 insertions(+), 277 deletions(-) diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index 6ba7da6cc..b925f0e1b 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -125,7 +125,7 @@
-