From 9998aeb0f9607f8ff20e0f5e590d403bec34cc1b Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 09:26:45 +0800 Subject: [PATCH 01/75] =?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/75] =?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/75] =?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/75] =?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/75] =?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/75] =?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/75] =?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/75] =?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/75] =?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/75] =?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/75] 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/75] 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/75] 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 1361b3915fb1aa83d857fbc0a5b4d23448cb4a3e Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 28 Nov 2022 16:18:32 +0800 Subject: [PATCH 14/75] #3188 update --- models/list_options.go | 20 ++++++ models/repo.go | 13 ++-- models/repo_list.go | 54 ++++++++------ models/repo_statistic.go | 20 ++++++ models/repo_tag.go | 31 ++++++++ modules/setting/setting.go | 8 +++ routers/admin/resources.go | 34 +++++++++ routers/home.go | 60 +++++++++++++++- routers/private/internal.go | 1 + routers/repo/cloudbrain_statistic.go | 6 ++ routers/repo/repo_statistic.go | 20 ++++++ routers/routes/routes.go | 6 +- services/repository/square.go | 135 +++++++++++++++++++++++++++++++++++ 13 files changed, 381 insertions(+), 27 deletions(-) create mode 100644 services/repository/square.go diff --git a/models/list_options.go b/models/list_options.go index 0946917fe..29144ba22 100644 --- a/models/list_options.go +++ b/models/list_options.go @@ -10,6 +10,26 @@ import ( "xorm.io/xorm" ) +type SelectedPageSize int + +const ( + PageSize15 SelectedPageSize = 15 + PageSize30 SelectedPageSize = 30 + PageSize50 SelectedPageSize = 50 +) + +func (s SelectedPageSize) IsLegal() bool { + switch s { + case PageSize30, PageSize50, PageSize15: + return true + } + return false +} + +func (s SelectedPageSize) Int() int { + return int(s) +} + // ListOptions options to paginate results type ListOptions struct { PageSize int diff --git a/models/repo.go b/models/repo.go index f0760108b..e1085a429 100755 --- a/models/repo.go +++ b/models/repo.go @@ -231,10 +231,15 @@ type Repository struct { CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"` UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"` - Hot int64 `xorm:"-"` - Active int64 `xorm:"-"` - Alias string `xorm:"INDEX"` - LowerAlias string `xorm:"INDEX"` + Hot int64 `xorm:"-"` + Active int64 `xorm:"-"` + Alias string `xorm:"INDEX"` + LowerAlias string `xorm:"INDEX"` + AiTaskCnt int64 `xorm:"NOT NULL DEFAULT 0"` + ModelCnt int64 `xorm:"NOT NULL DEFAULT 0"` + DatasetCnt int64 `xorm:"NOT NULL DEFAULT 0"` + LastMonthVisits int64 `xorm:"NOT NULL DEFAULT 0"` + LastFourMonthCommits int64 `xorm:"NOT NULL DEFAULT 0"` } type RepositoryShow struct { diff --git a/models/repo_list.go b/models/repo_list.go index 92654c11c..6ec9bbe8f 100755 --- a/models/repo_list.go +++ b/models/repo_list.go @@ -201,29 +201,41 @@ func (s SearchOrderBy) String() string { return string(s) } +type FindReposResponse struct { + Repos RepositoryList + Page int + PageSize int + Total int64 +} + // Strings for sorting result const ( - SearchOrderByAlphabetically SearchOrderBy = "name ASC" - SearchOrderByAlphabeticallyReverse SearchOrderBy = "name DESC" - SearchOrderByLeastUpdated SearchOrderBy = "updated_unix ASC" - SearchOrderByRecentUpdated SearchOrderBy = "updated_unix DESC" - SearchOrderByOldest SearchOrderBy = "created_unix ASC" - SearchOrderByNewest SearchOrderBy = "created_unix DESC" - SearchOrderBySize SearchOrderBy = "size ASC" - SearchOrderBySizeReverse SearchOrderBy = "size DESC" - SearchOrderByID SearchOrderBy = "id ASC" - SearchOrderByIDReverse SearchOrderBy = "id DESC" - SearchOrderByStars SearchOrderBy = "num_stars ASC" - SearchOrderByStarsReverse SearchOrderBy = "num_stars DESC" - SearchOrderByForks SearchOrderBy = "num_forks ASC" - SearchOrderByForksReverse SearchOrderBy = "num_forks DESC" - SearchOrderByDownloadTimes SearchOrderBy = "download_times DESC" - SearchOrderByUseCount SearchOrderBy = "use_count ASC" - SearchOrderByUseCountReverse SearchOrderBy = "use_count DESC" - SearchOrderByHot SearchOrderBy = "(num_watches + num_stars + num_forks + clone_cnt) DESC" - SearchOrderByActive SearchOrderBy = "(num_issues + num_pulls + num_commit) DESC" - SearchOrderByWatches SearchOrderBy = "num_watches DESC" - SearchOrderByDefault SearchOrderBy = "recommend desc,num_stars DESC,updated_unix DESC" + SearchOrderByAlphabetically SearchOrderBy = "name ASC" + SearchOrderByAlphabeticallyReverse SearchOrderBy = "name DESC" + SearchOrderByLeastUpdated SearchOrderBy = "updated_unix ASC" + SearchOrderByRecentUpdated SearchOrderBy = "updated_unix DESC" + SearchOrderByOldest SearchOrderBy = "created_unix ASC" + SearchOrderByNewest SearchOrderBy = "created_unix DESC" + SearchOrderBySize SearchOrderBy = "size ASC" + SearchOrderBySizeReverse SearchOrderBy = "size DESC" + SearchOrderByID SearchOrderBy = "id ASC" + SearchOrderByIDReverse SearchOrderBy = "id DESC" + SearchOrderByStars SearchOrderBy = "num_stars ASC" + SearchOrderByStarsReverse SearchOrderBy = "num_stars DESC" + SearchOrderByForks SearchOrderBy = "num_forks ASC" + SearchOrderByForksReverse SearchOrderBy = "num_forks DESC" + SearchOrderByDownloadTimes SearchOrderBy = "download_times DESC" + SearchOrderByUseCount SearchOrderBy = "use_count ASC" + SearchOrderByUseCountReverse SearchOrderBy = "use_count DESC" + SearchOrderByHot SearchOrderBy = "(num_watches + num_stars + num_forks + clone_cnt) DESC" + SearchOrderByActive SearchOrderBy = "(num_issues + num_pulls + num_commit) DESC" + SearchOrderByWatches SearchOrderBy = "num_watches DESC" + SearchOrderByDefault SearchOrderBy = "recommend desc,num_stars DESC,updated_unix DESC" + SearchOrderByAiTaskCntReverse SearchOrderBy = "ai_task_cnt desc" + SearchOrderByModelCntReverse SearchOrderBy = "model_cnt desc" + SearchOrderByDatasetCntReverse SearchOrderBy = "dataset_cnt desc" + SearchOrderByLastMonthVisitsReverse SearchOrderBy = "last_month_visits desc" + SearchOrderByLastFourMonthCommitsReverse SearchOrderBy = "last_four_month_commits desc" ) // SearchRepositoryCondition creates a query condition according search repository options diff --git a/models/repo_statistic.go b/models/repo_statistic.go index 4f8f13ed7..ecdd77e57 100755 --- a/models/repo_statistic.go +++ b/models/repo_statistic.go @@ -200,3 +200,23 @@ func UpdateRepoStatVisits(repoStat *RepoStatistic) error { _, err := xStatistic.Exec(sql, repoStat.NumVisits, repoStat.RepoID, repoStat.Date) return err } + +func SumRepoStatColumn(begin, end time.Time, repoId int64, columnName string) (int64, error) { + res, err := xStatistic.Where("created_unix <= ? and created_unix >= ? and repo_id = ? ", end.Unix(), begin.Unix(), repoId).Sum(&RepoStatistic{}, columnName) + if err != nil { + return 0, err + } + return int64(res), nil +} + +func SumLastMonthNumVisits(repoId int64) (int64, error) { + end := time.Now() + begin := end.AddDate(0, 0, -30) + return SumRepoStatColumn(begin, end, repoId, "num_visits") +} + +func SumLastFourMonthNumCommits(repoId int64) (int64, error) { + end := time.Now() + begin := end.AddDate(0, 0, -120) + return SumRepoStatColumn(begin, end, repoId, "num_commits_added") +} diff --git a/models/repo_tag.go b/models/repo_tag.go index 730eb3f2a..e4e37fbd2 100644 --- a/models/repo_tag.go +++ b/models/repo_tag.go @@ -4,6 +4,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" "fmt" + "xorm.io/builder" ) type OfficialTag struct { @@ -166,3 +167,33 @@ func GetAllOfficialTags() ([]OfficialTag, error) { } return o, nil } + +type FindSelectedReposOpts struct { + ListOptions + OrgId int64 + OnlyPublic bool +} + +func GetSelectedRepos(opts FindSelectedReposOpts) ([]Repository, error) { + if opts.Page < 1 { + opts.Page = 1 + } + var cond = builder.NewCond() + cond = cond.And(builder.Eq{"official_tag.code": "selected"}) + if opts.OrgId > 0 { + cond = cond.And(builder.Eq{"official_tag_repos.org_id": opts.OrgId}) + } + if opts.OnlyPublic { + cond = cond.And(builder.Eq{"repository.is_private": false}) + } + t := make([]Repository, 0) + err := x.Join("inner", "official_tag_repos", "repository.id = official_tag_repos.repo_id"). + Join("inner", "official_tag", "official_tag.id = official_tag_repos.tag_id"). + Where(cond).OrderBy("repository.updated_unix desc").Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).Find(&t) + + if err != nil { + return nil, err + } + + return t, nil +} diff --git a/modules/setting/setting.go b/modules/setting/setting.go index e237d5a8a..0d623eb3b 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -664,6 +664,10 @@ var ( CloudbrainStoppedTitle string CloudbrainStoppedRemark string + //repo square config + IncubationSourceOrgId int64 + PaperSourceOwnerId int64 + //nginx proxy PROXYURL string RadarMap = struct { @@ -1557,6 +1561,10 @@ func NewContext() { CloudbrainStoppedTitle = sec.Key("CLOUDBRAIN_STOPPED_TITLE").MustString("您好，您申请的算力资源已结束使用，任务已完成运行，状态为%s，请您关注运行结果") CloudbrainStoppedRemark = sec.Key("CLOUDBRAIN_STOPPED_REMARK").MustString("感谢您的耐心等待。") + sec = Cfg.Section("repo-square") + IncubationSourceOrgId = sec.Key("INCUBATION_ORG_ID").MustInt64(9) + PaperSourceOwnerId = sec.Key("PAPER_OWNER_ID").MustInt64(36008) + sec = Cfg.Section("point") CloudBrainPaySwitch = sec.Key("CLOUDBRAIN_PAY_SWITCH").MustBool(false) CloudBrainPayDelay = sec.Key("CLOUDBRAIN_PAY_DELAY").MustDuration(30 * time.Minute) diff --git a/routers/admin/resources.go b/routers/admin/resources.go index feea7b69b..8db958ef5 100644 --- a/routers/admin/resources.go +++ b/routers/admin/resources.go @@ -307,3 +307,37 @@ func RefreshHistorySpec(ctx *context.Context) { r["total"] = total ctx.JSON(http.StatusOK, response.SuccessWithData(r)) } + +func RefreshReposHistoryCnt(ctx *context.Context) { + scope := ctx.Query("scope") + list := ctx.Query("list") + + var scopeAll = false + if scope == "all" { + scopeAll = true + } + var ids = make([]int64, 0) + if list != "" { + strs := strings.Split(list, "|") + for _, s := range strs { + i, err := strconv.ParseInt(s, 10, 64) + if err != nil { + ctx.JSON(http.StatusOK, response.ServerError(err.Error())) + return + } + ids = append(ids, i) + } + + } + + total, success, err := resource.RefreshHistorySpec(scopeAll, ids) + if err != nil { + log.Error("RefreshHistorySpec error. %v", err) + ctx.JSON(http.StatusOK, response.ServerError(err.Error())) + return + } + r := make(map[string]interface{}, 0) + r["success"] = success + r["total"] = total + ctx.JSON(http.StatusOK, response.SuccessWithData(r)) +} diff --git a/routers/home.go b/routers/home.go index aab760611..7c13cb05e 100755 --- a/routers/home.go +++ b/routers/home.go @@ -7,6 +7,7 @@ package routers import ( "bytes" + "code.gitea.io/gitea/routers/response" "net/http" "strconv" "strings" @@ -295,6 +296,63 @@ func ExploreRepos(ctx *context.Context) { }) } +func RepoSquare(ctx *context.Context) { + var result []models.Repository + var err error + switch ctx.Query("type") { + case "preferred": + result, err = repository.GetPreferredRepos() + case "incubation": + result, err = repository.GetIncubationRepos() + case "hot-paper": + result, err = repository.GetHotPaperRepos() + default: + result, err = repository.GetPreferredRepos() + } + if err != nil { + ctx.JSON(http.StatusOK, response.ResponseError(err)) + return + } + resultMap := make(map[string]interface{}, 0) + resultMap["Repos"] = result + ctx.JSON(http.StatusOK, response.SuccessWithData(resultMap)) +} +func RepoFind(ctx *context.Context) { + keyword := strings.Trim(ctx.Query("q"), " ") + topic := strings.Trim(ctx.Query("topic"), " ") + sort := strings.Trim(ctx.Query("sort"), " ") + page := ctx.QueryInt("page") + pageSize := models.SelectedPageSize(ctx.QueryInt("pageSize")) + if !pageSize.IsLegal() { + ctx.JSON(http.StatusOK, response.ServerError("pageSize illegal")) + return + } + if page <= 0 { + page = 1 + } + + var ownerID int64 + if ctx.User != nil && !ctx.User.IsAdmin { + ownerID = ctx.User.ID + } + + result, err := repository.FindRepos(repository.FindReposOptions{ + ListOptions: models.ListOptions{Page: page, PageSize: pageSize.Int()}, + Actor: ctx.User, + Sort: sort, + Keyword: keyword, + Topic: topic, + Private: ctx.User != nil, + OwnerID: ownerID, + }) + if err != nil { + log.Error("RepoFind error. %v", err) + ctx.JSON(http.StatusOK, response.ResponseError(err)) + return + } + ctx.JSON(http.StatusOK, response.SuccessWithData(result)) +} + func ExploreDatasets(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("explore") ctx.Data["PageIsExplore"] = true @@ -824,4 +882,4 @@ func HomePrivacy(ctx *context.Context) { func HomeResoruceDesc(ctx *context.Context) { ctx.HTML(200, tplResoruceDesc) -} \ No newline at end of file +} diff --git a/routers/private/internal.go b/routers/private/internal.go index 14b0f05de..eae3713a9 100755 --- a/routers/private/internal.go +++ b/routers/private/internal.go @@ -55,6 +55,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/task/history_handle/duration", repo.HandleTaskWithNoDuration) m.Post("/task/history_handle/aicenter", repo.HandleTaskWithAiCenter) m.Post("/resources/specification/handle_historical_task", admin.RefreshHistorySpec) + m.Post("/repos/cnt_stat/handle_historical_task", admin.RefreshHistorySpec) m.Post("/duration_statisctic/history_handle", repo.CloudbrainUpdateHistoryData) }, CheckInternalToken) diff --git a/routers/repo/cloudbrain_statistic.go b/routers/repo/cloudbrain_statistic.go index 4476b3e45..8084614eb 100644 --- a/routers/repo/cloudbrain_statistic.go +++ b/routers/repo/cloudbrain_statistic.go @@ -13,6 +13,12 @@ import ( ) func CloudbrainDurationStatisticHour() { + defer func() { + err := recover() + if err == nil { + return + } + }() var statisticTime time.Time var count int64 recordDurationUpdateTime, err := models.GetDurationRecordUpdateTime() diff --git a/routers/repo/repo_statistic.go b/routers/repo/repo_statistic.go index 468e6fa85..dd73a9f3f 100755 --- a/routers/repo/repo_statistic.go +++ b/routers/repo/repo_statistic.go @@ -166,6 +166,8 @@ func RepoStatisticDaily(date string) { repoStat.NumIssuesGrowth = repoStat.NumIssues - repoStatisticFourMonthsAgo.NumIssues } + SyncStatDataToRepo(repo) + if _, err = models.InsertRepoStat(&repoStat); err != nil { log.Error("InsertRepoStat failed(%s): %v", projectName, err) log.Error("failed statistic: %s", projectName) @@ -284,6 +286,24 @@ func RepoStatisticDaily(date string) { } +func SyncStatDataToRepo(repo *models.Repository) { + changed := false + //Save the visit number of repository in the last month + if lv, err := models.SumLastMonthNumVisits(repo.ID); err == nil { + repo.LastMonthVisits = lv + changed = true + } + //Save the commits number of repository in the last four month + if lc, err := models.SumLastFourMonthNumCommits(repo.ID); err == nil { + repo.LastFourMonthCommits = lc + changed = true + } + + if changed { + models.UpdateRepository(repo, false) + } +} + func getDistinctProjectName(repo *models.Repository) string { return repo.OwnerName + "/" + repo.Alias } diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 2b361b507..e902d10be 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -370,7 +370,11 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/images/custom", repo.GetCustomImages) m.Get("/images/star", repo.GetStarImages) - m.Get("/repos", routers.ExploreRepos) + m.Group("/repos", func() { + m.Get("", routers.ExploreRepos) + m.Get("/square", routers.RepoSquare) + m.Get("/search", routers.RepoFind) + }) m.Get("/datasets", routers.ExploreDatasets) m.Get("/users", routers.ExploreUsers) m.Get("/organizations", routers.ExploreOrganizations) diff --git a/services/repository/square.go b/services/repository/square.go new file mode 100644 index 000000000..45416667c --- /dev/null +++ b/services/repository/square.go @@ -0,0 +1,135 @@ +package repository + +import ( + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" +) + +func GetPreferredRepos() ([]models.Repository, error) { + return models.GetSelectedRepos(models.FindSelectedReposOpts{ + ListOptions: models.ListOptions{ + PageSize: 10, + Page: 1, + }, + OnlyPublic: true, + }) +} + +func GetIncubationRepos() ([]models.Repository, error) { + return models.GetSelectedRepos(models.FindSelectedReposOpts{ + ListOptions: models.ListOptions{ + PageSize: 10, + Page: 1, + }, + OrgId: setting.IncubationSourceOrgId, + OnlyPublic: true, + }) +} + +func GetHotPaperRepos() ([]models.Repository, error) { + rlist, _, err := models.SearchRepository(&models.SearchRepoOptions{ + ListOptions: models.ListOptions{ + Page: 1, + PageSize: 10, + }, + OrderBy: models.SearchOrderByLastMonthVisitsReverse + "," + models.SearchOrderByRecentUpdated, + TopicOnly: true, + TopicName: "openi-paper", + AllPublic: true, + }) + if err != nil { + return nil, err + } + result := make([]models.Repository, len(rlist)) + for i, r := range rlist { + result[i] = *r + } + return result, nil +} + +type FindReposOptions struct { + models.ListOptions + Actor *models.User + Sort string + Keyword string + Topic string + Private bool + OwnerID int64 +} + +func FindRepos(opts FindReposOptions) (*models.FindReposResponse, error) { + + var ( + repos []*models.Repository + count int64 + err error + orderBy models.SearchOrderBy + ) + + switch opts.Sort { + //1.近期热门：按最近1个月浏览量倒序排序，最近1个月浏览量>最近更新>项目名称升序 + //2.近期活跃：按提交增长量（最近4个月commit数）倒序排序，提交增长量>最近更新>项目名称升序。 + //3.最近更新：按最近更新>项目名称升序排序。 + //4.最近创建：按项目创建时间排序，最近的排前面。最近创建>项目名称升序。 + //5.点赞最多：按点赞数倒序排序。点赞数>最近更新>项目名称升序。 + //6.派生最多：按派生数倒序排序。派生数>最近更新>项目名称升序。 + //7.数据集最多：按项目包含的数据集文件数量倒序排序，数据集文件数>最近更新>项目名称升序。 + //8.AI任务最多：按项目包含的AI任务数量倒序排序，AI任务数>最近更新>项目名称升序。 + //9.模型最多：按项目包含的模型数量倒序排序，模型大小为0则不统计。模型数>最近更新>项目名称升序。\ + + //1.近期热门 + case "most_popular": + orderBy = models.SearchOrderByLastMonthVisitsReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically + //2.近期活跃 + case "most_active": + orderBy = models.SearchOrderByLastFourMonthCommitsReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically + //3.最近更新 + case "recent_update": + orderBy = models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically + //4.最近创建 + case "newest": + orderBy = models.SearchOrderByNewest + "," + models.SearchOrderByAlphabetically + //5.点赞最多 + case "most_stars": + orderBy = models.SearchOrderByStarsReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically + //6.派生最多 + case "most_forks": + orderBy = models.SearchOrderByForksReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically + //7.数据集最多 + case "most_datasets": + orderBy = models.SearchOrderByDatasetCntReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically + //8.AI任务最多 + case "most_ai_tasks": + orderBy = models.SearchOrderByAiTaskCntReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically + //9.模型最多 + case "most_models": + orderBy = models.SearchOrderByModelCntReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically + + default: + orderBy = models.SearchOrderByLastMonthVisitsReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically + } + + repos, count, err = models.SearchRepository(&models.SearchRepoOptions{ + ListOptions: opts.ListOptions, + Actor: opts.Actor, + OrderBy: orderBy, + Private: opts.Private, + Keyword: opts.Keyword, + OwnerID: opts.OwnerID, + AllPublic: true, + AllLimited: true, + TopicName: opts.Topic, + IncludeDescription: setting.UI.SearchRepoDescription, + }) + if err != nil { + log.Error("FindRepos error when SearchRepository.%v", err) + return nil, err + } + return &models.FindReposResponse{ + Repos: repos, + Total: count, + Page: opts.Page, + PageSize: opts.PageSize, + }, nil +} From b8281eb89be5328fc8cea7505acf7f14c268bb21 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 28 Nov 2022 17:08:30 +0800 Subject: [PATCH 15/75] 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 16/75] 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 17/75] 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 18/75] 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 19/75] 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 20/75] 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 21/75] 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 c08838caeeca5b23c5014c14e8be1b597e15864d Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Tue, 29 Nov 2022 11:50:29 +0800 Subject: [PATCH 22/75] #3188 update --- models/repo.go | 45 +++++++++++++++++++++++++++++++ models/repo_list.go | 2 +- models/repo_tag.go | 4 +-- routers/home.go | 2 +- services/repository/square.go | 63 +++++++++++++++++++++++++------------------ 5 files changed, 86 insertions(+), 30 deletions(-) diff --git a/models/repo.go b/models/repo.go index e1085a429..a293dab18 100755 --- a/models/repo.go +++ b/models/repo.go @@ -242,12 +242,57 @@ type Repository struct { LastFourMonthCommits int64 `xorm:"NOT NULL DEFAULT 0"` } +// Repository4Card format for front display +type Repository4Card struct { + ID int64 + OwnerID int64 + OwnerName string + LowerName string + Name string + NumWatches int + NumStars int + NumForks int + Description string + Topics []string + AiTaskCnt int64 + ModelCnt int64 + DatasetCnt int64 + CreatedUnix timeutil.TimeStamp + UpdatedUnix timeutil.TimeStamp + PrimaryLanguage *LanguageStat + RelAvatarLink string +} + type RepositoryShow struct { Name string RepoType RepoType Alias string } +func (repo *Repository) ToCardFormat() *Repository4Card { + r := repo.RelAvatarLink() + result := &Repository4Card{ + ID: repo.ID, + OwnerID: repo.OwnerID, + OwnerName: repo.OwnerName, + LowerName: repo.LowerName, + Name: repo.Name, + NumWatches: repo.NumWatches, + NumStars: repo.NumStars, + NumForks: repo.NumForks, + Description: repo.Description, + Topics: repo.Topics, + AiTaskCnt: repo.AiTaskCnt, + ModelCnt: repo.ModelCnt, + DatasetCnt: repo.DatasetCnt, + CreatedUnix: repo.CreatedUnix, + UpdatedUnix: repo.UpdatedUnix, + PrimaryLanguage: repo.PrimaryLanguage, + RelAvatarLink: r, + } + return result +} + // SanitizedOriginalURL returns a sanitized OriginalURL func (repo *Repository) SanitizedOriginalURL() string { if repo.OriginalURL == "" { diff --git a/models/repo_list.go b/models/repo_list.go index 6ec9bbe8f..3c655fbd9 100755 --- a/models/repo_list.go +++ b/models/repo_list.go @@ -202,7 +202,7 @@ func (s SearchOrderBy) String() string { } type FindReposResponse struct { - Repos RepositoryList + Repos []*Repository4Card Page int PageSize int Total int64 diff --git a/models/repo_tag.go b/models/repo_tag.go index e4e37fbd2..4585a95b6 100644 --- a/models/repo_tag.go +++ b/models/repo_tag.go @@ -174,7 +174,7 @@ type FindSelectedReposOpts struct { OnlyPublic bool } -func GetSelectedRepos(opts FindSelectedReposOpts) ([]Repository, error) { +func GetSelectedRepos(opts FindSelectedReposOpts) ([]*Repository, error) { if opts.Page < 1 { opts.Page = 1 } @@ -186,7 +186,7 @@ func GetSelectedRepos(opts FindSelectedReposOpts) ([]Repository, error) { if opts.OnlyPublic { cond = cond.And(builder.Eq{"repository.is_private": false}) } - t := make([]Repository, 0) + t := make([]*Repository, 0) err := x.Join("inner", "official_tag_repos", "repository.id = official_tag_repos.repo_id"). Join("inner", "official_tag", "official_tag.id = official_tag_repos.tag_id"). Where(cond).OrderBy("repository.updated_unix desc").Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).Find(&t) diff --git a/routers/home.go b/routers/home.go index 7c13cb05e..7b680bca0 100755 --- a/routers/home.go +++ b/routers/home.go @@ -297,7 +297,7 @@ func ExploreRepos(ctx *context.Context) { } func RepoSquare(ctx *context.Context) { - var result []models.Repository + var result []*models.Repository4Card var err error switch ctx.Query("type") { case "preferred": diff --git a/services/repository/square.go b/services/repository/square.go index 45416667c..cb7b9e4db 100644 --- a/services/repository/square.go +++ b/services/repository/square.go @@ -6,18 +6,26 @@ import ( "code.gitea.io/gitea/modules/setting" ) -func GetPreferredRepos() ([]models.Repository, error) { - return models.GetSelectedRepos(models.FindSelectedReposOpts{ +func GetPreferredRepos() ([]*models.Repository4Card, error) { + repos, err := models.GetSelectedRepos(models.FindSelectedReposOpts{ ListOptions: models.ListOptions{ PageSize: 10, Page: 1, }, OnlyPublic: true, }) + if err != nil { + return nil, err + } + result := make([]*models.Repository4Card, len(repos)) + for i, r := range repos { + result[i] = r.ToCardFormat() + } + return result, nil } -func GetIncubationRepos() ([]models.Repository, error) { - return models.GetSelectedRepos(models.FindSelectedReposOpts{ +func GetIncubationRepos() ([]*models.Repository4Card, error) { + repos, err := models.GetSelectedRepos(models.FindSelectedReposOpts{ ListOptions: models.ListOptions{ PageSize: 10, Page: 1, @@ -25,9 +33,17 @@ func GetIncubationRepos() ([]models.Repository, error) { OrgId: setting.IncubationSourceOrgId, OnlyPublic: true, }) + if err != nil { + return nil, err + } + result := make([]*models.Repository4Card, len(repos)) + for i, r := range repos { + result[i] = r.ToCardFormat() + } + return result, nil } -func GetHotPaperRepos() ([]models.Repository, error) { +func GetHotPaperRepos() ([]*models.Repository4Card, error) { rlist, _, err := models.SearchRepository(&models.SearchRepoOptions{ ListOptions: models.ListOptions{ Page: 1, @@ -41,9 +57,9 @@ func GetHotPaperRepos() ([]models.Repository, error) { if err != nil { return nil, err } - result := make([]models.Repository, len(rlist)) + result := make([]*models.Repository4Card, len(rlist)) for i, r := range rlist { - result[i] = *r + result[i] = r.ToCardFormat() } return result, nil } @@ -69,40 +85,30 @@ func FindRepos(opts FindReposOptions) (*models.FindReposResponse, error) { switch opts.Sort { //1.近期热门：按最近1个月浏览量倒序排序，最近1个月浏览量>最近更新>项目名称升序 - //2.近期活跃：按提交增长量（最近4个月commit数）倒序排序，提交增长量>最近更新>项目名称升序。 - //3.最近更新：按最近更新>项目名称升序排序。 - //4.最近创建：按项目创建时间排序，最近的排前面。最近创建>项目名称升序。 - //5.点赞最多：按点赞数倒序排序。点赞数>最近更新>项目名称升序。 - //6.派生最多：按派生数倒序排序。派生数>最近更新>项目名称升序。 - //7.数据集最多：按项目包含的数据集文件数量倒序排序，数据集文件数>最近更新>项目名称升序。 - //8.AI任务最多：按项目包含的AI任务数量倒序排序，AI任务数>最近更新>项目名称升序。 - //9.模型最多：按项目包含的模型数量倒序排序，模型大小为0则不统计。模型数>最近更新>项目名称升序。\ - - //1.近期热门 case "most_popular": orderBy = models.SearchOrderByLastMonthVisitsReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically - //2.近期活跃 + //2.近期活跃：按提交增长量（最近4个月commit数）倒序排序，提交增长量>最近更新>项目名称升序。 case "most_active": orderBy = models.SearchOrderByLastFourMonthCommitsReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically - //3.最近更新 + //3.最近更新：按最近更新>项目名称升序排序。 case "recent_update": orderBy = models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically - //4.最近创建 + //4.最近创建：按项目创建时间排序，最近的排前面。最近创建>项目名称升序。 case "newest": orderBy = models.SearchOrderByNewest + "," + models.SearchOrderByAlphabetically - //5.点赞最多 + //5.点赞最多：按点赞数倒序排序。点赞数>最近更新>项目名称升序。 case "most_stars": orderBy = models.SearchOrderByStarsReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically - //6.派生最多 + //6.派生最多：按派生数倒序排序。派生数>最近更新>项目名称升序。 case "most_forks": orderBy = models.SearchOrderByForksReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically - //7.数据集最多 + //7.数据集最多：按项目包含的数据集文件数量倒序排序，数据集文件数>最近更新>项目名称升序。 case "most_datasets": orderBy = models.SearchOrderByDatasetCntReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically - //8.AI任务最多 + //8.AI任务最多：按项目包含的AI任务数量倒序排序，AI任务数>最近更新>项目名称升序。 case "most_ai_tasks": orderBy = models.SearchOrderByAiTaskCntReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically - //9.模型最多 + //9.模型最多：按项目包含的模型数量倒序排序，模型大小为0则不统计。模型数>最近更新>项目名称升序。 case "most_models": orderBy = models.SearchOrderByModelCntReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically @@ -126,8 +132,13 @@ func FindRepos(opts FindReposOptions) (*models.FindReposResponse, error) { log.Error("FindRepos error when SearchRepository.%v", err) return nil, err } + result := make([]*models.Repository4Card, len(repos)) + for i, r := range repos { + result[i] = r.ToCardFormat() + } + return &models.FindReposResponse{ - Repos: repos, + Repos: result, Total: count, Page: opts.Page, PageSize: opts.PageSize, From 405cd970e689eebea9c9a1d20c43353914774cb5 Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 29 Nov 2022 11:56:37 +0800 Subject: [PATCH 23/75] 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 24/75] 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 b7d03ff367bfae835287fc9a976abe042d265f2d Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Wed, 30 Nov 2022 10:32:42 +0800 Subject: [PATCH 25/75] #3188 add active user list query api --- models/user.go | 32 ++++++++++++++++++++++++++++ models/user_business_analysis.go | 6 ++++++ routers/home.go | 18 ++++++++++++++++ routers/routes/routes.go | 7 +++++- services/repository/square.go | 46 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+), 1 deletion(-) diff --git a/models/user.go b/models/user.go index b21858e37..ec636e000 100755 --- a/models/user.go +++ b/models/user.go @@ -198,6 +198,38 @@ type SearchOrganizationsOptions struct { All bool } +type User4Front struct { + ID int64 + LowerName string `xorm:"UNIQUE NOT NULL"` + Name string `xorm:"UNIQUE NOT NULL"` + FullName string + Email string `xorm:"NOT NULL"` + Language string `xorm:"VARCHAR(5)"` + Description string + RelAvatarLink string + CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"` + UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"` +} + +func (u *User) ToFrontFormat() *User4Front { + uf := &User4Front{ + ID: u.ID, + LowerName: u.LowerName, + Name: u.Name, + FullName: u.FullName, + Email: u.Email, + Language: u.Language, + Description: u.Description, + CreatedUnix: u.CreatedUnix, + UpdatedUnix: u.UpdatedUnix, + } + if !u.KeepEmailPrivate { + uf.Email = u.Email + } + uf.RelAvatarLink = u.RelAvatarLink() + return uf +} + // GenerateRandomAvatar generates a random avatar for user. func (u *User) IsBindWechat() bool { return u.WechatOpenId != "" diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 394c24825..5ee79f16e 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -2424,3 +2424,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").Limit(size).Find(&userIds) + return userIds, err +} diff --git a/routers/home.go b/routers/home.go index 7b680bca0..f8363bb1a 100755 --- a/routers/home.go +++ b/routers/home.go @@ -317,6 +317,24 @@ func RepoSquare(ctx *context.Context) { resultMap["Repos"] = result ctx.JSON(http.StatusOK, response.SuccessWithData(resultMap)) } + +func ActiveUser(ctx *context.Context) { + var err error + var currentUserId int64 + if ctx.User != nil { + currentUserId = ctx.User.ID + } + result, err := repository.GetActiveUser4Square(currentUserId) + if err != nil { + log.Error("ActiveUser err. %v", err) + ctx.JSON(http.StatusOK, response.Success()) + return + } + resultMap := make(map[string]interface{}, 0) + resultMap["Users"] = result + ctx.JSON(http.StatusOK, response.SuccessWithData(resultMap)) +} + func RepoFind(ctx *context.Context) { keyword := strings.Trim(ctx.Query("q"), " ") topic := strings.Trim(ctx.Query("topic"), " ") diff --git a/routers/routes/routes.go b/routers/routes/routes.go index e902d10be..31d72a96b 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -372,7 +372,12 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/repos", func() { m.Get("", routers.ExploreRepos) - m.Get("/square", routers.RepoSquare) + m.Group("/square", func() { + m.Get("/tab", routers.RepoSquare) + m.Get("/active-user", routers.ActiveUser) + m.Get("/active-org", routers.RepoSquare) + }) + m.Get("/search", routers.RepoFind) }) m.Get("/datasets", routers.ExploreDatasets) diff --git a/services/repository/square.go b/services/repository/square.go index cb7b9e4db..4465cbe9b 100644 --- a/services/repository/square.go +++ b/services/repository/square.go @@ -144,3 +144,49 @@ func FindRepos(opts FindReposOptions) (*models.FindReposResponse, error) { PageSize: opts.PageSize, }, nil } + +type ActiveUser struct { + User *models.User4Front + Followed bool + ShowButton bool +} + +func GetActiveUser4Square(currentUserId int64) ([]*ActiveUser, error) { + result := make([]*ActiveUser, 0) + userIds, err := models.QueryLast30DaysHighestIndexUsers(10) + if err != nil { + log.Error("ActiveUser err. %v", err) + return result, err + } + if len(userIds) == 0 { + return result, nil + } + + users, err := models.GetUsersByIDs(userIds) + if err != nil { + return result, nil + } + usersMap := make(map[int64]*models.User) + for _, v := range users { + usersMap[v.ID] = v + } + + for i := 0; i < len(userIds); i++ { + userId := userIds[i] + user := usersMap[userId] + if user == nil { + continue + } + isFollowed := false + if currentUserId != 0 { + isFollowed = models.IsFollowing(currentUserId, userId) + } + a := &ActiveUser{ + Followed: isFollowed, + User: user.ToFrontFormat(), + ShowButton: currentUserId != userId, + } + result = append(result, a) + } + return result, nil +} From 788f8807fcbcf6bf5ad33d26a62cc99b938a3f33 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Wed, 30 Nov 2022 11:14:18 +0800 Subject: [PATCH 26/75] #3188 add active org list query api --- models/user.go | 2 ++ routers/home.go | 11 +++++++++++ routers/routes/routes.go | 2 +- services/repository/square.go | 12 ++++++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/models/user.go b/models/user.go index ec636e000..e4eed1f9a 100755 --- a/models/user.go +++ b/models/user.go @@ -207,6 +207,7 @@ type User4Front struct { Language string `xorm:"VARCHAR(5)"` Description string RelAvatarLink string + NumMembers int CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"` UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"` } @@ -222,6 +223,7 @@ func (u *User) ToFrontFormat() *User4Front { Description: u.Description, CreatedUnix: u.CreatedUnix, UpdatedUnix: u.UpdatedUnix, + NumMembers: u.NumMembers, } if !u.KeepEmailPrivate { uf.Email = u.Email diff --git a/routers/home.go b/routers/home.go index f8363bb1a..a1043655e 100755 --- a/routers/home.go +++ b/routers/home.go @@ -334,6 +334,17 @@ func ActiveUser(ctx *context.Context) { resultMap["Users"] = result ctx.JSON(http.StatusOK, response.SuccessWithData(resultMap)) } +func ActiveOrg(ctx *context.Context) { + result, err := repository.GetActiveOrgs() + if err != nil { + log.Error("ActiveOrg err. %v", err) + ctx.JSON(http.StatusOK, response.Success()) + return + } + resultMap := make(map[string]interface{}, 0) + resultMap["Orgs"] = result + ctx.JSON(http.StatusOK, response.SuccessWithData(resultMap)) +} func RepoFind(ctx *context.Context) { keyword := strings.Trim(ctx.Query("q"), " ") diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 31d72a96b..8f60153db 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -375,7 +375,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/square", func() { m.Get("/tab", routers.RepoSquare) m.Get("/active-user", routers.ActiveUser) - m.Get("/active-org", routers.RepoSquare) + m.Get("/active-org", routers.ActiveOrg) }) m.Get("/search", routers.RepoFind) diff --git a/services/repository/square.go b/services/repository/square.go index 4465cbe9b..55858db81 100644 --- a/services/repository/square.go +++ b/services/repository/square.go @@ -190,3 +190,15 @@ func GetActiveUser4Square(currentUserId int64) ([]*ActiveUser, error) { } return result, nil } + +func GetActiveOrgs() ([]*models.User4Front, error) { + orgScores, err := models.FindTopNOpenIOrgs(10) + if err != nil { + return nil, err + } + orgs := make([]*models.User4Front, len(orgScores)) + for i, v := range orgScores { + orgs[i] = v.ToFrontFormat() + } + return orgs, nil +} From 363dc27fa590665d2f06e7451d7189882de1b457 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Thu, 1 Dec 2022 10:27:22 +0800 Subject: [PATCH 27/75] #3169 update --- models/list_options.go | 12 ++++++------ routers/home.go | 14 +++++++++++++- routers/routes/routes.go | 4 +++- services/repository/square.go | 16 ++++++++-------- 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/models/list_options.go b/models/list_options.go index 29144ba22..d6d1dcf0d 100644 --- a/models/list_options.go +++ b/models/list_options.go @@ -10,15 +10,15 @@ import ( "xorm.io/xorm" ) -type SelectedPageSize int +type AvailablePageSize int const ( - PageSize15 SelectedPageSize = 15 - PageSize30 SelectedPageSize = 30 - PageSize50 SelectedPageSize = 50 + PageSize15 AvailablePageSize = 15 + PageSize30 AvailablePageSize = 30 + PageSize50 AvailablePageSize = 50 ) -func (s SelectedPageSize) IsLegal() bool { +func (s AvailablePageSize) IsLegal() bool { switch s { case PageSize30, PageSize50, PageSize15: return true @@ -26,7 +26,7 @@ func (s SelectedPageSize) IsLegal() bool { return false } -func (s SelectedPageSize) Int() int { +func (s AvailablePageSize) Int() int { return int(s) } diff --git a/routers/home.go b/routers/home.go index a1043655e..d54a0160f 100755 --- a/routers/home.go +++ b/routers/home.go @@ -43,6 +43,8 @@ const ( tplHomeTerm base.TplName = "terms" tplHomePrivacy base.TplName = "privacy" tplResoruceDesc base.TplName = "resource_desc" + tplRepoSquare base.TplName = "explore/repos/square" + tplRepoSearch base.TplName = "explore/repos/search" ) // Home render home page @@ -296,6 +298,13 @@ func ExploreRepos(ctx *context.Context) { }) } +func GetRepoSquarePage(ctx *context.Context) { + ctx.HTML(200, tplRepoSquare) +} +func GetRepoSearchPage(ctx *context.Context) { + ctx.HTML(200, tplRepoSearch) +} + func RepoSquare(ctx *context.Context) { var result []*models.Repository4Card var err error @@ -351,7 +360,10 @@ func RepoFind(ctx *context.Context) { topic := strings.Trim(ctx.Query("topic"), " ") sort := strings.Trim(ctx.Query("sort"), " ") page := ctx.QueryInt("page") - pageSize := models.SelectedPageSize(ctx.QueryInt("pageSize")) + pageSize := models.AvailablePageSize(ctx.QueryInt("pageSize")) + if pageSize == 0 { + pageSize = models.PageSize15 + } if !pageSize.IsLegal() { ctx.JSON(http.StatusOK, response.ServerError("pageSize illegal")) return diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 8f60153db..8ecca32e2 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -371,8 +371,10 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/images/star", repo.GetStarImages) m.Group("/repos", func() { - m.Get("", routers.ExploreRepos) + //m.Get("", routers.ExploreRepos) + m.Get("", routers.GetRepoSearchPage) m.Group("/square", func() { + m.Get("", routers.GetRepoSquarePage) m.Get("/tab", routers.RepoSquare) m.Get("/active-user", routers.ActiveUser) m.Get("/active-org", routers.ActiveOrg) diff --git a/services/repository/square.go b/services/repository/square.go index 55858db81..7ff36c5af 100644 --- a/services/repository/square.go +++ b/services/repository/square.go @@ -85,31 +85,31 @@ func FindRepos(opts FindReposOptions) (*models.FindReposResponse, error) { switch opts.Sort { //1.近期热门：按最近1个月浏览量倒序排序，最近1个月浏览量>最近更新>项目名称升序 - case "most_popular": + case "mostpopular": orderBy = models.SearchOrderByLastMonthVisitsReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically //2.近期活跃：按提交增长量（最近4个月commit数）倒序排序，提交增长量>最近更新>项目名称升序。 - case "most_active": + case "mostactive": orderBy = models.SearchOrderByLastFourMonthCommitsReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically //3.最近更新：按最近更新>项目名称升序排序。 - case "recent_update": + case "recentupdate": orderBy = models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically //4.最近创建：按项目创建时间排序，最近的排前面。最近创建>项目名称升序。 case "newest": orderBy = models.SearchOrderByNewest + "," + models.SearchOrderByAlphabetically //5.点赞最多：按点赞数倒序排序。点赞数>最近更新>项目名称升序。 - case "most_stars": + case "moststars": orderBy = models.SearchOrderByStarsReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically //6.派生最多：按派生数倒序排序。派生数>最近更新>项目名称升序。 - case "most_forks": + case "mostforks": orderBy = models.SearchOrderByForksReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically //7.数据集最多：按项目包含的数据集文件数量倒序排序，数据集文件数>最近更新>项目名称升序。 - case "most_datasets": + case "mostdatasets": orderBy = models.SearchOrderByDatasetCntReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically //8.AI任务最多：按项目包含的AI任务数量倒序排序，AI任务数>最近更新>项目名称升序。 - case "most_ai_tasks": + case "mostaitasks": orderBy = models.SearchOrderByAiTaskCntReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically //9.模型最多：按项目包含的模型数量倒序排序，模型大小为0则不统计。模型数>最近更新>项目名称升序。 - case "most_models": + case "mostmodels": orderBy = models.SearchOrderByModelCntReverse + "," + models.SearchOrderByRecentUpdated + "," + models.SearchOrderByAlphabetically default: From 668d169eed2d31c0789ce38d8382861c2149e9d4 Mon Sep 17 00:00:00 2001 From: chenshihai Date: Fri, 2 Dec 2022 15:39:15 +0800 Subject: [PATCH 28/75] update package.json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 7748f3de3..fa2c5327b 100644 --- a/package.json +++ b/package.json @@ -17,11 +17,12 @@ "core-js": "3.6.5", "css-loader": "3.5.3", "cssnano": "4.1.10", + "dayjs": "1.10.7", "domino": "2.1.5", "dropzone": "5.7.2", "echarts": "3.8.5", "element-ui": "2.15.5", - "esdk-obs-browserjs": "3.20.7", + "esdk-obs-browserjs": "3.22.3", "esdk-obs-nodejs": "3.20.11", "fast-glob": "3.2.2", "file-loader": "6.0.0", From ed6ec586afa090a327e73e36ac3816268f0addc0 Mon Sep 17 00:00:00 2001 From: chenshihai Date: Fri, 2 Dec 2022 15:39:40 +0800 Subject: [PATCH 29/75] update webpack config --- webpack.config.js | 4 ++-- webpack_pro.config.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 917abf62a..26acf4c96 100755 --- a/webpack.config.js +++ b/webpack.config.js @@ -22,8 +22,8 @@ for (const path of glob('web_src/less/themes/*.less')) { const standalone = {}; const stadalonePaths = [ - ...glob('web_src/js/standalone/*.js'), - ...glob('web_src/less/standalone/*.less'), + ...glob('web_src/js/standalone/**/*.js'), + ...glob('web_src/less/standalone/**/*.less'), ]; for (const path of stadalonePaths) { standalone[parse(path).name] = [path]; diff --git a/webpack_pro.config.js b/webpack_pro.config.js index d12295c0a..799f43a07 100755 --- a/webpack_pro.config.js +++ b/webpack_pro.config.js @@ -22,8 +22,8 @@ for (const path of glob('web_src/less/themes/*.less')) { const standalone = {}; const stadalonePaths = [ - ...glob('web_src/js/standalone/*.js'), - ...glob('web_src/less/standalone/*.less'), + ...glob('web_src/js/standalone/**/*.js'), + ...glob('web_src/less/standalone/**/*.less'), ]; for (const path of stadalonePaths) { standalone[parse(path).name] = [path]; From 5eb02595b99b0fd332cee54179345659b86dc5d7 Mon Sep 17 00:00:00 2001 From: chenshihai Date: Fri, 2 Dec 2022 15:44:20 +0800 Subject: [PATCH 30/75] add repos square --- templates/base/head_navbar.tmpl | 6 +- templates/base/head_navbar_fluid.tmpl | 6 +- templates/base/head_navbar_home.tmpl | 6 +- templates/base/head_navbar_pro.tmpl | 4 +- templates/explore/navbar.tmpl | 4 +- templates/explore/repos/search.tmpl | 6 + templates/explore/repos/square.tmpl | 6 + templates/user/dashboard/dashboard.tmpl | 2 +- web_src/js/index.js | 2 +- web_src/vuepages/apis/modules/common.js | 12 + web_src/vuepages/apis/modules/repos.js | 69 +++++ .../vuepages/pages/repos/components/ActiveOrgs.vue | 113 +++++++ .../pages/repos/components/ActiveUsers.vue | 138 +++++++++ .../pages/repos/components/RecommendRepos.vue | 135 ++++++++ .../pages/repos/components/ReposFilters.vue | 111 +++++++ .../vuepages/pages/repos/components/ReposItem.vue | 266 ++++++++++++++++ .../vuepages/pages/repos/components/ReposList.vue | 94 ++++++ .../vuepages/pages/repos/components/SearchBar.vue | 155 ++++++++++ .../vuepages/pages/repos/components/SquareTop.vue | 343 +++++++++++++++++++++ web_src/vuepages/pages/repos/search/index.vue | 59 ++++ .../vuepages/pages/repos/search/vp-repos-search.js | 17 + web_src/vuepages/pages/repos/square/index.vue | 86 ++++++ .../vuepages/pages/repos/square/vp-repos-square.js | 17 + 23 files changed, 1642 insertions(+), 15 deletions(-) create mode 100644 templates/explore/repos/search.tmpl create mode 100644 templates/explore/repos/square.tmpl create mode 100644 web_src/vuepages/apis/modules/common.js create mode 100644 web_src/vuepages/apis/modules/repos.js create mode 100644 web_src/vuepages/pages/repos/components/ActiveOrgs.vue create mode 100644 web_src/vuepages/pages/repos/components/ActiveUsers.vue create mode 100644 web_src/vuepages/pages/repos/components/RecommendRepos.vue create mode 100644 web_src/vuepages/pages/repos/components/ReposFilters.vue create mode 100644 web_src/vuepages/pages/repos/components/ReposItem.vue create mode 100644 web_src/vuepages/pages/repos/components/ReposList.vue create mode 100644 web_src/vuepages/pages/repos/components/SearchBar.vue create mode 100644 web_src/vuepages/pages/repos/components/SquareTop.vue create mode 100644 web_src/vuepages/pages/repos/search/index.vue create mode 100644 web_src/vuepages/pages/repos/search/vp-repos-search.js create mode 100644 web_src/vuepages/pages/repos/square/index.vue create mode 100644 web_src/vuepages/pages/repos/square/vp-repos-square.js diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 50521516f..cb28fa846 100755 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -32,7 +32,7 @@ - {{.i18n.Tr "custom.head.project"}} + {{.i18n.Tr "custom.head.project"}} {{.i18n.Tr "custom.head.dataset"}}
{{.i18n.Tr "repo.model_manager"}} @@ -72,7 +72,7 @@
- {{.i18n.Tr "custom.head.project"}} + {{.i18n.Tr "custom.head.project"}} {{.i18n.Tr "custom.head.dataset"}}
{{.i18n.Tr "repo.model_manager"}} @@ -97,7 +97,7 @@
{{else if .IsLandingPageExplore}} - {{.i18n.Tr "home"}} + {{.i18n.Tr "home"}} {{else if .IsLandingPageOrganizations}} {{.i18n.Tr "home"}} {{end}} diff --git a/templates/base/head_navbar_fluid.tmpl b/templates/base/head_navbar_fluid.tmpl index b2fd60787..19f04f0b7 100644 --- a/templates/base/head_navbar_fluid.tmpl +++ b/templates/base/head_navbar_fluid.tmpl @@ -32,7 +32,7 @@ - {{.i18n.Tr "custom.head.project"}} + {{.i18n.Tr "custom.head.project"}} {{.i18n.Tr "custom.head.dataset"}}
{{.i18n.Tr "repo.model_manager"}} @@ -71,7 +71,7 @@
- {{.i18n.Tr "custom.head.project"}} + {{.i18n.Tr "custom.head.project"}} {{.i18n.Tr "custom.head.dataset"}}
{{.i18n.Tr "repo.model_manager"}} @@ -95,7 +95,7 @@
{{else if .IsLandingPageExplore}} - {{.i18n.Tr "home"}} + {{.i18n.Tr "home"}} {{else if .IsLandingPageOrganizations}} {{.i18n.Tr "home"}} {{end}} diff --git a/templates/base/head_navbar_home.tmpl b/templates/base/head_navbar_home.tmpl index 3a8a273d2..e64c18c9b 100644 --- a/templates/base/head_navbar_home.tmpl +++ b/templates/base/head_navbar_home.tmpl @@ -24,7 +24,7 @@ - {{.i18n.Tr "custom.head.project"}} + {{.i18n.Tr "custom.head.project"}} {{.i18n.Tr "custom.head.dataset"}}
{{.i18n.Tr "repo.model_manager"}} @@ -64,7 +64,7 @@
- {{.i18n.Tr "custom.head.project"}} + {{.i18n.Tr "custom.head.project"}} {{.i18n.Tr "custom.head.dataset"}}
{{.i18n.Tr "repo.model_manager"}} @@ -88,7 +88,7 @@
{{else if .IsLandingPageExplore}} - {{.i18n.Tr "home"}} + {{.i18n.Tr "home"}} {{else if .IsLandingPageOrganizations}} {{.i18n.Tr "home"}} {{end}} diff --git a/templates/base/head_navbar_pro.tmpl b/templates/base/head_navbar_pro.tmpl index f342e568a..02374e7fc 100644 --- a/templates/base/head_navbar_pro.tmpl +++ b/templates/base/head_navbar_pro.tmpl @@ -34,7 +34,7 @@ - {{.i18n.Tr "custom.head.project"}} + {{.i18n.Tr "custom.head.project"}} {{.i18n.Tr "custom.head.dataset"}}
{{.i18n.Tr "repo.model_manager"}} @@ -98,7 +98,7 @@
{{else if .IsLandingPageExplore}} - {{.i18n.Tr "home"}} + {{.i18n.Tr "home"}} {{else if .IsLandingPageOrganizations}} {{.i18n.Tr "home"}} {{end}} diff --git a/templates/explore/navbar.tmpl b/templates/explore/navbar.tmpl index c8c81defb..3bc907458 100644 --- a/templates/explore/navbar.tmpl +++ b/templates/explore/navbar.tmpl @@ -1,6 +1,6 @@
- + {{svg "octicon-repo" 16}} {{.i18n.Tr "explore.repos"}} @@ -24,7 +24,7 @@
- + {{svg "octicon-repo" 16}} {{.i18n.Tr "explore.repos"}} diff --git a/templates/explore/repos/search.tmpl b/templates/explore/repos/search.tmpl new file mode 100644 index 000000000..6f4725394 --- /dev/null +++ b/templates/explore/repos/search.tmpl @@ -0,0 +1,6 @@ +{{template "base/head_home" .}} + +
+
+ +{{template "base/footer" .}} diff --git a/templates/explore/repos/square.tmpl b/templates/explore/repos/square.tmpl new file mode 100644 index 000000000..baa5d5ad9 --- /dev/null +++ b/templates/explore/repos/square.tmpl @@ -0,0 +1,6 @@ +{{template "base/head_home" .}} + +
+
+ +{{template "base/footer" .}} diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index 126dbdf2a..dff8f880d 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -10,7 +10,7 @@ {{.i18n.Tr "home.wecome_AI_plt"}}
-

{{.i18n.Tr "home.explore_AI"}} {{.i18n.Tr "home.repositories"}} {{.i18n.Tr "home.or_t"}} {{.i18n.Tr "home.datasets"}}

+

{{.i18n.Tr "home.explore_AI"}} {{.i18n.Tr "home.repositories"}} {{.i18n.Tr "home.or_t"}} {{.i18n.Tr "home.datasets"}}

{{.i18n.Tr "home.use_plt__fuction"}} {{.i18n.Tr "repo.create_repo"}}

{{.i18n.Tr "home.provide_resoure"}}

diff --git a/web_src/js/index.js b/web_src/js/index.js index 001644d92..038e3d8e2 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -50,7 +50,7 @@ import initImage from "./features/images.js"; import selectDataset from "./components/dataset/selectDataset.vue"; import referenceDataset from "./components/dataset/referenceDataset.vue"; // import $ from 'jquery.js' -import router from "./router/index.js"; +// import router from "./router/index.js"; import { Message } from "element-ui"; import { i18nVue } from "./features/i18nVue.js"; diff --git a/web_src/vuepages/apis/modules/common.js b/web_src/vuepages/apis/modules/common.js new file mode 100644 index 000000000..e19096b29 --- /dev/null +++ b/web_src/vuepages/apis/modules/common.js @@ -0,0 +1,12 @@ +import service from '../service'; + +// 获取promote配置数据 +export const getPromoteData = (filePathName) => { + return service({ + url: '/dashboard/invitation', + method: 'get', + params: { + filename: filePathName + }, + }); +} diff --git a/web_src/vuepages/apis/modules/repos.js b/web_src/vuepages/apis/modules/repos.js new file mode 100644 index 000000000..e3edbee3b --- /dev/null +++ b/web_src/vuepages/apis/modules/repos.js @@ -0,0 +1,69 @@ +import service from '../service'; + +// 获取首页数据 +export const getHomePageData = () => { + return service({ + url: '/recommend/home', + method: 'get', + params: {}, + }); +} + +// 获取项目广场上方tab数据 tab=preferred 项目优选|incubation 启智孵化管道|hot-paper 热门论文项目 +export const getReposSquareTabData = (tab) => { + return service({ + url: '/explore/repos/square/tab', + method: 'get', + params: { + type: tab + }, + }); +} + +// 搜索项目 +// q string 否 关键词 +// topic string 否 标签名 +// sort string 是 mostpopular 近期热门 | mostactive 近期活跃 | recentupdate 最近更新 | newest 最近创建 +// moststars 点赞最多 | mostforks 派生最多 | mostdatasets 数据集最多 | mostaitasks AI任务最多 | mostmodels 模型最多 +// pageSize int 是 每页大小，可选值为15 | 30 | 50 +// page int 是 页码 +export const getReposListData = (params) => { + return service({ + url: '/explore/repos/search', + method: 'get', + params: { + q: params.q || '', + topic: params.topic || '', + sort: params.sort || 'mostpopular', + pageSize: params.pageSize || 15, + page: params.page || 1, + }, + }); +} + +// 获取活跃用户列表 +export const getActiveUsers = () => { + return service({ + url: '/explore/repos/square/active-user', + method: 'get', + params: {}, + }); +} + +// 关注用户 +export const followingUsers = (userName, isFollowing) => { + return service({ + url: `/api/v1/user/following/${userName}`, + method: isFollowing ? 'put' : 'delete', + params: {}, + }); +} + +// 获取活跃组织列表 +export const getActiveOrgs = () => { + return service({ + url: '/explore/repos/square/active-org', + method: 'get', + params: {}, + }); +} diff --git a/web_src/vuepages/pages/repos/components/ActiveOrgs.vue b/web_src/vuepages/pages/repos/components/ActiveOrgs.vue new file mode 100644 index 000000000..4d1b614f8 --- /dev/null +++ b/web_src/vuepages/pages/repos/components/ActiveOrgs.vue @@ -0,0 +1,113 @@ + + + + diff --git a/web_src/vuepages/pages/repos/components/ActiveUsers.vue b/web_src/vuepages/pages/repos/components/ActiveUsers.vue new file mode 100644 index 000000000..d99b8b0df --- /dev/null +++ b/web_src/vuepages/pages/repos/components/ActiveUsers.vue @@ -0,0 +1,138 @@ + + + diff --git a/web_src/vuepages/pages/repos/components/RecommendRepos.vue b/web_src/vuepages/pages/repos/components/RecommendRepos.vue new file mode 100644 index 000000000..e9cede635 --- /dev/null +++ b/web_src/vuepages/pages/repos/components/RecommendRepos.vue @@ -0,0 +1,135 @@ + + + diff --git a/web_src/vuepages/pages/repos/components/ReposFilters.vue b/web_src/vuepages/pages/repos/components/ReposFilters.vue new file mode 100644 index 000000000..e2db9ddc5 --- /dev/null +++ b/web_src/vuepages/pages/repos/components/ReposFilters.vue @@ -0,0 +1,111 @@ + + + diff --git a/web_src/vuepages/pages/repos/components/ReposItem.vue b/web_src/vuepages/pages/repos/components/ReposItem.vue new file mode 100644 index 000000000..0e5b4177c --- /dev/null +++ b/web_src/vuepages/pages/repos/components/ReposItem.vue @@ -0,0 +1,266 @@ + + + diff --git a/web_src/vuepages/pages/repos/components/ReposList.vue b/web_src/vuepages/pages/repos/components/ReposList.vue new file mode 100644 index 000000000..b4de806ed --- /dev/null +++ b/web_src/vuepages/pages/repos/components/ReposList.vue @@ -0,0 +1,94 @@ + + + + diff --git a/web_src/vuepages/pages/repos/components/SearchBar.vue b/web_src/vuepages/pages/repos/components/SearchBar.vue new file mode 100644 index 000000000..f21fc581d --- /dev/null +++ b/web_src/vuepages/pages/repos/components/SearchBar.vue @@ -0,0 +1,155 @@ + + + diff --git a/web_src/vuepages/pages/repos/components/SquareTop.vue b/web_src/vuepages/pages/repos/components/SquareTop.vue new file mode 100644 index 000000000..a9a2c3b22 --- /dev/null +++ b/web_src/vuepages/pages/repos/components/SquareTop.vue @@ -0,0 +1,343 @@ + + + diff --git a/web_src/vuepages/pages/repos/search/index.vue b/web_src/vuepages/pages/repos/search/index.vue new file mode 100644 index 000000000..83ceb2a4a --- /dev/null +++ b/web_src/vuepages/pages/repos/search/index.vue @@ -0,0 +1,59 @@ + + + + + diff --git a/web_src/vuepages/pages/repos/search/vp-repos-search.js b/web_src/vuepages/pages/repos/search/vp-repos-search.js new file mode 100644 index 000000000..48e542500 --- /dev/null +++ b/web_src/vuepages/pages/repos/search/vp-repos-search.js @@ -0,0 +1,17 @@ +import Vue from 'vue'; +import ElementUI from 'element-ui'; +import 'element-ui/lib/theme-chalk/index.css'; +import localeEn from 'element-ui/lib/locale/lang/en'; +import localeZh from 'element-ui/lib/locale/lang/zh-CN'; +import { i18n, lang } from '~/langs'; +import App from './index.vue'; + +Vue.use(ElementUI, { + locale: lang === 'zh-CN' ? localeZh : localeEn, + size: 'small', +}); + +new Vue({ + i18n, + render: (h) => h(App), +}).$mount('#__vue-root'); diff --git a/web_src/vuepages/pages/repos/square/index.vue b/web_src/vuepages/pages/repos/square/index.vue new file mode 100644 index 000000000..d94eeb059 --- /dev/null +++ b/web_src/vuepages/pages/repos/square/index.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/web_src/vuepages/pages/repos/square/vp-repos-square.js b/web_src/vuepages/pages/repos/square/vp-repos-square.js new file mode 100644 index 000000000..48e542500 --- /dev/null +++ b/web_src/vuepages/pages/repos/square/vp-repos-square.js @@ -0,0 +1,17 @@ +import Vue from 'vue'; +import ElementUI from 'element-ui'; +import 'element-ui/lib/theme-chalk/index.css'; +import localeEn from 'element-ui/lib/locale/lang/en'; +import localeZh from 'element-ui/lib/locale/lang/zh-CN'; +import { i18n, lang } from '~/langs'; +import App from './index.vue'; + +Vue.use(ElementUI, { + locale: lang === 'zh-CN' ? localeZh : localeEn, + size: 'small', +}); + +new Vue({ + i18n, + render: (h) => h(App), +}).$mount('#__vue-root'); From 8e7aff452a42551baadac9a716e735f8dea63051 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Fri, 2 Dec 2022 16:29:53 +0800 Subject: [PATCH 31/75] #3169 update --- models/cloudbrain.go | 23 ++++++++- models/repo.go | 105 ++++++++++++++++++++++++++++++++++++++ routers/repo/ai_model_manage.go | 23 +++++++-- routers/repo/attachment.go | 3 ++ services/repository/repository.go | 27 +++++++--- 5 files changed, 170 insertions(+), 11 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index cdd9698fe..b8384f746 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1861,6 +1861,7 @@ func CreateCloudbrain(cloudbrain *Cloudbrain) (err error) { session.Commit() go IncreaseDatasetUseCount(cloudbrain.Uuid) + go ResetRepoAITaskNum(cloudbrain.RepoID) return nil } @@ -2010,9 +2011,29 @@ func DeleteJob(job *Cloudbrain) error { func deleteJob(e Engine, job *Cloudbrain) error { _, err := e.ID(job.ID).Delete(job) + if err == nil { + go updateAITaskNumWhenDeleteJob(job) + } return err } +func updateAITaskNumWhenDeleteJob(job *Cloudbrain) { + repoId := job.RepoID + if repoId == 0 { + t := &Cloudbrain{} + _, tempErr := x.ID(job.ID).Unscoped().Get(t) + if tempErr != nil { + log.Error("updateAITaskNumWhenDeleteJob error.%v", tempErr) + return + } + repoId = t.RepoID + } + + if repoId > 0 { + ResetRepoAITaskNum(repoId) + } +} + func GetCloudbrainByName(jobName string) (*Cloudbrain, error) { cb := &Cloudbrain{JobName: jobName} return getRepoCloudBrain(cb) @@ -2138,7 +2159,7 @@ func RestartCloudbrain(old *Cloudbrain, new *Cloudbrain) (err error) { } go IncreaseDatasetUseCount(new.Uuid) - + go ResetRepoAITaskNum(new.RepoID) return nil } func CloudbrainAll(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) { diff --git a/models/repo.go b/models/repo.go index a293dab18..b35b56a6f 100755 --- a/models/repo.go +++ b/models/repo.go @@ -2429,6 +2429,75 @@ func CheckRepoStats(ctx context.Context) error { } } // ***** END: Repository.NumForks ***** + + // ***** START: Repository.DatasetCnt ***** + desc = "repository count 'dataset_cnt'" + results, err = x.Query("SELECT repository.id FROM `repository` WHERE repository.dataset_cnt!=(select count(1) from attachment inner join dataset on attachment.dataset_id = dataset.id where dataset.repo_id = repository.id)") + if err != nil { + log.Error("Select %s: %v", desc, err) + } else { + for _, result := range results { + id := com.StrTo(result["id"]).MustInt64() + select { + case <-ctx.Done(): + log.Warn("CheckRepoStats: Cancelled") + return ErrCancelledf("during %s for repo ID %d", desc, id) + default: + } + log.Trace("Updating %s: %d", desc, id) + err = ResetRepoDatasetNum(id) + if err != nil { + log.Error("Update %s[%d]: %v", desc, id, err) + } + } + } + // ***** END: Repository.DatasetCnt ***** + + // ***** START: Repository.ModelCnt ***** + desc = "repository count 'model_cnt'" + results, err = x.Query("SELECT repository.id FROM `repository` WHERE repository.model_cnt!=(select count(1) from ai_model_manage where repository.id = ai_model_manage.repo_id and ai_model_manage.size > 0 )") + if err != nil { + log.Error("Select %s: %v", desc, err) + } else { + for _, result := range results { + id := com.StrTo(result["id"]).MustInt64() + select { + case <-ctx.Done(): + log.Warn("CheckRepoStats: Cancelled") + return ErrCancelledf("during %s for repo ID %d", desc, id) + default: + } + log.Trace("Updating %s: %d", desc, id) + err = ResetRepoModelNum(id) + if err != nil { + log.Error("Update %s[%d]: %v", desc, id, err) + } + } + } + // ***** END: Repository.ModelCnt ***** + + // ***** START: Repository.AiTaskCnt ***** + desc = "repository count 'ai_task_cnt'" + results, err = x.Query("SELECT repository.id FROM `repository` WHERE repository.ai_task_cnt!=(select count(1) from cloudbrain where repository.id = cloudbrain.repo_id and (cloudbrain.deleted_at is null or cloudbrain.deleted_at = '0001-01-01 00:00:00') )") + if err != nil { + log.Error("Select %s: %v", desc, err) + } else { + for _, result := range results { + id := com.StrTo(result["id"]).MustInt64() + select { + case <-ctx.Done(): + log.Warn("CheckRepoStats: Cancelled") + return ErrCancelledf("during %s for repo ID %d", desc, id) + default: + } + log.Trace("Updating %s: %d", desc, id) + err = ResetRepoAITaskNum(id) + if err != nil { + log.Error("Update %s[%d]: %v", desc, id, err) + } + } + } + // ***** END: Repository.AiTaskCnt ***** return nil } @@ -2825,3 +2894,39 @@ func ReadLatestFileInRepo(userName, repoName, refName, treePath string) (*RepoFi } return &RepoFile{CommitId: commitId, Content: d}, nil } + +func ResetRepoAITaskNum(repoId int64) error { + n, err := x.Where("repo_id = ? ", repoId).Count(&Cloudbrain{}) + if err != nil { + return err + } + r := Repository{ + AiTaskCnt: n, + } + _, err = x.Cols("ai_task_cnt").Where("id = ?", repoId).Update(&r) + return err +} + +func ResetRepoDatasetNum(repoId int64) error { + n, err := x.Table("attachment").Join("inner", "dataset", "attachment.dataset_id = dataset.id").Where("dataset.repo_id = ?", repoId).Count() + if err != nil { + return err + } + r := Repository{ + DatasetCnt: n, + } + _, err = x.Cols("dataset_cnt").Where("id = ?", repoId).Update(&r) + return err +} + +func ResetRepoModelNum(repoId int64) error { + n, err := x.Where("repo_id = ? and size > 0 ", repoId).Count(&AiModelManage{}) + if err != nil { + return err + } + r := Repository{ + ModelCnt: n, + } + _, err = x.Cols("model_cnt").Where("id = ?", repoId).Update(&r) + return err +} diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go index 7eedb9bc4..4eb04e772 100644 --- a/routers/repo/ai_model_manage.go +++ b/routers/repo/ai_model_manage.go @@ -2,6 +2,7 @@ package repo import ( "archive/zip" + "code.gitea.io/gitea/services/repository" "encoding/json" "errors" "fmt" @@ -120,6 +121,9 @@ func saveModelByParameters(jobId string, versionName string, name string, versio if err != nil { return "", err } + if modelSize > 0 { + go repository.ResetRepoModelNum(aiTask.RepoID) + } if len(lastNewModelId) > 0 { //udpate status and version count models.ModifyModelNewProperty(lastNewModelId, MODEL_NOT_LATEST, 0) @@ -305,13 +309,14 @@ func getSize(files []storage.FileInfo) int64 { func UpdateModelSize(modeluuid string) { model, err := models.QueryModelById(modeluuid) if err == nil { + var size int64 if model.Type == models.TypeCloudBrainOne { if strings.HasPrefix(model.Path, setting.Attachment.Minio.Bucket+"/"+Model_prefix) { files, err := storage.GetAllObjectByBucketAndPrefixMinio(setting.Attachment.Minio.Bucket, model.Path[len(setting.Attachment.Minio.Bucket)+1:]) if err != nil { log.Info("Failed to query model size from minio. id=" + modeluuid) } - size := getSize(files) + size = getSize(files) models.ModifyModelSize(modeluuid, size) } } else if model.Type == models.TypeCloudBrainTwo { @@ -320,10 +325,13 @@ func UpdateModelSize(modeluuid string) { if err != nil { log.Info("Failed to query model size from obs. id=" + modeluuid) } - size := getSize(files) + size = getSize(files) models.ModifyModelSize(modeluuid, size) } } + if model.Size == 0 && size > 0 { + repository.ResetRepoModelNum(model.RepoId) + } } else { log.Info("not found model,uuid=" + modeluuid) } @@ -438,13 +446,14 @@ func DeleteModelFile(ctx *context.Context) { fileName := ctx.Query("fileName") model, err := models.QueryModelById(id) if err == nil { + var totalSize int64 if model.ModelType == MODEL_LOCAL_TYPE { if model.Type == models.TypeCloudBrainOne { bucketName := setting.Attachment.Minio.Bucket objectName := model.Path[len(bucketName)+1:] + fileName log.Info("delete bucket=" + bucketName + " path=" + objectName) if strings.HasPrefix(model.Path, bucketName+"/"+Model_prefix) { - totalSize := storage.MinioGetFilesSize(bucketName, []string{objectName}) + totalSize = storage.MinioGetFilesSize(bucketName, []string{objectName}) err := storage.Attachments.DeleteDir(objectName) if err != nil { log.Info("Failed to delete model. id=" + id) @@ -464,7 +473,7 @@ func DeleteModelFile(ctx *context.Context) { objectName := model.Path[len(setting.Bucket)+1:] + fileName log.Info("delete bucket=" + setting.Bucket + " path=" + objectName) if strings.HasPrefix(model.Path, bucketName+"/"+Model_prefix) { - totalSize := storage.ObsGetFilesSize(bucketName, []string{objectName}) + totalSize = storage.ObsGetFilesSize(bucketName, []string{objectName}) err := storage.ObsRemoveObject(bucketName, objectName) if err != nil { log.Info("Failed to delete model. id=" + id) @@ -481,6 +490,9 @@ func DeleteModelFile(ctx *context.Context) { } } } + if (model.Size - totalSize) <= 0 { + repository.ResetRepoModelNum(model.RepoId) + } } ctx.JSON(200, map[string]string{ "code": "0", @@ -549,6 +561,9 @@ func deleteModelByID(ctx *context.Context, id string) error { } } } + if model.Size > 0 { + go repository.ResetRepoModelNum(model.RepoId) + } } } return err diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go index 240e78acc..8ae8e387f 100755 --- a/routers/repo/attachment.go +++ b/routers/repo/attachment.go @@ -29,6 +29,7 @@ import ( "code.gitea.io/gitea/modules/storage" "code.gitea.io/gitea/modules/upload" "code.gitea.io/gitea/modules/worker" + repo_service "code.gitea.io/gitea/services/repository" gouuid "github.com/satori/go.uuid" ) @@ -180,6 +181,7 @@ func DeleteAttachment(ctx *context.Context) { ctx.Error(500, fmt.Sprintf("DeleteAttachment: %v", err)) return } + go repo_service.ResetRepoDatasetNumByDatasetId(attach.DatasetID) attachjson, _ := json.Marshal(attach) labelmsg.SendDeleteAttachToLabelSys(string(attachjson)) @@ -894,6 +896,7 @@ func CompleteMultipart(ctx *context.Context) { return } attachment.UpdateDatasetUpdateUnix() + go repo_service.ResetRepoDatasetNumByDatasetId(dataset.ID) repository, _ := models.GetRepositoryByID(dataset.RepoID) notification.NotifyOtherTask(ctx.User, repository, fmt.Sprint(repository.IsPrivate, attachment.IsPrivate), attachment.Name, models.ActionUploadAttachment) if attachment.DatasetID != 0 { diff --git a/services/repository/repository.go b/services/repository/repository.go index b4c047392..02928d855 100644 --- a/services/repository/repository.go +++ b/services/repository/repository.go @@ -5,18 +5,17 @@ package repository import ( - "fmt" - "io/ioutil" - "net/http" - "os" - "strings" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification" repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" pull_service "code.gitea.io/gitea/services/pull" + "fmt" + "io/ioutil" + "net/http" + "os" + "strings" ) const SHELL_FLAG_ON = 1 @@ -332,3 +331,19 @@ func IsUploadFileInvalidErr(err error) bool { _, ok := err.(UploadFileInvalidErr) return ok } + +func ResetRepoDatasetNumByDatasetId(datasetID int64) error { + dataset, err := models.GetDatasetByID(datasetID) + if err != nil { + return err + } + return models.ResetRepoDatasetNum(dataset.RepoID) +} + +func ResetRepoModelNum(repoId int64) error { + return models.ResetRepoModelNum(repoId) +} + +func ResetRepoAITaskNum(repoId int64) error { + return models.ResetRepoAITaskNum(repoId) +} From 56b65a412dd44fef927679b119cf7495ce3d5168 Mon Sep 17 00:00:00 2001 From: chenshihai Date: Fri, 2 Dec 2022 18:43:57 +0800 Subject: [PATCH 32/75] repos square pages --- .../pages/repos/components/RecommendRepos.vue | 2 +- .../pages/repos/components/ReposFilters.vue | 22 ++++-- .../vuepages/pages/repos/components/ReposList.vue | 23 ++---- .../vuepages/pages/repos/components/SearchBar.vue | 31 ++++++-- web_src/vuepages/pages/repos/search/index.vue | 88 +++++++++++++++------- web_src/vuepages/pages/repos/square/index.vue | 27 ++++--- 6 files changed, 122 insertions(+), 71 deletions(-) diff --git a/web_src/vuepages/pages/repos/components/RecommendRepos.vue b/web_src/vuepages/pages/repos/components/RecommendRepos.vue index e9cede635..fc5b4b51d 100644 --- a/web_src/vuepages/pages/repos/components/RecommendRepos.vue +++ b/web_src/vuepages/pages/repos/components/RecommendRepos.vue @@ -87,7 +87,7 @@ export default { this.swiperHandler.updateSlides(); this.swiperHandler.updateProgress(); this.$nextTick(() => { - if (typeof LetterAvatar != undefined) { + if (typeof LetterAvatar != 'undefined') { LetterAvatar && LetterAvatar.transform(); } }); diff --git a/web_src/vuepages/pages/repos/components/ReposFilters.vue b/web_src/vuepages/pages/repos/components/ReposFilters.vue index e2db9ddc5..6134913be 100644 --- a/web_src/vuepages/pages/repos/components/ReposFilters.vue +++ b/web_src/vuepages/pages/repos/components/ReposFilters.vue @@ -13,7 +13,7 @@ export default { name: "ReposFilters", props: { - // visible: { type: Boolean, default: false }, + defaultsort: { type: String, default: 'mostpopular' }, }, components: {}, data() { @@ -26,22 +26,25 @@ export default { key: 'mostactive', label: '近期活跃', }, { + key: 'newest', + label: '最近创建', + }, { key: 'recentupdate', label: '最近更新', }, { - key: 'newest', + key: 'moststars', label: '点赞最多', }, { - key: 'moststars', + key: 'mostforks', label: '派生最多', }, { - key: 'mostforks', + key: 'mostdatasets', label: '数据集最多', }, { - key: 'mostdatasets', + key: 'mostaitasks', label: 'AI任务最多', }, { - key: 'mostaitasks', + key: 'mostmodels', label: '模型最多', }] }; @@ -50,10 +53,13 @@ export default { changeFilters(item, index) { this.focusIndex = index; this.$emit('change', this.list[this.focusIndex]); + }, + setDefaultFilter(sort) { + const index = this.list.findIndex((item) => item.key == sort); + this.focusIndex = index >= 0 ? index : 0; } }, - mounted() { - + mounted() { }, }; diff --git a/web_src/vuepages/pages/repos/components/ReposList.vue b/web_src/vuepages/pages/repos/components/ReposList.vue index b4de806ed..f8d0eb63c 100644 --- a/web_src/vuepages/pages/repos/components/ReposList.vue +++ b/web_src/vuepages/pages/repos/components/ReposList.vue @@ -1,6 +1,6 @@ diff --git a/web_src/vuepages/pages/repos/components/ReposList.vue b/web_src/vuepages/pages/repos/components/ReposList.vue index af2f140fa..8862deea3 100644 --- a/web_src/vuepages/pages/repos/components/ReposList.vue +++ b/web_src/vuepages/pages/repos/components/ReposList.vue @@ -50,6 +50,14 @@ export default { if (res.Code == 0) { const list = res.Data.Repos || []; this.list = list.map((item) => { + item.Contributors = (item.Contributors || []).map((_item) => { + return { + ..._item, + bgColor: this.randomColor(_item.Email[0].toLocaleUpperCase()), + } + }); + const contributors = item.Contributors || []; + const contributorsCnt = item.TotalContributorCount <= 6 ? Math.min(contributors.length, item.TotalContributorCount) : item.TotalContributorCount; return { ...item, NameShow: this.handlerSearchStr(item.Name, this.q), @@ -60,6 +68,7 @@ export default { topicShow: this.handlerSearchStr(_item, this.q) } }), + TotalContributorCountShow: contributorsCnt <= 10 ? contributorsCnt.toString() : '10+', } }); this.total = res.Data.Total; @@ -89,6 +98,12 @@ export default { handlerSearchStr(oStr, searchKey) { if (!searchKey) return oStr; return oStr.replace(new RegExp(`(${searchKey})`, 'ig'), `$1`); + }, + randomColor(t) { + const tIndex = t.charCodeAt(0); + const colorList = ["#1abc9c", "#2ecc71", "#3498db", "#9b59b6", "#34495e", "#16a085", "#27ae60", "#2980b9", "#8e44ad", + "#2c3e50", "#f1c40f", "#e67e22", "#e74c3c", "#00bcd4", "#95a5a6", "#f39c12", "#d35400", "#c0392b", "#bdc3c7", "#7f8c8d"]; + return colorList[tIndex % colorList.length]; } }, watch: {}, From 1dee795c0ea674268e411dff07b9f43ec9080b92 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Tue, 6 Dec 2022 10:13:38 +0800 Subject: [PATCH 39/75] #3169 add contributors cache --- models/repo.go | 1 - modules/redis/redis_key/repo_redis_key.go | 9 +++++++ services/repository/contributor.go | 39 ++++++++++++++++++++++++++++--- 3 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 modules/redis/redis_key/repo_redis_key.go diff --git a/models/repo.go b/models/repo.go index 31d2f5f96..5b527e3cd 100755 --- a/models/repo.go +++ b/models/repo.go @@ -296,7 +296,6 @@ func (repo *Repository) ToCardFormat() *Repository4Card { } type ContributorInfo struct { - UserInfo *User // nil for contributor who is not a registered user RelAvatarLink string UserName string Email string diff --git a/modules/redis/redis_key/repo_redis_key.go b/modules/redis/redis_key/repo_redis_key.go new file mode 100644 index 000000000..b2b7ccd0a --- /dev/null +++ b/modules/redis/redis_key/repo_redis_key.go @@ -0,0 +1,9 @@ +package redis_key + +import "fmt" + +const REPO_PREFIX = "repo" + +func RepoTopNContributors(repoId int64, N int) string { + return KeyJoin(REPO_PREFIX, fmt.Sprint(repoId), fmt.Sprint(N), "top_n_contributor") +} diff --git a/services/repository/contributor.go b/services/repository/contributor.go index 896bc682d..817b4b086 100644 --- a/services/repository/contributor.go +++ b/services/repository/contributor.go @@ -3,14 +3,47 @@ package repository import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/redis/redis_client" + "code.gitea.io/gitea/modules/redis/redis_key" + "encoding/json" + "github.com/patrickmn/go-cache" + "time" ) +var repoContributorCache = cache.New(5*time.Minute, 1*time.Minute) + +type ContributorCacheVal struct { + Contributors []*models.ContributorInfo + Total int +} + func GetRepoTopNContributors(repo *models.Repository, N int) ([]*models.ContributorInfo, int) { - var contributorInfos []*models.ContributorInfo + val, _ := redis_client.Get(redis_key.RepoTopNContributors(repo.ID, N)) + if val != "" { + log.Debug("Get RepoTopNContributors from redis,repo.ID = %d value = %v", repo.ID, val) + temp := &ContributorCacheVal{} + json.Unmarshal([]byte(val), temp) + return temp.Contributors, temp.Total + } + + contributorInfos, total := getRepoTopNContributorsFromDisk(repo, N) + log.Debug("Get RepoTopNContributors from disk,repo.ID = %d ", repo.ID) + jsonVal, err := json.Marshal(&ContributorCacheVal{Contributors: contributorInfos, Total: total}) + if err == nil { + redis_client.Setex(redis_key.RepoTopNContributors(repo.ID, N), string(jsonVal), 5*time.Minute) + } + return contributorInfos, total +} + +func getRepoTopNContributorsFromDisk(repo *models.Repository, N int) ([]*models.ContributorInfo, int) { + contributorInfos := make([]*models.ContributorInfo, 0) + branchName := GetDefaultBranchName(repo) if branchName == "" { return contributorInfos, 0 } + contributors, err := git.GetContributors(repo.RepoPath(), branchName) if err == nil && contributors != nil { contributorInfoHash := make(map[string]*models.ContributorInfo) @@ -31,7 +64,7 @@ func GetRepoTopNContributors(repo *models.Repository, N int) ([]*models.Contribu } else { // new committer info var newContributor = &models.ContributorInfo{ - user, user.RelAvatarLink(), user.Name, user.Email, c.CommitCnt, + user.RelAvatarLink(), user.Name, user.Email, c.CommitCnt, } contributorInfos = append(contributorInfos, newContributor) contributorInfoHash[user.Email] = newContributor @@ -43,7 +76,7 @@ func GetRepoTopNContributors(repo *models.Repository, N int) ([]*models.Contribu existedContributorInfo.CommitCnt += c.CommitCnt } else { var newContributor = &models.ContributorInfo{ - user, "", "", c.Email, c.CommitCnt, + "", "", c.Email, c.CommitCnt, } contributorInfos = append(contributorInfos, newContributor) contributorInfoHash[c.Email] = newContributor From 7c8e7ce199dfcff50aeed4e0c847cea6b20dfce7 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Tue, 6 Dec 2022 10:48:52 +0800 Subject: [PATCH 40/75] #3169 update addTopic api --- models/topic.go | 14 ++++++++++++++ routers/api/v1/repo/topic.go | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/models/topic.go b/models/topic.go index 0b19bc1f0..ea5698f4c 100644 --- a/models/topic.go +++ b/models/topic.go @@ -9,6 +9,7 @@ import ( "regexp" "strings" "unicode/utf8" + "xorm.io/xorm" "code.gitea.io/gitea/modules/timeutil" @@ -337,3 +338,16 @@ func GetOrgTopics(orgId int64) ([]Topic, error) { return result, nil } + +func UpdateRepoTopics(repoID int64, topicNames []string, sess ...*xorm.Engine) error { + e := x + if len(sess) > 0 { + e = sess[0] + } + if _, err := e.ID(repoID).Cols("topics").Update(&Repository{ + Topics: topicNames, + }); err != nil { + return err + } + return nil +} diff --git a/routers/api/v1/repo/topic.go b/routers/api/v1/repo/topic.go index f4ff7a329..d2522c9ce 100644 --- a/routers/api/v1/repo/topic.go +++ b/routers/api/v1/repo/topic.go @@ -177,13 +177,25 @@ func AddTopic(ctx *context.APIContext) { return } - _, err = models.AddTopic(ctx.Repo.Repository.ID, topicName) + topic, err := models.AddTopic(ctx.Repo.Repository.ID, topicName) if err != nil { log.Error("AddTopic failed: %v", err) ctx.InternalServerError(err) return } - + found := false + topicNames := make([]string, len(topics)) + for i, t := range topics { + topicNames[i] = t.Name + if strings.EqualFold(topic.Name, t.Name) { + found = true + break + } + } + if !found && topic.Name != "" { + topicNames = append(topicNames, topic.Name) + } + models.UpdateRepoTopics(ctx.Repo.Repository.ID, topicNames) ctx.Status(http.StatusNoContent) } From 3dc5fee4b4fe8c3cd45ef1f184dd4187234a110e Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Tue, 6 Dec 2022 10:52:13 +0800 Subject: [PATCH 41/75] #3169 update --- services/repository/contributor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/repository/contributor.go b/services/repository/contributor.go index 817b4b086..9a86b91dc 100644 --- a/services/repository/contributor.go +++ b/services/repository/contributor.go @@ -31,7 +31,7 @@ func GetRepoTopNContributors(repo *models.Repository, N int) ([]*models.Contribu log.Debug("Get RepoTopNContributors from disk,repo.ID = %d ", repo.ID) jsonVal, err := json.Marshal(&ContributorCacheVal{Contributors: contributorInfos, Total: total}) if err == nil { - redis_client.Setex(redis_key.RepoTopNContributors(repo.ID, N), string(jsonVal), 5*time.Minute) + redis_client.Setex(redis_key.RepoTopNContributors(repo.ID, N), string(jsonVal), 2*time.Minute) } return contributorInfos, total } From 2219f5aab42e2b938b7fcfd499416f878173874a Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Tue, 6 Dec 2022 11:14:28 +0800 Subject: [PATCH 42/75] #3169 update --- models/repo.go | 9 +++++++++ routers/repo/repo_statistic.go | 11 ++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/models/repo.go b/models/repo.go index 5b527e3cd..625203c74 100755 --- a/models/repo.go +++ b/models/repo.go @@ -2972,3 +2972,12 @@ func OperateRepoModelNum(repoId int64, amount int64, engines ...*xorm.Engine) er func OperateRepoAITaskNum(repoId int64, amount int64, engines ...*xorm.Engine) error { return operateRepoCol(repoId, "ai_task_cnt", amount, engines...) } + +func UpdateRepositoryLastFourMonthCommits(repoID int64, amount int64) error { + _, err := x.Exec("update repository set last_four_month_commits = ? where id = ?", amount, repoID) + return err +} +func UpdateRepositoryLastMonthVisits(repoID int64, amount int64) error { + _, err := x.Exec("update repository set last_month_visits = ? where id = ?", amount, repoID) + return err +} diff --git a/routers/repo/repo_statistic.go b/routers/repo/repo_statistic.go index dd73a9f3f..26c3c156d 100755 --- a/routers/repo/repo_statistic.go +++ b/routers/repo/repo_statistic.go @@ -287,20 +287,13 @@ func RepoStatisticDaily(date string) { } func SyncStatDataToRepo(repo *models.Repository) { - changed := false //Save the visit number of repository in the last month if lv, err := models.SumLastMonthNumVisits(repo.ID); err == nil { - repo.LastMonthVisits = lv - changed = true + models.UpdateRepositoryLastMonthVisits(repo.ID, lv) } //Save the commits number of repository in the last four month if lc, err := models.SumLastFourMonthNumCommits(repo.ID); err == nil { - repo.LastFourMonthCommits = lc - changed = true - } - - if changed { - models.UpdateRepository(repo, false) + models.UpdateRepositoryLastFourMonthCommits(repo.ID, lc) } } From e8512f002f1e4e0c945ac16fa4d054a9533a0863 Mon Sep 17 00:00:00 2001 From: chenshihai Date: Tue, 6 Dec 2022 11:20:21 +0800 Subject: [PATCH 43/75] repos square --- web_src/vuepages/pages/repos/components/ReposFilters.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/vuepages/pages/repos/components/ReposFilters.vue b/web_src/vuepages/pages/repos/components/ReposFilters.vue index f40e88088..919fdf273 100644 --- a/web_src/vuepages/pages/repos/components/ReposFilters.vue +++ b/web_src/vuepages/pages/repos/components/ReposFilters.vue @@ -21,7 +21,7 @@ export default { label: this.$t('repos.mostPopular'), }, { key: 'mostactive', - label: this.$t('repos.newest'), + label: this.$t('repos.mostActive'), }, { key: 'newest', label: this.$t('repos.newest'), From fd188cc5d9110a1ab965d9741a6416be38bb902c Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Tue, 6 Dec 2022 11:52:14 +0800 Subject: [PATCH 44/75] #3169 add alias --- models/repo.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/models/repo.go b/models/repo.go index 625203c74..a0b828402 100755 --- a/models/repo.go +++ b/models/repo.go @@ -249,6 +249,7 @@ type Repository4Card struct { OwnerName string LowerName string Name string + Alias string NumWatches int NumStars int NumForks int @@ -291,6 +292,7 @@ func (repo *Repository) ToCardFormat() *Repository4Card { UpdatedUnix: repo.UpdatedUnix, PrimaryLanguage: repo.PrimaryLanguage, RelAvatarLink: r, + Alias: repo.Alias, } return result } From ff07b0c016b7a59802dca9835b1ba4f5d83810de Mon Sep 17 00:00:00 2001 From: chenshihai Date: Tue, 6 Dec 2022 14:05:57 +0800 Subject: [PATCH 45/75] repos square --- web_src/vuepages/pages/repos/components/ReposList.vue | 2 +- web_src/vuepages/pages/repos/components/SquareTop.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/vuepages/pages/repos/components/ReposList.vue b/web_src/vuepages/pages/repos/components/ReposList.vue index 8862deea3..92840d7bd 100644 --- a/web_src/vuepages/pages/repos/components/ReposList.vue +++ b/web_src/vuepages/pages/repos/components/ReposList.vue @@ -60,7 +60,7 @@ export default { const contributorsCnt = item.TotalContributorCount <= 6 ? Math.min(contributors.length, item.TotalContributorCount) : item.TotalContributorCount; return { ...item, - NameShow: this.handlerSearchStr(item.Name, this.q), + NameShow: this.handlerSearchStr(item.Alias, this.q), DescriptionShow: this.handlerSearchStr(item.Description, this.q), TopicsShow: (item.Topics || []).map((_item) => { return { diff --git a/web_src/vuepages/pages/repos/components/SquareTop.vue b/web_src/vuepages/pages/repos/components/SquareTop.vue index 93352ed7c..0a0c5e824 100644 --- a/web_src/vuepages/pages/repos/components/SquareTop.vue +++ b/web_src/vuepages/pages/repos/components/SquareTop.vue @@ -97,7 +97,7 @@ export default { let dataJ = data[j]; if (dataJ === undefined) break; html += `
-
${dataJ.Name}
+
${dataJ.Alias}
${dataJ.Description}
` const topics = dataJ.Topics || []; From 6c7aa78671c5ba0be492ed9be9d7aee3e65048b8 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Tue, 6 Dec 2022 17:48:59 +0800 Subject: [PATCH 46/75] #3169 update --- services/repository/square.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/services/repository/square.go b/services/repository/square.go index 626134fd7..b1a7401e5 100644 --- a/services/repository/square.go +++ b/services/repository/square.go @@ -135,9 +135,8 @@ func FindRepos(opts FindReposOptions) (*models.FindReposResponse, error) { result := make([]*models.Repository4Card, len(repos)) for i, r := range repos { t := r.ToCardFormat() - contributors, n := GetRepoTopNContributors(r, 6) + contributors, _ := GetRepoTopNContributors(r, 6) t.Contributors = contributors - t.TotalContributorCount = n result[i] = t } @@ -157,7 +156,7 @@ type ActiveUser struct { func GetActiveUser4Square(currentUserId int64) ([]*ActiveUser, error) { result := make([]*ActiveUser, 0) - userIds, err := models.QueryLast30DaysHighestIndexUsers(10) + userIds, err := models.QueryLast30DaysHighestIndexUsers(5) if err != nil { log.Error("ActiveUser err. %v", err) return result, err @@ -196,7 +195,7 @@ func GetActiveUser4Square(currentUserId int64) ([]*ActiveUser, error) { } func GetActiveOrgs() ([]*models.User4Front, error) { - orgScores, err := models.FindTopNOpenIOrgs(10) + orgScores, err := models.FindTopNOpenIOrgs(5) if err != nil { return nil, err } From c5f5c976e60cbf91816eea348259c30b5d1a2275 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Wed, 7 Dec 2022 09:30:40 +0800 Subject: [PATCH 47/75] #3169 repo search:add visibility info --- models/repo.go | 55 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/models/repo.go b/models/repo.go index a0b828402..4d6fcfd2f 100755 --- a/models/repo.go +++ b/models/repo.go @@ -244,26 +244,29 @@ type Repository struct { // Repository4Card format for front display type Repository4Card struct { - ID int64 - OwnerID int64 - OwnerName string - LowerName string - Name string - Alias string - NumWatches int - NumStars int - NumForks int - Description string - Topics []string - AiTaskCnt int64 - ModelCnt int64 - DatasetCnt int64 - CreatedUnix timeutil.TimeStamp - UpdatedUnix timeutil.TimeStamp - PrimaryLanguage *LanguageStat - RelAvatarLink string - Contributors []*ContributorInfo - TotalContributorCount int + ID int64 + OwnerID int64 + OwnerName string + LowerName string + Name string + Alias string + NumWatches int + NumStars int + NumForks int + Description string + Topics []string + AiTaskCnt int64 + ModelCnt int64 + DatasetCnt int64 + CreatedUnix timeutil.TimeStamp + UpdatedUnix timeutil.TimeStamp + PrimaryLanguage *LanguageStat + RelAvatarLink string + Contributors []*ContributorInfo + IsPrivate bool + IsFork bool + IsMirror bool + IsOwnerPrivate bool } type RepositoryShow struct { @@ -273,7 +276,11 @@ type RepositoryShow struct { } func (repo *Repository) ToCardFormat() *Repository4Card { - r := repo.RelAvatarLink() + link := repo.RelAvatarLink() + var isOwnerPrivate bool + if repo.Owner != nil && repo.Owner.Visibility.IsPrivate() { + isOwnerPrivate = true + } result := &Repository4Card{ ID: repo.ID, OwnerID: repo.OwnerID, @@ -291,8 +298,12 @@ func (repo *Repository) ToCardFormat() *Repository4Card { CreatedUnix: repo.CreatedUnix, UpdatedUnix: repo.UpdatedUnix, PrimaryLanguage: repo.PrimaryLanguage, - RelAvatarLink: r, + RelAvatarLink: link, Alias: repo.Alias, + IsPrivate: repo.IsPrivate, + IsFork: repo.IsFork, + IsMirror: repo.IsMirror, + IsOwnerPrivate: isOwnerPrivate, } return result } From eb90ad28347135ce9d01dcb44efc30015795ee83 Mon Sep 17 00:00:00 2001 From: chenshihai Date: Wed, 7 Dec 2022 10:11:29 +0800 Subject: [PATCH 48/75] repos square --- public/home/home.js | 14 ++------- web_src/vuepages/langs/config/zh-CN.js | 4 +-- .../pages/repos/components/RecommendRepos.vue | 13 ++++---- .../vuepages/pages/repos/components/ReposItem.vue | 35 +++++++++++++++------- .../vuepages/pages/repos/components/ReposList.vue | 2 -- .../vuepages/pages/repos/components/SearchBar.vue | 9 +++--- .../vuepages/pages/repos/components/SquareTop.vue | 6 ++-- 7 files changed, 46 insertions(+), 37 deletions(-) diff --git a/public/home/home.js b/public/home/home.js index aeb51b184..df18b7891 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -622,20 +622,12 @@ function displayRepo(json){ for (var i = 0, iLen = repos.length; i < iLen; i++) { if (i >= 4) break; var repo = repos[i]; - // ${repo["NumStars"]}${repo["NumForks"]}
html += `
-
- ${repo["Avatar"] ? `` : ``} +
+ ${repo["Avatar"] ? `` : ``} ${repo["Alias"]}
${repo["Description"]}
- `; - // if (repo["Topics"] != null) { - // for(var j = 0; j < repo["Topics"].length; j++){ - // var topic = repo["Topics"][j]; - // var url = "/explore/repos?q=" + (topic) + "&topic=" - // html += `${topic}`; - // } - // } + `; html += `
`; diff --git a/web_src/vuepages/langs/config/zh-CN.js b/web_src/vuepages/langs/config/zh-CN.js index 9072540d5..900391263 100644 --- a/web_src/vuepages/langs/config/zh-CN.js +++ b/web_src/vuepages/langs/config/zh-CN.js @@ -315,8 +315,8 @@ const zh = { mostAiTasks: 'AI任务最多', mostModels: '模型最多', dataset: '数据集', - model: '模型：', - aiTask: 'AI任务：', + model: '模型', + aiTask: 'AI任务', updated: '最后更新于', contributors: '贡献者', searchRepositories: '搜项目', diff --git a/web_src/vuepages/pages/repos/components/RecommendRepos.vue b/web_src/vuepages/pages/repos/components/RecommendRepos.vue index 2b960c79c..1f7b74ecd 100644 --- a/web_src/vuepages/pages/repos/components/RecommendRepos.vue +++ b/web_src/vuepages/pages/repos/components/RecommendRepos.vue @@ -44,12 +44,13 @@ export default { for (var i = 0, iLen = repos.length; i < iLen; i++) { if (i >= 4) break; var repo = repos[i]; - html += `
-
- ${repo["Avatar"] ? `` : ``} - ${repo["Alias"]} -
${repo["Description"]}
-
+ html += `
+
+ ${repo["Avatar"] ? `` : ``} + ${repo["Alias"]} +
${repo["Description"]}
+
+
`; } html += '
' diff --git a/web_src/vuepages/pages/repos/components/ReposItem.vue b/web_src/vuepages/pages/repos/components/ReposItem.vue index 50785f18d..c7214d6b3 100644 --- a/web_src/vuepages/pages/repos/components/ReposItem.vue +++ b/web_src/vuepages/pages/repos/components/ReposItem.vue @@ -12,6 +12,16 @@ / + + +
@@ -23,19 +33,19 @@ {{ data.NumStars }} - {{ data.NumForks }}
-
-
+
+
-
+
{{ $t('repos.dataset') }}： @@ -64,8 +74,9 @@ :style="{ backgroundColor: data.PrimaryLanguage.Color }">{{ data.PrimaryLanguage.Language }}
- {{ $t('repos.contributors') }}  - {{ data.TotalContributorCountShow }} + + {{ $t('repos.contributors') }}  + @@ -138,6 +149,7 @@ export default { width: 38px; height: 38px; margin-right: 10px; + border-radius: 100%; } .content { @@ -169,13 +181,13 @@ export default { font-size: 18px; color: rgba(16, 16, 16, 1); font-weight: bold; + margin-right: 3px; } .content .title-r { - width: 240px; display: flex; align-items: center; - font-size: 12px; + font-size: 13px; font-weight: bold; color: rgb(26, 40, 51, 0.9); justify-content: flex-end; @@ -192,9 +204,10 @@ export default { } .content .descr { + font-weight: 300; font-size: 14px; color: rgba(16, 16, 16, 0.8); - margin-bottom: 12px; + margin-bottom: 16px; overflow: hidden; text-overflow: ellipsis; word-break: break-all; @@ -228,7 +241,8 @@ export default { .content .repo-datas { display: flex; align-items: center; - margin: 24px 0; + margin-top: 20px; + margin-bottom: 10px; } .content .repo-datas-item { @@ -257,6 +271,7 @@ export default { align-items: center; justify-content: space-between; border-top: 1px solid rgba(157, 197, 226, 0.2); + margin-top: 10px; padding-top: 10px; font-size: 12px; color: rgba(16, 16, 16, 0.6); diff --git a/web_src/vuepages/pages/repos/components/ReposList.vue b/web_src/vuepages/pages/repos/components/ReposList.vue index 92840d7bd..abb40e295 100644 --- a/web_src/vuepages/pages/repos/components/ReposList.vue +++ b/web_src/vuepages/pages/repos/components/ReposList.vue @@ -57,7 +57,6 @@ export default { } }); const contributors = item.Contributors || []; - const contributorsCnt = item.TotalContributorCount <= 6 ? Math.min(contributors.length, item.TotalContributorCount) : item.TotalContributorCount; return { ...item, NameShow: this.handlerSearchStr(item.Alias, this.q), @@ -68,7 +67,6 @@ export default { topicShow: this.handlerSearchStr(_item, this.q) } }), - TotalContributorCountShow: contributorsCnt <= 10 ? contributorsCnt.toString() : '10+', } }); this.total = res.Data.Total; diff --git a/web_src/vuepages/pages/repos/components/SearchBar.vue b/web_src/vuepages/pages/repos/components/SearchBar.vue index 50013e867..12fcca398 100644 --- a/web_src/vuepages/pages/repos/components/SearchBar.vue +++ b/web_src/vuepages/pages/repos/components/SearchBar.vue @@ -34,11 +34,12 @@ :style="{ backgroundColor: topicColors[index % topicColors.length] }" v-for="(item, index) in topics" :key="index">{{ item.v }} {{ $t('repos.allFields') + style="font-weight:bold;" + :style="{ backgroundColor: selectTopic == '' ? selectedColor : defaultColor, color: selectTopic == '' ? 'white' : '#40485b' }">{{ + $t('repos.allFields') }} - {{ item.v }}
diff --git a/web_src/vuepages/pages/repos/components/SquareTop.vue b/web_src/vuepages/pages/repos/components/SquareTop.vue index 0a0c5e824..c40c0a1e3 100644 --- a/web_src/vuepages/pages/repos/components/SquareTop.vue +++ b/web_src/vuepages/pages/repos/components/SquareTop.vue @@ -105,6 +105,7 @@ export default { html += `${topics[k]}` } html += `
+
`; } html += `
`; @@ -276,6 +277,7 @@ img:not([src]) { background: rgba(255, 255, 255, 0.6); margin-bottom: 20px; box-sizing: border-box; + position: relative; } /deep/._repo_nowrap { @@ -303,13 +305,13 @@ img:not([src]) { /deep/._repo_sw_card_title { font-weight: 700; - font-size: 16px; + font-size: 14px; color: rgba(26, 40, 51, 1); margin-bottom: 10px; } /deep/._repo_sw_card_descr { - font-size: 14px; + font-size: 12px; color: rgba(80, 85, 89, 1); margin-bottom: 10px; min-height: 42px; From 205792c2a3c2b429445b53d2782cef4700781ce7 Mon Sep 17 00:00:00 2001 From: chenshihai Date: Wed, 7 Dec 2022 11:46:06 +0800 Subject: [PATCH 49/75] remove explore-users entry --- templates/base/head_navbar.tmpl | 4 ++-- templates/base/head_navbar_fluid.tmpl | 4 ++-- templates/base/head_navbar_home.tmpl | 4 ++-- templates/base/head_navbar_pro.tmpl | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index d83226d27..de55e6452 100755 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -48,7 +48,7 @@ {{.i18n.Tr "explore"}}
- {{.i18n.Tr "explore.users"}} + {{.i18n.Tr "explore.organizations"}} {{.i18n.Tr "explore.images"}} {{if .IsOperator}} @@ -89,7 +89,7 @@ {{.i18n.Tr "explore"}}
- {{.i18n.Tr "explore.users"}} + {{.i18n.Tr "explore.organizations"}} {{.i18n.Tr "explore.images"}} {{if .IsOperator}} diff --git a/templates/base/head_navbar_fluid.tmpl b/templates/base/head_navbar_fluid.tmpl index 06fe6ae56..8a4682e9d 100644 --- a/templates/base/head_navbar_fluid.tmpl +++ b/templates/base/head_navbar_fluid.tmpl @@ -45,7 +45,7 @@ {{.i18n.Tr "explore"}}
- {{.i18n.Tr "explore.users"}} + {{.i18n.Tr "explore.organizations"}} {{.i18n.Tr "explore.images"}} {{if .IsOperator}} @@ -84,7 +84,7 @@ {{.i18n.Tr "explore"}}
- {{.i18n.Tr "explore.users"}} + {{.i18n.Tr "explore.organizations"}} {{.i18n.Tr "explore.images"}} {{if .IsOperator}} diff --git a/templates/base/head_navbar_home.tmpl b/templates/base/head_navbar_home.tmpl index fb6a8d2f2..f6741b7c8 100644 --- a/templates/base/head_navbar_home.tmpl +++ b/templates/base/head_navbar_home.tmpl @@ -37,7 +37,7 @@ {{.i18n.Tr "explore"}}
- {{.i18n.Tr "explore.users"}} + {{.i18n.Tr "explore.organizations"}} {{.i18n.Tr "explore.images"}} {{if .IsOperator}} @@ -77,7 +77,7 @@ {{.i18n.Tr "explore"}}
- {{.i18n.Tr "explore.users"}} + {{.i18n.Tr "explore.organizations"}} {{.i18n.Tr "explore.images"}} {{if .IsOperator}} diff --git a/templates/base/head_navbar_pro.tmpl b/templates/base/head_navbar_pro.tmpl index 1af6f3599..9e1c1ebf7 100644 --- a/templates/base/head_navbar_pro.tmpl +++ b/templates/base/head_navbar_pro.tmpl @@ -47,7 +47,7 @@ {{.i18n.Tr "explore"}}
- {{.i18n.Tr "explore.users"}} + {{.i18n.Tr "explore.organizations"}} {{.i18n.Tr "explore.images"}} {{if .IsOperator}} @@ -87,7 +87,7 @@ {{.i18n.Tr "explore"}}
- {{.i18n.Tr "explore.users"}} + {{.i18n.Tr "explore.organizations"}} {{.i18n.Tr "explore.images"}} {{if .IsOperator}} From 0cfbbf06c5c4e51af162f519c60a4a3013482ba7 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Wed, 7 Dec 2022 15:36:33 +0800 Subject: [PATCH 50/75] #3169 repo square:improve loading speed --- modules/setting/setting.go | 2 ++ routers/home.go | 22 ++++++++---- services/repository/square.go | 82 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 99 insertions(+), 7 deletions(-) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 702ad9f6b..b6a4cb540 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -668,6 +668,7 @@ var ( //repo square config IncubationSourceOrgId int64 + PaperRepoTopicName string //nginx proxy PROXYURL string @@ -1579,6 +1580,7 @@ func NewContext() { sec = Cfg.Section("repo-square") IncubationSourceOrgId = sec.Key("INCUBATION_ORG_ID").MustInt64(9) + PaperRepoTopicName = sec.Key("PAPER_REPO_TOPIC_NAME").MustString("openi-paper") sec = Cfg.Section("point") CloudBrainPaySwitch = sec.Key("CLOUDBRAIN_PAY_SWITCH").MustBool(false) diff --git a/routers/home.go b/routers/home.go index 7378fbc4f..3d24fa179 100755 --- a/routers/home.go +++ b/routers/home.go @@ -7,8 +7,8 @@ package routers import ( "bytes" - "encoding/json" "code.gitea.io/gitea/routers/response" + "encoding/json" "net/http" "strconv" "strings" @@ -300,9 +300,19 @@ func ExploreRepos(ctx *context.Context) { } func GetRepoSquarePage(ctx *context.Context) { + //banner + ctx.Data["SquareBanners"] = repository.GetBanners() + //配置的标签 + ctx.Data["SquareTopics"] = repository.GetTopics() + ctx.Data["SquareRecommendRepos"] = repository.GetRecommendRepos() + + repos, _ := repository.GetPreferredRepos() + ctx.Data["SquarePreferredRepos"] = repos + //领域精选 ctx.HTML(200, tplRepoSquare) } func GetRepoSearchPage(ctx *context.Context) { + ctx.Data["Topics"] = repository.GetTopics() ctx.HTML(200, tplRepoSearch) } @@ -361,11 +371,11 @@ func RepoFind(ctx *context.Context) { topic := strings.Trim(ctx.Query("topic"), " ") sort := strings.Trim(ctx.Query("sort"), " ") page := ctx.QueryInt("page") - pageSize := models.AvailablePageSize(ctx.QueryInt("pageSize")) + pageSize := ctx.QueryInt("pageSize") if pageSize == 0 { - pageSize = models.PageSize15 + pageSize = 15 } - if !pageSize.IsLegal() { + if pageSize > 100 { ctx.JSON(http.StatusOK, response.ServerError("pageSize illegal")) return } @@ -379,7 +389,7 @@ func RepoFind(ctx *context.Context) { } result, err := repository.FindRepos(repository.FindReposOptions{ - ListOptions: models.ListOptions{Page: page, PageSize: pageSize.Int()}, + ListOptions: models.ListOptions{Page: page, PageSize: pageSize}, Actor: ctx.User, Sort: sort, Keyword: keyword, @@ -966,4 +976,4 @@ func HomePrivacy(ctx *context.Context) { func HomeResoruceDesc(ctx *context.Context) { ctx.HTML(200, tplResoruceDesc) -} \ No newline at end of file +} diff --git a/services/repository/square.go b/services/repository/square.go index b1a7401e5..0fd32e3e8 100644 --- a/services/repository/square.go +++ b/services/repository/square.go @@ -4,9 +4,87 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" + "encoding/json" + "github.com/patrickmn/go-cache" + "time" ) +var repoSquareCache = cache.New(2*time.Minute, 1*time.Minute) + +const ( + RREFERED_CACHE = "PreferredRepos" + REPO_BANNER_CACHE = "RepoBanner" + TOPICS_CACHE = "RepoTopics" + RECOMMEND_CACHE = "RecommendRepos" +) + +func GetBanners() []map[string]string { + v, success := repoSquareCache.Get(REPO_BANNER_CACHE) + if success { + log.Debug("GetBanners from cache,value = %v", v) + if v == nil { + return nil + } + r := v.([]map[string]string) + return r + } + repoMap := getMapContent("repos/square_banner") + repoSquareCache.Set(REPO_BANNER_CACHE, repoMap, 1*time.Minute) + return repoMap +} + +func GetTopics() []map[string]string { + v, success := repoSquareCache.Get(TOPICS_CACHE) + if success { + log.Debug("GetTopics from cache,value = %v", v) + if v == nil { + return nil + } + r := v.([]map[string]string) + return r + } + repoMap := getMapContent("repos/recommend_topics") + repoSquareCache.Set(TOPICS_CACHE, repoMap, 1*time.Minute) + return repoMap +} + +func getMapContent(fileName string) []map[string]string { + url := setting.RecommentRepoAddr + fileName + result, err := RecommendContentFromPromote(url) + remap := make([]map[string]string, 0) + if err == nil { + json.Unmarshal([]byte(result), &remap) + } + return remap +} + +func GetRecommendRepos() []map[string]interface{} { + v, success := repoSquareCache.Get(RECOMMEND_CACHE) + if success { + log.Debug("GetRecommendRepos from cache,value = %v", v) + if v == nil { + return nil + } + r := v.([]map[string]interface{}) + return r + } + repoMap := getMapContent("home/projects") + r, _ := GetRecommendRepoFromPromote(repoMap) + repoSquareCache.Set(RECOMMEND_CACHE, r, 1*time.Minute) + return r +} + func GetPreferredRepos() ([]*models.Repository4Card, error) { + v, success := repoSquareCache.Get(RREFERED_CACHE) + if success { + log.Debug("GetPreferredRepos from cache,value = %v", v) + if v == nil { + return nil, nil + } + r := v.([]*models.Repository4Card) + return r, nil + } + repos, err := models.GetSelectedRepos(models.FindSelectedReposOpts{ ListOptions: models.ListOptions{ PageSize: 10, @@ -21,6 +99,8 @@ func GetPreferredRepos() ([]*models.Repository4Card, error) { for i, r := range repos { result[i] = r.ToCardFormat() } + + repoSquareCache.Set(RREFERED_CACHE, result, 1*time.Minute) return result, nil } @@ -51,7 +131,7 @@ func GetHotPaperRepos() ([]*models.Repository4Card, error) { }, OrderBy: models.SearchOrderByLastMonthVisitsReverse + "," + models.SearchOrderByRecentUpdated, TopicOnly: true, - TopicName: "openi-paper", + TopicName: setting.PaperRepoTopicName, AllPublic: true, }) if err != nil { From 033802703da0d4783fc030c28600616e3a032418 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Wed, 7 Dec 2022 15:37:08 +0800 Subject: [PATCH 51/75] #3169 update --- routers/home.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/home.go b/routers/home.go index 3d24fa179..4ab8e20ec 100755 --- a/routers/home.go +++ b/routers/home.go @@ -312,7 +312,7 @@ func GetRepoSquarePage(ctx *context.Context) { ctx.HTML(200, tplRepoSquare) } func GetRepoSearchPage(ctx *context.Context) { - ctx.Data["Topics"] = repository.GetTopics() + ctx.Data["SquareTopics"] = repository.GetTopics() ctx.HTML(200, tplRepoSearch) } From 2d5589d196146703f1e7d75f3905b4ffec096bc4 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Wed, 7 Dec 2022 15:38:38 +0800 Subject: [PATCH 52/75] #3169 repo-square:remove useless code --- routers/home.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/routers/home.go b/routers/home.go index 4ab8e20ec..40a41bd68 100755 --- a/routers/home.go +++ b/routers/home.go @@ -300,15 +300,12 @@ func ExploreRepos(ctx *context.Context) { } func GetRepoSquarePage(ctx *context.Context) { - //banner ctx.Data["SquareBanners"] = repository.GetBanners() - //配置的标签 ctx.Data["SquareTopics"] = repository.GetTopics() ctx.Data["SquareRecommendRepos"] = repository.GetRecommendRepos() repos, _ := repository.GetPreferredRepos() ctx.Data["SquarePreferredRepos"] = repos - //领域精选 ctx.HTML(200, tplRepoSquare) } func GetRepoSearchPage(ctx *context.Context) { From 0c3dd7e9681bae11c80c8863ded9eb56132e24eb Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Wed, 7 Dec 2022 15:54:56 +0800 Subject: [PATCH 53/75] #3169 bug fix --- services/repository/square.go | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/services/repository/square.go b/services/repository/square.go index 0fd32e3e8..e07b4fbed 100644 --- a/services/repository/square.go +++ b/services/repository/square.go @@ -33,19 +33,19 @@ func GetBanners() []map[string]string { return repoMap } -func GetTopics() []map[string]string { +func GetTopics() []string { v, success := repoSquareCache.Get(TOPICS_CACHE) if success { log.Debug("GetTopics from cache,value = %v", v) if v == nil { return nil } - r := v.([]map[string]string) + r := v.([]string) return r } - repoMap := getMapContent("repos/recommend_topics") - repoSquareCache.Set(TOPICS_CACHE, repoMap, 1*time.Minute) - return repoMap + topics := getArrayContent("repos/recommend_topics") + repoSquareCache.Set(TOPICS_CACHE, topics, 1*time.Minute) + return topics } func getMapContent(fileName string) []map[string]string { @@ -58,6 +58,16 @@ func getMapContent(fileName string) []map[string]string { return remap } +func getArrayContent(fileName string) []string { + url := setting.RecommentRepoAddr + fileName + result, err := RecommendContentFromPromote(url) + r := make([]string, 0) + if err == nil { + json.Unmarshal([]byte(result), &r) + } + return r +} + func GetRecommendRepos() []map[string]interface{} { v, success := repoSquareCache.Get(RECOMMEND_CACHE) if success { From 0f1baf6e5e8ecaec574fbe24573f8a3981cf0ccc Mon Sep 17 00:00:00 2001 From: chenshihai Date: Wed, 7 Dec 2022 16:15:39 +0800 Subject: [PATCH 54/75] repos square --- templates/explore/repos/search.tmpl | 6 ++- templates/explore/repos/square.tmpl | 14 +++++- .../pages/repos/components/RecommendRepos.vue | 19 +++++--- .../vuepages/pages/repos/components/SearchBar.vue | 52 ++++++++++++++-------- .../vuepages/pages/repos/components/SquareTop.vue | 19 ++++++-- web_src/vuepages/pages/repos/search/index.vue | 19 +++++--- web_src/vuepages/pages/repos/square/index.vue | 19 ++++++-- 7 files changed, 107 insertions(+), 41 deletions(-) diff --git a/templates/explore/repos/search.tmpl b/templates/explore/repos/search.tmpl index 6f4725394..e5227cf74 100644 --- a/templates/explore/repos/search.tmpl +++ b/templates/explore/repos/search.tmpl @@ -1,6 +1,8 @@ {{template "base/head_home" .}} -
-
+ +
{{template "base/footer" .}} diff --git a/templates/explore/repos/square.tmpl b/templates/explore/repos/square.tmpl index baa5d5ad9..da3698f9f 100644 --- a/templates/explore/repos/square.tmpl +++ b/templates/explore/repos/square.tmpl @@ -1,6 +1,16 @@ {{template "base/head_home" .}} +{{ if .SquareBanners }} + {{ range .SquareBanners }} + + {{ end }} +{{ end }} -
-
+ +
{{template "base/footer" .}} diff --git a/web_src/vuepages/pages/repos/components/RecommendRepos.vue b/web_src/vuepages/pages/repos/components/RecommendRepos.vue index 1f7b74ecd..2cc07ced3 100644 --- a/web_src/vuepages/pages/repos/components/RecommendRepos.vue +++ b/web_src/vuepages/pages/repos/components/RecommendRepos.vue @@ -15,7 +15,10 @@ import { getHomePageData } from '~/apis/modules/repos'; export default { name: "RecommendRepos", - props: {}, + props: { + static: { type: Boolean, default: false }, + staticSwiperData: { type: Array, default: () => [] }, + }, components: {}, data() { return { @@ -93,11 +96,15 @@ export default { } }, mounted() { - getHomePageData().then(res => { - this.renderRepos(res.data.repo); - }).catch(err => { - console.log(err); - }); + if (this.static) { + this.renderRepos(this.staticSwiperData); + } else { + getHomePageData().then(res => { + this.renderRepos(res.data.repo); + }).catch(err => { + console.log(err); + }); + } }, }; diff --git a/web_src/vuepages/pages/repos/components/SearchBar.vue b/web_src/vuepages/pages/repos/components/SearchBar.vue index 12fcca398..305619e96 100644 --- a/web_src/vuepages/pages/repos/components/SearchBar.vue +++ b/web_src/vuepages/pages/repos/components/SearchBar.vue @@ -66,6 +66,8 @@ export default { searchValue: { type: String, default: '' }, topic: { type: String, default: '' }, sort: { type: String, default: '' }, + static: { type: Boolean, default: false }, + staticTopicsData: { type: String, default: '[]' }, }, components: {}, data() { @@ -83,6 +85,10 @@ export default { setDefaultSearch(params) { this.searchInputValue = params.q || ''; this.selectTopic = params.topic || ''; + this.selectTopic && this.changeTopic({ + k: this.selectTopic.toLocaleLowerCase(), + v: this.selectTopic, + }) }, changeTopic(topicItem) { const index_ori = this.topicOri.findIndex((item) => { @@ -108,21 +114,7 @@ export default { } this.search(); }, - search() { - if (this.type == 'square') { - window.location.href = `/explore/repos?q=${this.searchInputValue}&sort=${this.sort}&topic=${this.selectTopic}`; - } else { - this.$emit('change', { - q: this.searchInputValue, - topic: this.selectTopic, - }); - } - } - }, - watch: {}, - mounted() { - getPromoteData('/repos/recommend_topics').then(res => { - const data = res.data; + handlerTopicsData(data) { try { const topicsData = JSON.parse(data); const topics = topicsData.map((item) => { @@ -148,9 +140,33 @@ export default { } catch (err) { console.log(err); } - }).catch(err => { - console.log(err); - }); + }, + search() { + if (this.type == 'square') { + window.location.href = `/explore/repos?q=${this.searchInputValue}&sort=${this.sort}&topic=${this.selectTopic}`; + } else { + this.$emit('change', { + q: this.searchInputValue, + topic: this.selectTopic, + }); + } + } + }, + mounted() { + if (this.static) { + try { + this.handlerTopicsData(this.staticTopicsData); + } catch (err) { + console.log(err); + } + } else { + getPromoteData('/repos/recommend_topics').then(res => { + const data = res.data; + this.handlerTopicsData(data); + }).catch(err => { + console.log(err); + }); + } }, }; diff --git a/web_src/vuepages/pages/repos/components/SquareTop.vue b/web_src/vuepages/pages/repos/components/SquareTop.vue index c40c0a1e3..eef55d7a9 100644 --- a/web_src/vuepages/pages/repos/components/SquareTop.vue +++ b/web_src/vuepages/pages/repos/components/SquareTop.vue @@ -40,7 +40,11 @@ import { getReposSquareTabData } from '~/apis/modules/repos'; export default { name: "SquareTop", - props: {}, + props: { + static: { type: Boolean, default: false }, + staticSwiperData: { type: Array, default: () => [] }, + staticBannerData: { type: String, default: '[]' }, + }, components: {}, data() { return { @@ -147,8 +151,17 @@ export default { }, mounted() { this.initSwiper(); - this.getBannerData(); - this.getTabData(); + if (this.static) { + try { + this.bannerData = JSON.parse(this.staticBannerData); + } catch (err) { + console.log(err); + } + this.renderSwiper(this.staticSwiperData); + } else { + this.getBannerData(); + this.getTabData(); + } }, }; diff --git a/web_src/vuepages/pages/repos/search/index.vue b/web_src/vuepages/pages/repos/search/index.vue index 61d18905c..d5a520011 100644 --- a/web_src/vuepages/pages/repos/search/index.vue +++ b/web_src/vuepages/pages/repos/search/index.vue @@ -1,8 +1,9 @@