-
算法类型
+
模型类别
diff --git a/admin-portal/src/views/devManager/components/algorithm/preAlgorithmCreation.vue b/admin-portal/src/views/devManager/components/algorithm/preAlgorithmCreation.vue
index 79e899ab..03dd6e6a 100644
--- a/admin-portal/src/views/devManager/components/algorithm/preAlgorithmCreation.vue
+++ b/admin-portal/src/views/devManager/components/algorithm/preAlgorithmCreation.vue
@@ -7,7 +7,7 @@
-
+
diff --git a/admin-portal/src/views/devManager/components/algorithm/templateList.vue b/admin-portal/src/views/devManager/components/algorithm/templateList.vue
index 962bd42a..ea32c7ca 100644
--- a/admin-portal/src/views/devManager/components/algorithm/templateList.vue
+++ b/admin-portal/src/views/devManager/components/algorithm/templateList.vue
@@ -31,7 +31,7 @@
{{ scope.row.algorithmVersion }}
-
+
{{ scope.row.applyName }}
diff --git a/admin-portal/src/views/devManager/components/algorithm/userList.vue b/admin-portal/src/views/devManager/components/algorithm/userList.vue
index 71b214bc..21dce2f0 100644
--- a/admin-portal/src/views/devManager/components/algorithm/userList.vue
+++ b/admin-portal/src/views/devManager/components/algorithm/userList.vue
@@ -23,7 +23,7 @@
{{ scope.row.algorithmVersion }}
-
+
{{ scope.row.applyName }}
diff --git a/openai-portal/src/views/modelDev/components/algorithm/myAlgorithmCreation.vue b/openai-portal/src/views/modelDev/components/algorithm/myAlgorithmCreation.vue
index 949d0159..d20af04d 100644
--- a/openai-portal/src/views/modelDev/components/algorithm/myAlgorithmCreation.vue
+++ b/openai-portal/src/views/modelDev/components/algorithm/myAlgorithmCreation.vue
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/openai-portal/src/views/modelDev/components/algorithm/myList.vue b/openai-portal/src/views/modelDev/components/algorithm/myList.vue
index 584ea3e4..c8901368 100644
--- a/openai-portal/src/views/modelDev/components/algorithm/myList.vue
+++ b/openai-portal/src/views/modelDev/components/algorithm/myList.vue
@@ -32,7 +32,7 @@
{{ scope.row.algorithmVersion }}
-
+
{{ scope.row.applyName }}
diff --git a/openai-portal/src/views/modelDev/components/algorithm/presetList.vue b/openai-portal/src/views/modelDev/components/algorithm/presetList.vue
index 33dde2d0..59054a74 100644
--- a/openai-portal/src/views/modelDev/components/algorithm/presetList.vue
+++ b/openai-portal/src/views/modelDev/components/algorithm/presetList.vue
@@ -23,7 +23,7 @@
{{ scope.row.algorithmVersion }}
-
+
{{ scope.row.applyName }}
diff --git a/openai-portal/src/views/modelDev/components/algorithm/publicList.vue b/openai-portal/src/views/modelDev/components/algorithm/publicList.vue
index 58f30792..d7d9e9f5 100644
--- a/openai-portal/src/views/modelDev/components/algorithm/publicList.vue
+++ b/openai-portal/src/views/modelDev/components/algorithm/publicList.vue
@@ -23,7 +23,7 @@
{{ scope.row.algorithmVersion }}
-
+
{{ scope.row.applyName }}
--
2.34.1
From aa4aac28b53ce264c57cc99800cf46a08008cce4 Mon Sep 17 00:00:00 2001
From: ethanzheng
Date: Wed, 24 Nov 2021 16:09:01 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=92=8C=E7=AE=97=E6=B3=95=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
server/admin-server/api/v1/algorithm.proto | 58 ++++++++++---
server/admin-server/api/v1/dataset.proto | 37 +++++++-
.../internal/service/algorithm.go | 39 +++++++++
.../admin-server/internal/service/dataset.go | 37 ++++++++
server/base-server/api/v1/algorithm.proto | 22 +++--
server/base-server/api/v1/dataset.proto | 20 +++--
.../internal/service/algorithm/handle.go | 85 +++++++++++--------
.../internal/service/dataset/dataset.go | 44 ++++++----
server/openai-server/api/v1/algorithm.proto | 37 +++++++-
server/openai-server/api/v1/dataset.proto | 37 +++++++-
.../internal/service/algorithm.go | 51 ++++++++++-
.../openai-server/internal/service/dataset.go | 67 +++++++++++++++
12 files changed, 448 insertions(+), 86 deletions(-)
diff --git a/server/admin-server/api/v1/algorithm.proto b/server/admin-server/api/v1/algorithm.proto
index 4a94ae1b..e2c91f2f 100644
--- a/server/admin-server/api/v1/algorithm.proto
+++ b/server/admin-server/api/v1/algorithm.proto
@@ -133,6 +133,22 @@ service Algorithm {
};
};
+ // 修改预置算法
+ rpc UpdatePreAlgorithm(UpdatePreAlgorithmRequest) returns (UpdatePreAlgorithmReply) {
+ option (google.api.http) = {
+ put: "/v1/algorithmmanage/prealgorithm/{algorithmId}"
+ body: "*"
+ };
+ };
+
+ // 修改预置算法版本
+ rpc UpdatePreAlgorithmVersion(UpdatePreAlgorithmVersionRequest) returns (UpdatePreAlgorithmVersionReply) {
+ option (google.api.http) = {
+ put: "/v1/algorithmmanage/prealgorithm/{algorithmId}/version/{version}"
+ body: "*"
+ };
+ };
+
// 上传预置算法
rpc UploadPreAlgorithm(UploadPreAlgorithmRequest) returns (UploadPreAlgorithmReply) {
option (google.api.http) = {
@@ -317,21 +333,38 @@ message DeletePreAlgorithmReply {
}
message AddAlgorithmRequest {
- string spaceId = 1;
- string userId = 2;
- bool isPrefab = 3;
- bool isEmpty = 4;
- string algorithmName = 5[(validate.rules).string = {min_len:1,max_len:128}];
- string modelName = 6[(validate.rules).string = {min_len:1,max_len:128}];
- string algorithmDescript = 7;
- string applyId = 8;
- string frameworkId = 9;
+ bool isEmpty = 1;
+ string algorithmName = 2[(validate.rules).string = {min_len:1,max_len:128}];
+ string modelName = 3[(validate.rules).string = {min_len:1,max_len:128}];
+ string algorithmDescript = 4;
+ string applyId = 5;
+ string frameworkId = 6;
}
message AddAlgorithmReply {
string algorithmId = 1;
string version = 2;
int64 createdAt = 3;
}
+
+message UpdatePreAlgorithmRequest {
+ string algorithmId = 1[(validate.rules).string = {len:32,pattern:"^[A-Za-z0-9]+$"}];
+ string algorithmDescript = 2;
+ string applyId = 3;
+ string frameworkId = 4;
+}
+message UpdatePreAlgorithmReply {
+ int64 updatedAt = 1;
+}
+
+message UpdatePreAlgorithmVersionRequest {
+ string algorithmId = 1[(validate.rules).string = {len:32,pattern:"^[A-Za-z0-9]+$"}];
+ string version = 2[(validate.rules).string = {min_len:2,pattern:"^V[0-9]+$"}];
+ string algorithmDescript = 3;
+}
+message UpdatePreAlgorithmVersionReply {
+ int64 updatedAt = 1;
+}
+
message UploadPreAlgorithmRequest {
string algorithmId = 1[(validate.rules).string = {len:32,pattern:"^[A-Za-z0-9]+$"}];
string version = 2[(validate.rules).string = {min_len:2,pattern:"^V[0-9]+$"}];
@@ -341,6 +374,7 @@ message UploadPreAlgorithmRequest {
message UploadPreAlgorithmReply {
string uploadUrl = 1;
}
+
message ConfirmUploadPreAlgorithmRequest {
string algorithmId = 1;
string version = 2[(validate.rules).string = {min_len:2,pattern:"^V[0-9]+$"}];
@@ -369,10 +403,8 @@ message DownloadAlgorithmVersionReply {
}
message AddPreAlgorithmVersionRequest {
- string spaceId = 1;
- string userId = 2;
- string algorithmId = 3;
- string algorithmDescript = 4;
+ string algorithmId = 1;
+ string algorithmDescript = 2;
}
message AddPreAlgorithmVersionReply {
string algorithmId = 1;
diff --git a/server/admin-server/api/v1/dataset.proto b/server/admin-server/api/v1/dataset.proto
index 933e208e..e33ddd59 100644
--- a/server/admin-server/api/v1/dataset.proto
+++ b/server/admin-server/api/v1/dataset.proto
@@ -128,6 +128,18 @@ service DatasetService {
get: "/v1/datasetmanage/dataset/{datasetId}/version/{version}/file"
};
}
+ // 修改预置数据集
+ rpc UpdatePreDataset (UpdatePreDatasetRequest) returns (UpdatePreDatasetReply) {
+ option (google.api.http) = {
+ put: "/v1/datasetmanage/predataset/{id}"
+ };
+ }
+ // 修改预置数据集版本
+ rpc UpdatePreDatasetVersion (UpdatePreDatasetVersionRequest) returns (UpdatePreDatasetVersionReply) {
+ option (google.api.http) = {
+ put: "/v1/datasetmanage/predataset/{id}/version/{version}"
+ };
+ }
}
message DatasetLable {
@@ -208,8 +220,8 @@ message UpdateDatasetApplyReply {
message CreateDatasetRequest {
string name = 1[(validate.rules).string = {min_len: 1, max_len: 30}];
- string typeId = 2[(validate.rules).string = {min_len: 1 max_len: 64}];
- string applyId = 3[(validate.rules).string = {min_len: 1 max_len: 64}];
+ string typeId = 2;
+ string applyId = 3;
string desc = 4[(validate.rules).string = {max_len: 300}];
}
@@ -352,3 +364,24 @@ message ListDatasetVersionFileReply {
}
repeated File files = 1;
}
+
+message UpdatePreDatasetRequest {
+ string datasetId = 1[(validate.rules).string = {min_len: 1}];
+ string typeId = 2;
+ string applyId = 3;
+ string desc = 4[(validate.rules).string = {max_len: 300}];
+}
+
+message UpdatePreDatasetReply {
+ int64 updatedAt = 1;
+}
+
+message UpdatePreDatasetVersionRequest {
+ string datasetId = 1[(validate.rules).string = {min_len: 1}];
+ string version = 2[(validate.rules).string = {min_len: 1}];
+ string desc = 5[(validate.rules).string = {max_len: 300}];
+}
+
+message UpdatePreDatasetVersionReply {
+ int64 updatedAt = 1;
+}
\ No newline at end of file
diff --git a/server/admin-server/internal/service/algorithm.go b/server/admin-server/internal/service/algorithm.go
index 1d10037b..f5554fd9 100644
--- a/server/admin-server/internal/service/algorithm.go
+++ b/server/admin-server/internal/service/algorithm.go
@@ -373,6 +373,45 @@ func (s *AlgorithmService) AddPreAlgorithm(ctx context.Context, req *api.AddAlgo
}, nil
}
+// 修改预置算法
+func (s *AlgorithmService) UpdatePreAlgorithm(ctx context.Context, req *api.UpdatePreAlgorithmRequest) (*api.UpdatePreAlgorithmReply, error) {
+ reply, err := s.data.AlgorithmClient.UpdateAlgorithm(ctx, &innterapi.UpdateAlgorithmRequest{
+ SpaceId: "",
+ UserId: "",
+ IsPrefab: true,
+ AlgorithmId: req.AlgorithmId,
+ AlgorithmDescript: req.AlgorithmDescript,
+ ApplyId: req.ApplyId,
+ FrameworkId: req.FrameworkId,
+ })
+ if err != nil {
+ return nil, err
+ }
+
+ return &api.UpdatePreAlgorithmReply{
+ UpdatedAt: reply.UpdatedAt,
+ }, nil
+}
+
+// 修改预置算法版本
+func (s *AlgorithmService) UpdatePreAlgorithmVersion(ctx context.Context, req *api.UpdatePreAlgorithmVersionRequest) (*api.UpdatePreAlgorithmVersionReply, error) {
+ reply, err := s.data.AlgorithmClient.UpdateAlgorithmVersion(ctx, &innterapi.UpdateAlgorithmVersionRequest{
+ SpaceId: "",
+ UserId: "",
+ AlgorithmId: req.AlgorithmId,
+ Version: req.Version,
+ IsPrefab: true,
+ AlgorithmDescript: req.AlgorithmDescript,
+ })
+ if err != nil {
+ return nil, err
+ }
+
+ return &api.UpdatePreAlgorithmVersionReply{
+ UpdatedAt: reply.UpdatedAt,
+ }, nil
+}
+
// 上传算法
func (s *AlgorithmService) UploadPreAlgorithm(ctx context.Context, req *api.UploadPreAlgorithmRequest) (*api.UploadPreAlgorithmReply, error) {
diff --git a/server/admin-server/internal/service/dataset.go b/server/admin-server/internal/service/dataset.go
index bc1e0483..eababaa7 100644
--- a/server/admin-server/internal/service/dataset.go
+++ b/server/admin-server/internal/service/dataset.go
@@ -351,6 +351,43 @@ func (s *DatasetService) ListDatasetVersionFile(ctx context.Context, req *api.Li
return reply, nil
}
+func (s *DatasetService) UpdatePreDataset(ctx context.Context, req *api.UpdatePreDatasetRequest) (*api.UpdatePreDatasetReply, error) {
+ reply, err := s.data.DatasetClient.UpdateDataset(ctx, &innerapi.UpdateDatasetRequest{
+ SpaceId: "",
+ UserId: "",
+ Id: req.DatasetId,
+ SourceType: innerapi.DatasetSourceType_DST_PRE,
+ TypeId: req.TypeId,
+ ApplyId: req.ApplyId,
+ Desc: req.Desc,
+ })
+ if err != nil {
+ return nil, err
+ }
+
+ return &api.UpdatePreDatasetReply{
+ UpdatedAt: reply.UpdatedAt,
+ }, nil
+}
+
+func (s *DatasetService) UpdatePreDatasetVersion(ctx context.Context, req *api.UpdatePreDatasetVersionRequest) (*api.UpdatePreDatasetVersionReply, error) {
+ reply, err := s.data.DatasetClient.UpdateDatasetVersion(ctx, &innerapi.UpdateDatasetVersionRequest{
+ SpaceId: "",
+ UserId: "",
+ DatasetId: req.DatasetId,
+ Version: req.Version,
+ SourceType: innerapi.DatasetSourceType_DST_PRE,
+ Desc: req.Desc,
+ })
+ if err != nil {
+ return nil, err
+ }
+
+ return &api.UpdatePreDatasetVersionReply{
+ UpdatedAt: reply.UpdatedAt,
+ }, nil
+}
+
func (s *DatasetService) assignValue(ctx context.Context, datasets []*api.Dataset) error {
if len(datasets) > 0 {
userIdMap := map[string]interface{}{}
diff --git a/server/base-server/api/v1/algorithm.proto b/server/base-server/api/v1/algorithm.proto
index 4c86f6c7..0b184487 100644
--- a/server/base-server/api/v1/algorithm.proto
+++ b/server/base-server/api/v1/algorithm.proto
@@ -300,8 +300,6 @@ message CopyAlgorithmVersionRequest {
string newAlgorithmName = 5[(validate.rules).string = {min_len:1,max_len:128}];
string modelName = 6[(validate.rules).string = {min_len:1,max_len:128}];
string algorithmDescript = 7[(validate.rules).string = {max_len: 300}];
- string applyId = 8;
- string frameworkId = 9;
}
message CopyAlgorithmVersionReply {
string newAlgorithmId = 1;
@@ -321,10 +319,13 @@ message ConfirmUploadAlgorithmReply {
}
message UpdateAlgorithmRequest {
- string id = 1[(validate.rules).string = {min_len: 1}];
- string applyId = 2;
- string frameworkId = 3;
- string algorithmDescript = 4[(validate.rules).string = {max_len: 300}];
+ string spaceId = 1;
+ string userId = 2;
+ bool IsPrefab = 3;
+ string algorithmId = 4[(validate.rules).string = {min_len:1,max_len:32,pattern:"^[A-Za-z0-9]+$"}];
+ string applyId = 5;
+ string frameworkId = 6;
+ string algorithmDescript = 7[(validate.rules).string = {max_len: 300}];
}
message UpdateAlgorithmReply {
@@ -402,9 +403,12 @@ message DeletePreAlgorithmReply {
}
message UpdateAlgorithmVersionRequest {
- string algorithmId = 1[(validate.rules).string = {min_len:1,max_len:32,pattern:"^[A-Za-z0-9]+$"}];
- string version = 2[(validate.rules).string = {min_len:2,pattern:"^V[0-9]+$"}];
- string algorithmDescript = 3[(validate.rules).string = {max_len: 300}];
+ string spaceId = 1;
+ string userId = 2;
+ bool IsPrefab = 3;
+ string algorithmId = 4[(validate.rules).string = {min_len:1,max_len:32,pattern:"^[A-Za-z0-9]+$"}];
+ string version = 5[(validate.rules).string = {min_len:2,pattern:"^V[0-9]+$"}];
+ string algorithmDescript = 6[(validate.rules).string = {max_len: 300}];
}
message UpdateAlgorithmVersionReply {
diff --git a/server/base-server/api/v1/dataset.proto b/server/base-server/api/v1/dataset.proto
index ea471e6b..233e20dd 100644
--- a/server/base-server/api/v1/dataset.proto
+++ b/server/base-server/api/v1/dataset.proto
@@ -192,10 +192,13 @@ message DeleteDatasetReply {
}
message UpdateDatasetRequest {
- string id = 1[(validate.rules).string = {min_len: 1}];
- string typeId = 2;
- string applyId = 3;
- string desc = 4[(validate.rules).string = {max_len: 300}];
+ string spaceId = 1;
+ string userId = 2;
+ string id = 3[(validate.rules).string = {min_len: 1}];
+ DatasetSourceType sourceType = 4;
+ string typeId = 5;
+ string applyId = 6;
+ string desc = 7[(validate.rules).string = {max_len: 300}];
}
message UpdateDatasetReply {
@@ -274,9 +277,12 @@ message ListDatasetVersionFileReply {
}
message UpdateDatasetVersionRequest {
- string datasetId = 1[(validate.rules).string = {min_len: 1}];
- string version = 2[(validate.rules).string = {min_len: 1}];
- string desc = 3[(validate.rules).string = {max_len: 300}];
+ string spaceId = 1;
+ string userId = 2;
+ string datasetId = 3[(validate.rules).string = {min_len: 1}];
+ string version = 4[(validate.rules).string = {min_len: 1}];
+ DatasetSourceType sourceType = 5;
+ string desc = 6[(validate.rules).string = {max_len: 300}];
}
message UpdateDatasetVersionReply {
diff --git a/server/base-server/internal/service/algorithm/handle.go b/server/base-server/internal/service/algorithm/handle.go
index 7b97d73d..0429d639 100644
--- a/server/base-server/internal/service/algorithm/handle.go
+++ b/server/base-server/internal/service/algorithm/handle.go
@@ -804,17 +804,6 @@ func (h *algorithmHandle) AddAlgorithmHandle(ctx context.Context, req *api.AddAl
fileStatus = FILESTATUS_FINISH
}
- // 检查数据类型id
- algorithmApply, err := h.lableService.GetLable(ctx, &api.GetLableRequest{Id: req.ApplyId})
- if err != nil {
- return nil, err
- }
- // 检查框架id
- algorithmFramework, err := h.lableService.GetLable(ctx, &api.GetLableRequest{Id: req.FrameworkId})
- if err != nil {
- return nil, err
- }
-
myAlgorithm, err := algorithmDao.AddAlgorithm(ctx, &model.Algorithm{
AlgorithmId: algorithmId,
SpaceId: req.SpaceId,
@@ -839,10 +828,24 @@ func (h *algorithmHandle) AddAlgorithmHandle(ctx context.Context, req *api.AddAl
return nil, err
}
- // 新增算法类型引用
- _, _ = h.lableService.IncreaseLableReferTimes(ctx, &api.IncreaseLableReferTimesRequest{Id: algorithmApply.Lable.Id})
- // 新增算法框架引用
- _, _ = h.lableService.IncreaseLableReferTimes(ctx, &api.IncreaseLableReferTimesRequest{Id: algorithmFramework.Lable.Id})
+ // 检查数据类型id
+ if req.ApplyId != "" {
+ algorithmApply, err := h.lableService.GetLable(ctx, &api.GetLableRequest{Id: req.ApplyId})
+ if err != nil {
+ return nil, err
+ }
+ // 新增算法类型引用
+ _, _ = h.lableService.IncreaseLableReferTimes(ctx, &api.IncreaseLableReferTimesRequest{Id: algorithmApply.Lable.Id})
+ }
+ // 检查框架id
+ if req.FrameworkId != "" {
+ algorithmFramework, err := h.lableService.GetLable(ctx, &api.GetLableRequest{Id: req.FrameworkId})
+ if err != nil {
+ return nil, err
+ }
+ // 新增算法框架引用
+ _, _ = h.lableService.IncreaseLableReferTimes(ctx, &api.IncreaseLableReferTimesRequest{Id: algorithmFramework.Lable.Id})
+ }
return &api.AddAlgorithmReply{
AlgorithmId: myAlgorithm.AlgorithmId,
@@ -988,10 +991,13 @@ func (h *algorithmHandle) ConfirmUploadAlgorithmHandle(ctx context.Context, req
// 修改算法
func (h *algorithmHandle) UpdateAlgorithmHandle(ctx context.Context, req *api.UpdateAlgorithmRequest) (*api.UpdateAlgorithmReply, error) {
algorithmDao := h.data.AlgorithmDao
- algorithm, err := algorithmDao.QueryAlgorithm(ctx, &model.AlgorithmQuery{AlgorithmId: req.Id})
+ algorithm, err := algorithmDao.QueryAlgorithm(ctx, &model.AlgorithmQuery{AlgorithmId: req.AlgorithmId})
if err != nil {
return nil, err
}
+ if algorithm.SpaceId != req.SpaceId || algorithm.UserId != algorithm.UserId || algorithm.IsPrefab != req.IsPrefab {
+ return nil, errors.Errorf(nil, errors.ErrorFindAlgorithmAuthWrong)
+ }
// 减少算法类型引用
_, _ = h.lableService.ReduceLableReferTimes(ctx, &api.ReduceLableReferTimesRequest{Id: algorithm.ApplyId})
@@ -1397,9 +1403,17 @@ func (h *algorithmHandle) DeletePreAlgorithmHandle(ctx context.Context, req *api
}, nil
}
-// 修改算法
+// 修改算法版本
func (h *algorithmHandle) UpdateAlgorithmVersionHandle(ctx context.Context, req *api.UpdateAlgorithmVersionRequest) (*api.UpdateAlgorithmVersionReply, error) {
algorithmDao := h.data.AlgorithmDao
+ algorithm, err := algorithmDao.QueryAlgorithm(ctx, &model.AlgorithmQuery{AlgorithmId: req.AlgorithmId})
+ if err != nil {
+ return nil, err
+ }
+ if algorithm.SpaceId != req.SpaceId || algorithm.UserId != algorithm.UserId || algorithm.IsPrefab != req.IsPrefab {
+ return nil, errors.Errorf(nil, errors.ErrorFindAlgorithmAuthWrong)
+ }
+
algorithmVersion, err := algorithmDao.QueryAlgorithmVersion(ctx, &model.AlgorithmVersionQuery{AlgorithmId: req.AlgorithmId, Version: req.Version})
if err != nil {
return nil, err
@@ -1586,17 +1600,6 @@ func (h *algorithmHandle) CopyAlgorithmVersionHandle(ctx context.Context, req *a
return nil, err
}
- // 检查数据类型id
- algorithmApply, err := h.lableService.GetLable(ctx, &api.GetLableRequest{Id: req.ApplyId})
- if err != nil {
- return nil, err
- }
- // 检查框架id
- algorithmFramework, err := h.lableService.GetLable(ctx, &api.GetLableRequest{Id: req.FrameworkId})
- if err != nil {
- return nil, err
- }
-
algorithmId := utils.GetUUIDWithoutSeparator()
algorithmVersionId := utils.GetUUIDWithoutSeparator()
algorithmVersion := common.VersionStrBuild(1)
@@ -1609,8 +1612,8 @@ func (h *algorithmHandle) CopyAlgorithmVersionHandle(ctx context.Context, req *a
AlgorithmDescript: req.AlgorithmDescript,
ModelName: req.ModelName,
LatestVersion: algorithmVersion,
- ApplyId: req.ApplyId,
- FrameworkId: req.FrameworkId,
+ ApplyId: oriAlgorithm.ApplyId,
+ FrameworkId: oriAlgorithm.FrameworkId,
AlgorithmVersions: []*model.AlgorithmVersion{
{
Id: algorithmVersionId,
@@ -1624,10 +1627,24 @@ func (h *algorithmHandle) CopyAlgorithmVersionHandle(ctx context.Context, req *a
return nil, err
}
- // 新增算法类型引用
- _, _ = h.lableService.IncreaseLableReferTimes(ctx, &api.IncreaseLableReferTimesRequest{Id: algorithmApply.Lable.Id})
- // 新增算法框架引用
- _, _ = h.lableService.IncreaseLableReferTimes(ctx, &api.IncreaseLableReferTimesRequest{Id: algorithmFramework.Lable.Id})
+ // 检查数据类型id
+ if oriAlgorithm.ApplyId != "" {
+ algorithmApply, err := h.lableService.GetLable(ctx, &api.GetLableRequest{Id: oriAlgorithm.ApplyId})
+ if err != nil {
+ return nil, err
+ }
+ // 新增算法类型引用
+ _, _ = h.lableService.IncreaseLableReferTimes(ctx, &api.IncreaseLableReferTimesRequest{Id: algorithmApply.Lable.Id})
+ }
+ // 检查框架id
+ if oriAlgorithm.FrameworkId != "" {
+ algorithmFramework, err := h.lableService.GetLable(ctx, &api.GetLableRequest{Id: oriAlgorithm.FrameworkId})
+ if err != nil {
+ return nil, err
+ }
+ // 新增算法框架引用
+ _, _ = h.lableService.IncreaseLableReferTimes(ctx, &api.IncreaseLableReferTimesRequest{Id: algorithmFramework.Lable.Id})
+ }
fromBucektName := ""
fromObjectName := ""
diff --git a/server/base-server/internal/service/dataset/dataset.go b/server/base-server/internal/service/dataset/dataset.go
index 5312d9a9..741fcb88 100644
--- a/server/base-server/internal/service/dataset/dataset.go
+++ b/server/base-server/internal/service/dataset/dataset.go
@@ -69,17 +69,6 @@ func (s *datasetService) CreateDataset(ctx context.Context, req *api.CreateDatas
return nil, errors.Errorf(nil, errors.ErrorDatasetRepeat)
}
- // 检查数据类型id
- datasetType, err := s.lableService.GetLable(ctx, &api.GetLableRequest{Id: req.TypeId})
- if err != nil {
- return nil, err
- }
- // 检查数据用途id
- datasetApply, err := s.lableService.GetLable(ctx, &api.GetLableRequest{Id: req.ApplyId})
- if err != nil {
- return nil, err
- }
-
err = s.data.DatasetDao.CreateDataset(ctx, dataset)
if err != nil {
return nil, err
@@ -99,10 +88,24 @@ func (s *datasetService) CreateDataset(ctx context.Context, req *api.CreateDatas
return nil, err
}
- // 新增数据类型引用
- _, _ = s.lableService.IncreaseLableReferTimes(ctx, &api.IncreaseLableReferTimesRequest{Id: datasetType.Lable.Id})
- // 新增数据用途引用
- _, _ = s.lableService.IncreaseLableReferTimes(ctx, &api.IncreaseLableReferTimesRequest{Id: datasetApply.Lable.Id})
+ // 检查数据类型id
+ if req.TypeId != "" {
+ datasetType, err := s.lableService.GetLable(ctx, &api.GetLableRequest{Id: req.TypeId})
+ if err != nil {
+ return nil, err
+ }
+ // 新增数据类型引用
+ _, _ = s.lableService.IncreaseLableReferTimes(ctx, &api.IncreaseLableReferTimesRequest{Id: datasetType.Lable.Id})
+ }
+ // 检查数据用途id
+ if req.ApplyId != "" {
+ datasetApply, err := s.lableService.GetLable(ctx, &api.GetLableRequest{Id: req.ApplyId})
+ if err != nil {
+ return nil, err
+ }
+ // 新增数据用途引用
+ _, _ = s.lableService.IncreaseLableReferTimes(ctx, &api.IncreaseLableReferTimesRequest{Id: datasetApply.Lable.Id})
+ }
return &api.CreateDatasetReply{
Id: datasetId,
@@ -594,6 +597,9 @@ func (s *datasetService) UpdateDataset(ctx context.Context, req *api.UpdateDatas
if err != nil {
return nil, err
}
+ if dataset.SpaceId != req.SpaceId || dataset.UserId != req.UserId || dataset.SourceType != int(req.SourceType) {
+ return nil, errors.Errorf(nil, errors.ErrorDatasetNoPermission)
+ }
// 减小数据类型引用
_, _ = s.lableService.ReduceLableReferTimes(ctx, &api.ReduceLableReferTimesRequest{Id: dataset.TypeId})
@@ -713,6 +719,14 @@ func (s *datasetService) ListDatasetVersionFile(ctx context.Context, req *api.Li
}
func (s *datasetService) UpdateDatasetVersion(ctx context.Context, req *api.UpdateDatasetVersionRequest) (*api.UpdateDatasetVersionReply, error) {
+ dataset, err := s.data.DatasetDao.GetDataset(ctx, req.DatasetId)
+ if err != nil {
+ return nil, err
+ }
+ if dataset.SpaceId != req.SpaceId || dataset.UserId != req.UserId || dataset.SourceType != int(req.SourceType) {
+ return nil, errors.Errorf(nil, errors.ErrorDatasetNoPermission)
+ }
+
version, err := s.data.DatasetDao.GetDatasetVersion(ctx, req.DatasetId, req.Version)
if err != nil {
return nil, err
diff --git a/server/openai-server/api/v1/algorithm.proto b/server/openai-server/api/v1/algorithm.proto
index 65d965cf..786710c8 100644
--- a/server/openai-server/api/v1/algorithm.proto
+++ b/server/openai-server/api/v1/algorithm.proto
@@ -152,6 +152,22 @@ service Algorithm {
body: "*"
};
}
+
+ // 修改我的算法
+ rpc UpdateMyAlgorithm(UpdateMyAlgorithmRequest) returns (UpdateMyAlgorithmReply) {
+ option (google.api.http) = {
+ put: "/v1/algorithmmanage/myalgorithm/{algorithmId}"
+ body: "*"
+ };
+ };
+
+ // 修改我的算法版本
+ rpc UpdateMyAlgorithmVersion(UpdateMyAlgorithmVersionRequest) returns (UpdateMyAlgorithmVersionReply) {
+ option (google.api.http) = {
+ put: "/v1/algorithmmanage/myalgorithm/{algorithmId}/version/{version}"
+ body: "*"
+ };
+ };
}
message AlgorithmLable {
@@ -336,8 +352,6 @@ message CopyAlgorithmVersionRequest {
string newAlgorithmName = 3[(validate.rules).string = {min_len:1,max_len:128}];
string modelName = 4[(validate.rules).string = {min_len:1,max_len:128}];
string algorithmDescript = 5;
- string applyId = 6;
- string frameworkId = 7;
}
message CopyAlgorithmVersionReply {
string newAlgorithmId = 1;
@@ -414,4 +428,23 @@ message BatchQueryAlgorithmRequest {
message BatchQueryAlgorithmReply {
int64 totalSize = 1;
repeated AlgorithmInfo algorithms = 2;
+}
+
+message UpdateMyAlgorithmRequest {
+ string algorithmId = 1[(validate.rules).string = {len:32,pattern:"^[A-Za-z0-9]+$"}];
+ string algorithmDescript = 2;
+ string applyId = 3;
+ string frameworkId = 4;
+}
+message UpdateMyAlgorithmReply {
+ int64 updatedAt = 1;
+}
+
+message UpdateMyAlgorithmVersionRequest {
+ string algorithmId = 1[(validate.rules).string = {len:32,pattern:"^[A-Za-z0-9]+$"}];
+ string version = 2[(validate.rules).string = {min_len:2,pattern:"^V[0-9]+$"}];
+ string algorithmDescript = 3;
+}
+message UpdateMyAlgorithmVersionReply {
+ int64 updatedAt = 1;
}
\ No newline at end of file
diff --git a/server/openai-server/api/v1/dataset.proto b/server/openai-server/api/v1/dataset.proto
index 66b93945..de0b5636 100644
--- a/server/openai-server/api/v1/dataset.proto
+++ b/server/openai-server/api/v1/dataset.proto
@@ -108,6 +108,18 @@ service DatasetService {
get: "/v1/datasetmanage/dataset/{datasetId}/version/{version}/file"
};
}
+ // 修改我的数据集
+ rpc UpdatePreDataset (UpdateMyDatasetRequest) returns (UpdateMyDatasetReply) {
+ option (google.api.http) = {
+ put: "/v1/datasetmanage/mydataset/{id}"
+ };
+ }
+ // 修改我的数据集版本
+ rpc UpdatePreDatasetVersion (UpdateMyDatasetVersionRequest) returns (UpdateMyDatasetVersionReply) {
+ option (google.api.http) = {
+ put: "/v1/datasetmanage/mydataset/{id}/version/{version}"
+ };
+ }
}
message DatasetLable {
@@ -138,8 +150,8 @@ message ListDatasetApplyReply {
message CreateDatasetRequest {
string name = 1[(validate.rules).string = {min_len: 1, max_len: 30}];
- string typeId = 2[(validate.rules).string = {min_len: 1, max_len: 64}];
- string applyId = 3[(validate.rules).string = {min_len: 1, max_len: 64}];
+ string typeId = 2;
+ string applyId = 3;
string desc = 4[(validate.rules).string = {max_len: 300}];
}
@@ -316,3 +328,24 @@ message ListDatasetVersionFileReply {
}
repeated File files = 1;
}
+
+message UpdateMyDatasetRequest {
+ string datasetId = 1[(validate.rules).string = {min_len: 1}];
+ string typeId = 2;
+ string applyId = 3;
+ string desc = 4[(validate.rules).string = {max_len: 300}];
+}
+
+message UpdateMyDatasetReply {
+ int64 updatedAt = 1;
+}
+
+message UpdateMyDatasetVersionRequest {
+ string datasetId = 1[(validate.rules).string = {min_len: 1}];
+ string version = 2[(validate.rules).string = {min_len: 1}];
+ string desc = 5[(validate.rules).string = {max_len: 300}];
+}
+
+message UpdateMyDatasetVersionReply {
+ int64 updatedAt = 1;
+}
\ No newline at end of file
diff --git a/server/openai-server/internal/service/algorithm.go b/server/openai-server/internal/service/algorithm.go
index cb4ecf4f..08339562 100644
--- a/server/openai-server/internal/service/algorithm.go
+++ b/server/openai-server/internal/service/algorithm.go
@@ -418,8 +418,6 @@ func (s *AlgorithmService) CopyAlgorithmVersion(ctx context.Context, req *api.Co
Version: req.Version,
NewAlgorithmName: req.NewAlgorithmName,
AlgorithmDescript: req.AlgorithmDescript,
- ApplyId: req.ApplyId,
- FrameworkId: req.FrameworkId,
})
if err != nil {
return nil, err
@@ -565,6 +563,55 @@ func (s *AlgorithmService) BatchQueryAlgorithm(ctx context.Context, req *api.Bat
}, nil
}
+// 修改我的算法
+func (s *AlgorithmService) UpdateMyAlgorithm(ctx context.Context, req *api.UpdateMyAlgorithmRequest) (*api.UpdateMyAlgorithmReply, error) {
+ userId, spaceId, err := s.getUserIdAndSpaceId(ctx)
+ if err != nil {
+ return nil, err
+ }
+
+ reply, err := s.data.AlgorithmClient.UpdateAlgorithm(ctx, &innterapi.UpdateAlgorithmRequest{
+ SpaceId: spaceId,
+ UserId: userId,
+ AlgorithmId: req.AlgorithmId,
+ IsPrefab: false,
+ AlgorithmDescript: req.AlgorithmDescript,
+ ApplyId: req.ApplyId,
+ FrameworkId: req.FrameworkId,
+ })
+ if err != nil {
+ return nil, err
+ }
+
+ return &api.UpdateMyAlgorithmReply{
+ UpdatedAt: reply.UpdatedAt,
+ }, nil
+}
+
+// 修改我的算法版本
+func (s *AlgorithmService) UpdatePreAlgorithmVersion(ctx context.Context, req *api.UpdateMyAlgorithmVersionRequest) (*api.UpdateMyAlgorithmVersionReply, error) {
+ userId, spaceId, err := s.getUserIdAndSpaceId(ctx)
+ if err != nil {
+ return nil, err
+ }
+
+ reply, err := s.data.AlgorithmClient.UpdateAlgorithmVersion(ctx, &innterapi.UpdateAlgorithmVersionRequest{
+ SpaceId: spaceId,
+ UserId: userId,
+ IsPrefab: false,
+ AlgorithmId: req.AlgorithmId,
+ Version: req.Version,
+ AlgorithmDescript: req.AlgorithmDescript,
+ })
+ if err != nil {
+ return nil, err
+ }
+
+ return &api.UpdateMyAlgorithmVersionReply{
+ UpdatedAt: reply.UpdatedAt,
+ }, nil
+}
+
func (s *AlgorithmService) algorithmInfoTransfer(algorithm *innterapi.AlgorithmInfo) *api.AlgorithmInfo {
return &api.AlgorithmInfo{
diff --git a/server/openai-server/internal/service/dataset.go b/server/openai-server/internal/service/dataset.go
index 31030d4c..5576f89b 100644
--- a/server/openai-server/internal/service/dataset.go
+++ b/server/openai-server/internal/service/dataset.go
@@ -3,9 +3,11 @@ package service
import (
"context"
innerapi "server/base-server/api/v1"
+ commctx "server/common/context"
"server/common/errors"
"server/common/log"
"server/common/session"
+ ss "server/common/session"
api "server/openai-server/api/v1"
"server/openai-server/internal/conf"
"server/openai-server/internal/data"
@@ -499,3 +501,68 @@ func (s *DatasetService) ListDatasetVersionFile(ctx context.Context, req *api.Li
return reply, nil
}
+
+func (s *DatasetService) UpdateMyDataset(ctx context.Context, req *api.UpdateMyDatasetRequest) (*api.UpdateMyDatasetReply, error) {
+ userId, spaceId, err := s.getUserIdAndSpaceId(ctx)
+ if err != nil {
+ return nil, err
+ }
+
+ reply, err := s.data.DatasetClient.UpdateDataset(ctx, &innerapi.UpdateDatasetRequest{
+ SpaceId: spaceId,
+ UserId: userId,
+ Id: req.DatasetId,
+ SourceType: innerapi.DatasetSourceType_DST_USER,
+ TypeId: req.TypeId,
+ ApplyId: req.ApplyId,
+ Desc: req.Desc,
+ })
+ if err != nil {
+ return nil, err
+ }
+
+ return &api.UpdateMyDatasetReply{
+ UpdatedAt: reply.UpdatedAt,
+ }, nil
+}
+
+func (s *DatasetService) UpdateMyDatasetVersion(ctx context.Context, req *api.UpdateMyDatasetVersionRequest) (*api.UpdateMyDatasetVersionReply, error) {
+ userId, spaceId, err := s.getUserIdAndSpaceId(ctx)
+ if err != nil {
+ return nil, err
+ }
+
+ reply, err := s.data.DatasetClient.UpdateDatasetVersion(ctx, &innerapi.UpdateDatasetVersionRequest{
+ SpaceId: spaceId,
+ UserId: userId,
+ DatasetId: req.DatasetId,
+ Version: req.Version,
+ SourceType: innerapi.DatasetSourceType_DST_USER,
+ Desc: req.Desc,
+ })
+ if err != nil {
+ return nil, err
+ }
+
+ return &api.UpdateMyDatasetVersionReply{
+ UpdatedAt: reply.UpdatedAt,
+ }, nil
+}
+
+func (s *DatasetService) getUserIdAndSpaceId(ctx context.Context) (string, string, error) {
+ userId := commctx.UserIdFromContext(ctx)
+ if userId == "" {
+ err := errors.Errorf(nil, errors.ErrorInvalidRequestParameter)
+ s.log.Errorw(ctx, err)
+ return "", "", err
+ }
+
+ session := ss.SessionFromContext(ctx)
+ if session == nil {
+ err := errors.Errorf(nil, errors.ErrorUserNoAuthSession)
+ s.log.Errorw(ctx, err)
+ return "", "", err
+ }
+
+ return userId, session.GetWorkspace(), nil
+}
--
2.34.1
From 8038606a161b3469d609a825bcf42cbcc536c7b8 Mon Sep 17 00:00:00 2001
From: ethanzheng
Date: Wed, 24 Nov 2021 16:22:53 +0800
Subject: [PATCH 5/8] fixbug
---
server/admin-server/api/v1/dataset.proto | 4 ++--
server/openai-server/api/v1/dataset.proto | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/admin-server/api/v1/dataset.proto b/server/admin-server/api/v1/dataset.proto
index e33ddd59..17352a63 100644
--- a/server/admin-server/api/v1/dataset.proto
+++ b/server/admin-server/api/v1/dataset.proto
@@ -131,13 +131,13 @@ service DatasetService {
// 修改预置数据集
rpc UpdatePreDataset (UpdatePreDatasetRequest) returns (UpdatePreDatasetReply) {
option (google.api.http) = {
- put: "/v1/datasetmanage/predataset/{id}"
+ put: "/v1/datasetmanage/predataset/{datasetId}"
};
}
// 修改预置数据集版本
rpc UpdatePreDatasetVersion (UpdatePreDatasetVersionRequest) returns (UpdatePreDatasetVersionReply) {
option (google.api.http) = {
- put: "/v1/datasetmanage/predataset/{id}/version/{version}"
+ put: "/v1/datasetmanage/predataset/{datasetId}/version/{version}"
};
}
}
diff --git a/server/openai-server/api/v1/dataset.proto b/server/openai-server/api/v1/dataset.proto
index de0b5636..285f1562 100644
--- a/server/openai-server/api/v1/dataset.proto
+++ b/server/openai-server/api/v1/dataset.proto
@@ -111,13 +111,13 @@ service DatasetService {
// 修改我的数据集
rpc UpdatePreDataset (UpdateMyDatasetRequest) returns (UpdateMyDatasetReply) {
option (google.api.http) = {
- put: "/v1/datasetmanage/mydataset/{id}"
+ put: "/v1/datasetmanage/mydataset/{datasetId}"
};
}
// 修改我的数据集版本
rpc UpdatePreDatasetVersion (UpdateMyDatasetVersionRequest) returns (UpdateMyDatasetVersionReply) {
option (google.api.http) = {
- put: "/v1/datasetmanage/mydataset/{id}/version/{version}"
+ put: "/v1/datasetmanage/mydataset/{datasetId}/version/{version}"
};
}
}
--
2.34.1
From da75fa8f9bf929b5bbe3a723a3a455711c1ae43e Mon Sep 17 00:00:00 2001
From: denglei <2522636547@qq.com>
Date: Wed, 24 Nov 2021 16:44:29 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AB=AF=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E9=9B=86=E4=B8=8E=E7=AE=97=E6=B3=95bug=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../devManager/components/algorithm/preAlgorithmCreation.vue | 3 ---
1 file changed, 3 deletions(-)
diff --git a/admin-portal/src/views/devManager/components/algorithm/preAlgorithmCreation.vue b/admin-portal/src/views/devManager/components/algorithm/preAlgorithmCreation.vue
index 03dd6e6a..72bb9cd6 100644
--- a/admin-portal/src/views/devManager/components/algorithm/preAlgorithmCreation.vue
+++ b/admin-portal/src/views/devManager/components/algorithm/preAlgorithmCreation.vue
@@ -122,9 +122,6 @@
this.$refs[formName].validate((valid) => {
if (valid) {
const param = {
- spaceId: '',
- userId: null,
- IsPrefab: true,
algorithmName: this.ruleForm.algorithmName,
algorithmDescript: this.ruleForm.desc,
modelname: this.ruleForm.modelName,
--
2.34.1
From b38e667673a8ca90959ff119cc777f8ca52f5d6b Mon Sep 17 00:00:00 2001
From: ethanzheng
Date: Wed, 24 Nov 2021 16:49:41 +0800
Subject: [PATCH 7/8] fix bug
---
server/openai-server/api/v1/algorithm.proto | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/server/openai-server/api/v1/algorithm.proto b/server/openai-server/api/v1/algorithm.proto
index 786710c8..1bae5eb1 100644
--- a/server/openai-server/api/v1/algorithm.proto
+++ b/server/openai-server/api/v1/algorithm.proto
@@ -360,15 +360,12 @@ message CopyAlgorithmVersionReply {
}
message AddMyAlgorithmRequest {
- string spaceId = 1;
- string userId = 2;
- bool isPrefab = 3;
- bool isEmpty = 4;
- string algorithmName = 5[(validate.rules).string = {min_len:1,max_len:128}];
- string modelName = 6[(validate.rules).string = {min_len:1,max_len:128}];
- string algorithmDescript = 7;
- string applyId = 8;
- string frameworkId = 9;
+ bool isEmpty = 1;
+ string algorithmName = 2[(validate.rules).string = {min_len:1,max_len:128}];
+ string modelName = 3[(validate.rules).string = {min_len:1,max_len:128}];
+ string algorithmDescript = 4;
+ string applyId = 5;
+ string frameworkId = 6;
}
message AddMyAlgorithmReply {
string algorithmId = 1;
--
2.34.1
From b6b9b11c799e7f1d7dfa1df113c14541673cca4d Mon Sep 17 00:00:00 2001
From: denglei <2522636547@qq.com>
Date: Wed, 24 Nov 2021 17:23:11 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AB=AF=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E9=9B=86=E4=B8=8E=E7=AE=97=E6=B3=95bug=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modelDev/components/algorithm/myAlgorithmCreation.vue | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/openai-portal/src/views/modelDev/components/algorithm/myAlgorithmCreation.vue b/openai-portal/src/views/modelDev/components/algorithm/myAlgorithmCreation.vue
index d20af04d..7a836351 100644
--- a/openai-portal/src/views/modelDev/components/algorithm/myAlgorithmCreation.vue
+++ b/openai-portal/src/views/modelDev/components/algorithm/myAlgorithmCreation.vue
@@ -131,10 +131,7 @@
nextStep(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- const param = {
- spaceId: '',
- userId: null,
- IsPrefab: false,
+ const param = {
algorithmName: this.ruleForm.algorithmName,
algorithmDescript: this.ruleForm.desc,
modelName: this.ruleForm.modelName,
--
2.34.1