From 70a8f4805872b5c5d3ea5d3f7dd52a8335da6033 Mon Sep 17 00:00:00 2001 From: jagger Date: Thu, 16 May 2024 17:50:51 +0800 Subject: [PATCH] fix Signed-off-by: jagger Former-commit-id: 7898052cec2ba197689bca016811a5f98220f3c4 --- api/Dockerfile | 3 +- api/internal/logic/ai/createalgorithmlogic.go | 2 +- api/internal/logic/ai/createdatasetlogic.go | 2 +- .../logic/ai/createexporttasklogic.go | 2 +- api/internal/logic/ai/createnotebooklogic.go | 2 +- .../logic/ai/createprocessortasklogic.go | 2 +- api/internal/logic/ai/createservicelogic.go | 2 +- api/internal/logic/ai/createtasklogic.go | 2 +- .../logic/ai/createtrainingjoblogic.go | 2 +- api/internal/logic/ai/deletealgorithmlogic.go | 2 +- api/internal/logic/ai/deletedatasetlogic.go | 2 +- api/internal/logic/ai/deleteservicelogic.go | 2 +- .../logic/ai/deletetrainingjoblogic.go | 2 +- .../logic/ai/getexporttasksofdatasetlogic.go | 2 +- .../ai/getexporttaskstatusofdatasetlogic.go | 2 +- .../logic/ai/getlisttrainingjobslogic.go | 2 +- api/internal/logic/ai/listalgorithmslogic.go | 2 +- api/internal/logic/ai/listclusterslogic.go | 2 +- api/internal/logic/ai/listdatasetlogic.go | 2 +- api/internal/logic/ai/listimportlogic.go | 2 +- api/internal/logic/ai/listnotebooklogic.go | 2 +- api/internal/logic/ai/listserviceslogic.go | 2 +- .../logic/ai/showalgorithmbyuuidlogic.go | 2 +- api/internal/logic/ai/showservicelogic.go | 2 +- api/internal/scheduler/service/aiService.go | 4 +-- api/internal/storeLink/modelarts.go | 29 ++++++++++++++++--- api/internal/storeLink/storeLink.go | 6 ++-- api/internal/svc/servicecontext.go | 4 +-- go.mod | 2 +- go.sum | 4 +-- 30 files changed, 59 insertions(+), 39 deletions(-) diff --git a/api/Dockerfile b/api/Dockerfile index a4372ef0..97053deb 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -6,8 +6,7 @@ COPY . . RUN go env -w GO111MODULE=on \ && go env -w GOPROXY=https://goproxy.cn,direct \ -&& go env -w CGO_ENABLED=0 \ -&& go mod download +&& go env -w CGO_ENABLED=0 RUN go build -o pcm-coordinator-api /app/api/pcm.go FROM alpine:3.18 diff --git a/api/internal/logic/ai/createalgorithmlogic.go b/api/internal/logic/ai/createalgorithmlogic.go index f7efe89a..bd46ddb7 100644 --- a/api/internal/logic/ai/createalgorithmlogic.go +++ b/api/internal/logic/ai/createalgorithmlogic.go @@ -22,7 +22,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" ) diff --git a/api/internal/logic/ai/createdatasetlogic.go b/api/internal/logic/ai/createdatasetlogic.go index 9d5741eb..bff8de2f 100644 --- a/api/internal/logic/ai/createdatasetlogic.go +++ b/api/internal/logic/ai/createdatasetlogic.go @@ -22,7 +22,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/api/internal/logic/ai/createexporttasklogic.go b/api/internal/logic/ai/createexporttasklogic.go index 47390243..f2e7e67b 100644 --- a/api/internal/logic/ai/createexporttasklogic.go +++ b/api/internal/logic/ai/createexporttasklogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/createnotebooklogic.go b/api/internal/logic/ai/createnotebooklogic.go index 3859e58f..9d7384b1 100644 --- a/api/internal/logic/ai/createnotebooklogic.go +++ b/api/internal/logic/ai/createnotebooklogic.go @@ -22,7 +22,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/api/internal/logic/ai/createprocessortasklogic.go b/api/internal/logic/ai/createprocessortasklogic.go index b79b4f82..e071fe54 100644 --- a/api/internal/logic/ai/createprocessortasklogic.go +++ b/api/internal/logic/ai/createprocessortasklogic.go @@ -22,7 +22,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/api/internal/logic/ai/createservicelogic.go b/api/internal/logic/ai/createservicelogic.go index e99acb27..ed02a7b5 100644 --- a/api/internal/logic/ai/createservicelogic.go +++ b/api/internal/logic/ai/createservicelogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/createtasklogic.go b/api/internal/logic/ai/createtasklogic.go index 1e94d4c4..25bacfcf 100644 --- a/api/internal/logic/ai/createtasklogic.go +++ b/api/internal/logic/ai/createtasklogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/createtrainingjoblogic.go b/api/internal/logic/ai/createtrainingjoblogic.go index e4565187..983e71f4 100644 --- a/api/internal/logic/ai/createtrainingjoblogic.go +++ b/api/internal/logic/ai/createtrainingjoblogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/deletealgorithmlogic.go b/api/internal/logic/ai/deletealgorithmlogic.go index 1093def0..3297ee84 100644 --- a/api/internal/logic/ai/deletealgorithmlogic.go +++ b/api/internal/logic/ai/deletealgorithmlogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "strings" diff --git a/api/internal/logic/ai/deletedatasetlogic.go b/api/internal/logic/ai/deletedatasetlogic.go index 6c9fe0b9..853b8d86 100644 --- a/api/internal/logic/ai/deletedatasetlogic.go +++ b/api/internal/logic/ai/deletedatasetlogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/deleteservicelogic.go b/api/internal/logic/ai/deleteservicelogic.go index 337d1aeb..c6c6b51b 100644 --- a/api/internal/logic/ai/deleteservicelogic.go +++ b/api/internal/logic/ai/deleteservicelogic.go @@ -19,7 +19,7 @@ import ( "github.com/jinzhu/copier" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/ai/deletetrainingjoblogic.go b/api/internal/logic/ai/deletetrainingjoblogic.go index bf9b62b9..37792f27 100644 --- a/api/internal/logic/ai/deletetrainingjoblogic.go +++ b/api/internal/logic/ai/deletetrainingjoblogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/getexporttasksofdatasetlogic.go b/api/internal/logic/ai/getexporttasksofdatasetlogic.go index baacd49f..3d053fa2 100644 --- a/api/internal/logic/ai/getexporttasksofdatasetlogic.go +++ b/api/internal/logic/ai/getexporttasksofdatasetlogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/getexporttaskstatusofdatasetlogic.go b/api/internal/logic/ai/getexporttaskstatusofdatasetlogic.go index a6e74d70..2caae709 100644 --- a/api/internal/logic/ai/getexporttaskstatusofdatasetlogic.go +++ b/api/internal/logic/ai/getexporttaskstatusofdatasetlogic.go @@ -19,7 +19,7 @@ import ( "github.com/jinzhu/copier" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/ai/getlisttrainingjobslogic.go b/api/internal/logic/ai/getlisttrainingjobslogic.go index dbe104c8..12316436 100644 --- a/api/internal/logic/ai/getlisttrainingjobslogic.go +++ b/api/internal/logic/ai/getlisttrainingjobslogic.go @@ -23,7 +23,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/listalgorithmslogic.go b/api/internal/logic/ai/listalgorithmslogic.go index 1807ac06..3e4eaa26 100644 --- a/api/internal/logic/ai/listalgorithmslogic.go +++ b/api/internal/logic/ai/listalgorithmslogic.go @@ -19,7 +19,7 @@ import ( "github.com/jinzhu/copier" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/ai/listclusterslogic.go b/api/internal/logic/ai/listclusterslogic.go index 47352fa8..2ee7057c 100644 --- a/api/internal/logic/ai/listclusterslogic.go +++ b/api/internal/logic/ai/listclusterslogic.go @@ -20,7 +20,7 @@ import ( "github.com/pkg/errors" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" diff --git a/api/internal/logic/ai/listdatasetlogic.go b/api/internal/logic/ai/listdatasetlogic.go index 395dfa7f..6089719a 100644 --- a/api/internal/logic/ai/listdatasetlogic.go +++ b/api/internal/logic/ai/listdatasetlogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" error2 "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/error" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/ai/listimportlogic.go b/api/internal/logic/ai/listimportlogic.go index 5b7ecc0b..e03fabe7 100644 --- a/api/internal/logic/ai/listimportlogic.go +++ b/api/internal/logic/ai/listimportlogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/listnotebooklogic.go b/api/internal/logic/ai/listnotebooklogic.go index 76aeaa23..24808982 100644 --- a/api/internal/logic/ai/listnotebooklogic.go +++ b/api/internal/logic/ai/listnotebooklogic.go @@ -22,7 +22,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/api/internal/logic/ai/listserviceslogic.go b/api/internal/logic/ai/listserviceslogic.go index 305cc52f..ad3cc184 100644 --- a/api/internal/logic/ai/listserviceslogic.go +++ b/api/internal/logic/ai/listserviceslogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" diff --git a/api/internal/logic/ai/showalgorithmbyuuidlogic.go b/api/internal/logic/ai/showalgorithmbyuuidlogic.go index 9e915026..6cf7c127 100644 --- a/api/internal/logic/ai/showalgorithmbyuuidlogic.go +++ b/api/internal/logic/ai/showalgorithmbyuuidlogic.go @@ -21,7 +21,7 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/logic/ai/showservicelogic.go b/api/internal/logic/ai/showservicelogic.go index cc428154..19136a4c 100644 --- a/api/internal/logic/ai/showservicelogic.go +++ b/api/internal/logic/ai/showservicelogic.go @@ -19,7 +19,7 @@ import ( "github.com/jinzhu/copier" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" diff --git a/api/internal/scheduler/service/aiService.go b/api/internal/scheduler/service/aiService.go index 93188f9d..45b6da6d 100644 --- a/api/internal/scheduler/service/aiService.go +++ b/api/internal/scheduler/service/aiService.go @@ -9,9 +9,9 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/scheduler/service/executor" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/storeLink" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" + "gitlink.org.cn/JointCloud/pcm-modelarts/client/imagesservice" + "gitlink.org.cn/JointCloud/pcm-modelarts/client/modelartsservice" "gitlink.org.cn/JointCloud/pcm-octopus/octopusclient" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/client/imagesservice" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/client/modelartsservice" "strconv" ) diff --git a/api/internal/storeLink/modelarts.go b/api/internal/storeLink/modelarts.go index 5843eeff..2186addb 100644 --- a/api/internal/storeLink/modelarts.go +++ b/api/internal/storeLink/modelarts.go @@ -16,12 +16,13 @@ package storeLink import ( "context" + "github.com/pkg/errors" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/scheduler/schedulers/option" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/scheduler/service/collector" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/client/imagesservice" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/client/modelartsservice" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" + "gitlink.org.cn/JointCloud/pcm-modelarts/client/imagesservice" + "gitlink.org.cn/JointCloud/pcm-modelarts/client/modelartsservice" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "strconv" "strings" ) @@ -159,7 +160,27 @@ func (m *ModelArtsLink) GetDatasetsSpecs(ctx context.Context) ([]*collector.Data } func (m *ModelArtsLink) GetAlgorithms(ctx context.Context) ([]*collector.Algorithm, error) { - return nil, nil + var algorithms []*collector.Algorithm + + req := &modelarts.ListAlgorithmsReq{ + Platform: m.platform, + Offset: m.pageIndex, + Limit: m.pageSize, + } + resp, err := m.modelArtsRpc.ListAlgorithms(ctx, req) + if err != nil { + return nil, err + } + if resp.ErrorMsg != "" { + return nil, errors.New("failed to get algorithms") + } + + for _, a := range resp.Items { + //TODO The value of taskType is temporarily fixed to "pytorch" + algorithm := &collector.Algorithm{Name: a.Metadata.Name, Platform: MODELARTS, TaskType: "pytorch"} + algorithms = append(algorithms, algorithm) + } + return algorithms, nil } func (m *ModelArtsLink) GetComputeCards(ctx context.Context) ([]string, error) { diff --git a/api/internal/storeLink/storeLink.go b/api/internal/storeLink/storeLink.go index 2fbf2c12..e3e86a46 100644 --- a/api/internal/storeLink/storeLink.go +++ b/api/internal/storeLink/storeLink.go @@ -25,11 +25,11 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/models" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils/timeutils" + "gitlink.org.cn/JointCloud/pcm-modelarts/client/imagesservice" + "gitlink.org.cn/JointCloud/pcm-modelarts/client/modelartsservice" + "gitlink.org.cn/JointCloud/pcm-modelarts/modelarts" "gitlink.org.cn/JointCloud/pcm-octopus/octopus" "gitlink.org.cn/JointCloud/pcm-octopus/octopusclient" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/client/imagesservice" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/client/modelartsservice" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "gorm.io/gorm" "strings" "sync" diff --git a/api/internal/svc/servicecontext.go b/api/internal/svc/servicecontext.go index 4bbc6a27..5460862d 100644 --- a/api/internal/svc/servicecontext.go +++ b/api/internal/svc/servicecontext.go @@ -30,12 +30,12 @@ import ( "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils" "gitlink.org.cn/JointCloud/pcm-coordinator/rpc/client/participantservice" "gitlink.org.cn/JointCloud/pcm-kubernetes/kubernetesclient" + "gitlink.org.cn/JointCloud/pcm-modelarts/client/imagesservice" + "gitlink.org.cn/JointCloud/pcm-modelarts/client/modelartsservice" "gitlink.org.cn/JointCloud/pcm-octopus/octopusclient" "gitlink.org.cn/JointCloud/pcm-openstack/openstackclient" slurmClient "gitlink.org.cn/JointCloud/pcm-slurm/slurmclient" "gitlink.org.cn/jcce-pcm/pcm-participant-ceph/cephclient" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/client/imagesservice" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/client/modelartsservice" "gorm.io/driver/mysql" "gorm.io/gorm" "gorm.io/gorm/logger" diff --git a/go.mod b/go.mod index bf50e2ee..1030a0fb 100644 --- a/go.mod +++ b/go.mod @@ -26,11 +26,11 @@ require ( github.com/zeromicro/go-zero v1.6.3 gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240426095603-549fefd8bece gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20240301071143-347480abff2c + gitlink.org.cn/JointCloud/pcm-modelarts v0.0.0-20240515005224-689bb339a9c9 gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240510133934-6a5526289b35 gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240403033338-e7edabad4203 gitlink.org.cn/JointCloud/pcm-slurm v0.0.0-20240301080743-8b94bbaf57f5 gitlink.org.cn/jcce-pcm/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d - gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20231101085149-724c7c4cc090 go.opentelemetry.io/otel/trace v1.25.0 gonum.org/v1/gonum v0.11.0 google.golang.org/grpc v1.63.0 diff --git a/go.sum b/go.sum index e1d1ec5b..e05295cb 100644 --- a/go.sum +++ b/go.sum @@ -1082,6 +1082,8 @@ gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240426095603-549fefd8bece h1:W3yBnvAVV gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240426095603-549fefd8bece/go.mod h1:w3Nb5TNymCItQ7K3x4Q0JLuoq9OerwAzAWT2zsPE9Xo= gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20240301071143-347480abff2c h1:2Wl/hvaSFjh6fmCSIQhjkr9llMRREQeqcXNLZ/HPY18= gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20240301071143-347480abff2c/go.mod h1:lSRfGs+PxFvw7CcndHWRd6UlLlGrZn0b0hp5cfaMNGw= +gitlink.org.cn/JointCloud/pcm-modelarts v0.0.0-20240515005224-689bb339a9c9 h1:FRtOtI9vDFHcyPUdc4PL95CFi/DFk+HXT6JNTf/91d8= +gitlink.org.cn/JointCloud/pcm-modelarts v0.0.0-20240515005224-689bb339a9c9/go.mod h1:2WC5tDApfQNNIBfDNYwdaQiXhfCsG2n03P3ZxX9p9O4= gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240510133934-6a5526289b35 h1:E2QfpS3Y0FjR8Zyv5l2Ti/2NetQFqHG66c8+T/+J1u0= gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240510133934-6a5526289b35/go.mod h1:QOD5+/l2D+AYBjF2h5T0mdJyfGAmF78QmeKdbBXbjLQ= gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240403033338-e7edabad4203 h1:s6PsZ1+bev294IWdZRlV7mnOwI1+UzFcldVW/BqhQzI= @@ -1090,8 +1092,6 @@ gitlink.org.cn/JointCloud/pcm-slurm v0.0.0-20240301080743-8b94bbaf57f5 h1:+/5vnz gitlink.org.cn/JointCloud/pcm-slurm v0.0.0-20240301080743-8b94bbaf57f5/go.mod h1:97AlUXN13g9UN3+9/DzCHpeoU5sbdyv0IQuTEHNexzQ= gitlink.org.cn/jcce-pcm/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d h1:DHjl/rLuH2gKYtY0MKMGNQDHFT12APg25RlMUQo+tHk= gitlink.org.cn/jcce-pcm/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d/go.mod h1:r/KLzUpupCV5jdxSfgDhc2pVjP0fBi3VhAWRttsBn30= -gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20231101085149-724c7c4cc090 h1:jztlHo72bcWM1jUwvG3Hfk2K+AJL0RvlsdIqlktH/MI= -gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20231101085149-724c7c4cc090/go.mod h1:pisJKAI8FRFFUcBaH3Gob+ENXWRM97rpuYmv9s1raag= go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA= go.etcd.io/etcd/api/v3 v3.5.13 h1:8WXU2/NBge6AUF1K1gOexB6e07NgsN1hXK0rSTtgSp4= go.etcd.io/etcd/api/v3 v3.5.13/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c=