fit:创建数据集接口

adaptor/AIComputing/modelarts/rpc/internal/logic/getdatasetlistlogic.go

@@ -1,17 +1,15 @@
 package logic
 
 import (
+	"PCM/adaptor/AIComputing/modelarts/rpc/internal/common"
 	"PCM/adaptor/AIComputing/modelarts/rpc/internal/svc"
 	"PCM/adaptor/AIComputing/modelarts/rpc/modelarts"
+	"PCM/common/tool"
 	"context"
-	"fmt"
-	"io/ioutil"
+	"github.com/zeromicro/go-zero/core/logx"
 	"k8s.io/apimachinery/pkg/util/json"
 	"log"
-	"net/http"
-	"time"
-
-	"github.com/zeromicro/go-zero/core/logx"
+	"strings"
 )
 
 type GetDatasetListLogic struct {
@@ -28,29 +26,15 @@ func NewGetDatasetListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Ge
 	}
 }
 
-// find taskList
+// find datasetList
 func (l *GetDatasetListLogic) GetDatasetList(in *modelarts.DatasetReq) (*modelarts.DatasetResp, error) {
-	var req modelarts.DatasetReq
-	projectId := req.ProjectId
+	projectId := in.ProjectId
 	var resp modelarts.DatasetResp
-	c := http.Client{Timeout: time.Duration(3) * time.Second}
-	reqUrl, err := http.NewRequest("GET", "https://modelarts.cn-north-4.myhuaweicloud.com/v2/"+projectId+"/datasets", nil)
-
+	token := common.GetToken()
+	reqUrl, err := tool.HttpClient(tool.GET, "https://modelarts.cn-north-4.myhuaweicloud.com/v2/"+projectId+"/datasets", strings.NewReader(``), token)
+	json.Unmarshal(reqUrl, &resp)
 	if err != nil {
 		log.Fatal(err)
 	}
-	var token = ""
-	reqUrl.Header.Add("X-Auth-Token", token)
-	reqUrl.Header.Add("User-Agent", "API Explorer")
-	reqUrl.Header.Add("Content-Type", "application/json;charset=UTF-8")
-	respUrl, err := c.Do(reqUrl)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer respUrl.Body.Close()
-	result, err := ioutil.ReadAll(respUrl.Body)
-	print(string(result))
-	json.Unmarshal([]byte(string(result)), &resp)
-	fmt.Print(resp)
 	return &resp, nil
 }

adaptor/AIComputing/modelarts/rpc/pb/modelarts.proto

@@ -841,8 +841,8 @@ message datasetReq{
 }
 
 message datasetResp{
-  string total_number = 1;
-  datasets datasets =2;
+  int32 total_number = 1;
+  repeated datasets datasets =2;
 }
 
 message datasets{
@@ -860,6 +860,22 @@ message DataSources{
    int32  data_type =2;
 }
 
+/******************create dataset start*************************/
+message CreateDataSetReq {
+  repeated DataSources data_sources = 1;
+  string dataset_name = 2;
+  int32 dataset_type = 3;
+  string description = 4;
+  string work_path = 5;
+  int32 work_path_type = 6;
+  string  project_id = 7;
+}
+
+message CreateDataSetResq{
+  string dataset_id =1;
+}
+/******************create dataset end*************************/
+
 
 /******************find datasetList end*************************/
 
@@ -1181,7 +1197,8 @@ service ModelArts {
   rpc GetToken(TokenReq) returns (TokenResp);
   //get modelarts Token
   rpc GetDatasetList(datasetReq) returns (datasetResp);
-
+  //create  DateSet
+  rpc CreateDataSet(CreateDataSetReq) returns (CreateDataSetResq);
   //creat task  创建导入任务
   rpc createTask(ImportTaskData) returns(ImprotTaskDataReq);
   //get taskList 查询数据集导入任务列表