From 9636cf7657dee5f8101f48b4b8120c32f1dbf7df Mon Sep 17 00:00:00 2001
From: ll15074821352 <320844511@qq.com>
Date: Wed, 14 Jun 2023 11:09:19 +0800
Subject: [PATCH] =?UTF-8?q?modelarts=20Core=E7=AB=AFapi=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=AE=AD=E7=BB=83=E4=BD=9C=E4=B8=9A=E5=A2=9E=E5=8A=A0=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=E7=AE=97=E6=B3=95=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PCM-MODELARTS/rpc/pb/pcm-modelarts.proto  | 42 +++++++++----------
 adaptor/PCM-CORE/api/desc/ai/pcm-ai.api       | 40 +++++++++++++++++-
 2 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto b/adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto
index 23e237f..5e6c4ea 100644
--- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto
+++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto
@@ -510,10 +510,10 @@ message MetadataS {
 }
 
 message EngineCreateTraining {
-  string engine_id = 1;
-  string engine_name = 2;
-  string engine_version = 3;
-  string image_url =4;
+  string engine_id = 1;    // @gotags: copier:"EngineId"
+  string engine_name = 2;    // @gotags: copier:"EngineName"
+  string engine_version = 3; // @gotags: copier:"EngineVersion"
+  string image_url =4; // @gotags: copier:"ImageUrl"
 }
 
 message ConstraintCreateTraining {
@@ -545,36 +545,36 @@ message Algorithms {
   string command =8; // @gotags: copier:"Command"
   string subscription_id =9; // @gotags: copier:"SubscriptionId"
   string item_version_id =10; // @gotags: copier:"ItemVersionId"
-  repeated  InputTraining inputs =11;
-  repeated OutputTraining outputs =12;
-  Environments environments =13;
+  repeated  InputTraining inputs =11; // @gotags: copier:"InputTra"
+  repeated OutputTraining outputs =12; // @gotags: copier:"OutputTra"
+  Environments environments =13; // @gotags: copier:"Environments"
 }
 
 message InputTraining{
-  string name = 1;
-  string access_method = 2;
-  RemoteTra remote = 3;
+  string name = 1;          // @gotags: copier:"Name"
+  string access_method = 2;          // @gotags: copier:"AccessMethod"
+  RemoteTra remote = 3;          // @gotags: copier:"RemoteIn"
 }
 message OutputTraining{
-  string name = 1;
-  string access_method = 2;
-  bool prefetch_to_local =3;
-  RemoteOut remote = 4;
+  string name = 1;         // @gotags: copier:"Name"
+  string access_method = 2;         // @gotags: copier:"AccessMethod"
+  bool prefetch_to_local =3;         // @gotags: copier:"PrefetchToLocal"
+  RemoteOut remote = 4;         // @gotags: copier:"RemoteOut"
 }
 message RemoteTra{
-  DatasetTra dataset =1;
+  DatasetTra dataset =1;         // @gotags: copier:"DatasetIn"
 }
 message RemoteOut{
-  ObsTra obs  =1;
+  ObsTra obs  =1;         // @gotags: copier:"Obs"
 }
 message ObsTra{
-    string obs_url =1;
+    string obs_url =1;         // @gotags: copier:"ObsUrl"
 }
 message DatasetTra{
-  string id = 1;
-  string name = 2;
-  string version_name = 3;
-  string version_id = 4;
+  string id = 1;         // @gotags: copier:"Id"
+  string name = 2;         // @gotags: copier:"Name"
+  string version_name = 3;         // @gotags: copier:"VersionName"
+  string version_id = 4;         // @gotags: copier:"VersionId"
 }
 
 message ResourceCreateTraining {
diff --git a/adaptor/PCM-CORE/api/desc/ai/pcm-ai.api b/adaptor/PCM-CORE/api/desc/ai/pcm-ai.api
index 6220413..0db6f62 100644
--- a/adaptor/PCM-CORE/api/desc/ai/pcm-ai.api
+++ b/adaptor/PCM-CORE/api/desc/ai/pcm-ai.api
@@ -1558,9 +1558,9 @@ type (
 
 	ParametersTrainJob {
 		Name                     string                   `json:"name,optional"`
-		Description              string                   `json:"description,optional"`
+//		Description              string                   `json:"description,optional"`
 		Value                    string                   `json:"value,optional"`
-		ConstraintCreateTraining ConstraintCreateTraining `json:"constraint,optional"`
+//		ConstraintCreateTraining ConstraintCreateTraining `json:"constraint,optional"`
 	}
 
 	PoliciesCreateTraining {
@@ -1575,11 +1575,47 @@ type (
 		ParametersTrainJob     []ParametersTrainJob   `json:"parameters,optional"`
 		PoliciesCreateTraining PoliciesCreateTraining `json:"policies,optional"`
 		Command                string                 `json:"command,optional"`
+		SubscriptionId 		   string                 `json:"subscriptionId,optional"`
+		ItemVersionId 		   string                 `json:"itemVersionId,optional"`
+		InputTra		       []InputTra               `json:"inputs,optional"`
+		OutputTra 		       []OutputTra              `json:"outputs,optional"`
+		Environments Environments  				      `json:"environments,optional"`
+	}
+	Environments{
+
+	}
+	InputTra{
+		Name                     string                 `json:"name,optional"`
+		AccessMethod           	 string                 `json:"accessMethod,optional"`
+		RemoteIn	             RemoteTra              `json:"remoteIn,optional"`
+	}
+	RemoteTra{
+		DatasetIn DatasetTra `json:"dataSet,optional"`
+	}
+	DatasetTra{
+		Id                     string                  `json:"id,optional"`
+		Name                   string                  `json:"name,optional"`
+		VersionName            string                  `json:"versionName,optional"`
+		VersionId              string                  `json:"versionId,optional"`
+	}
+	OutputTra{
+		Name                     string                  `json:"name,optional"`
+		AccessMethod             string                  `json:"accessMethod,optional"`
+		PrefetchToLocal          string                  `json:"prefetchToLocal,optional"`
+		RemoteOut              	 RemoteOut               `json:"remoteOut,optional"`
+	}
+	RemoteOut{
+		Obs ObsTra `json:"obs,optional"`
+	}
+	ObsTra{
+		ObsUrl string `json:"obsUrl,optional"`
 	}
 
 	ResourceCreateTraining {
 		FlavorId  string `json:"flavorId,optional"`
 		NodeCount int32  `json:"nodeCount,optional"`
+		Policy  string `json:"policy,optional"`
+		FlavorLabel  string `json:"flavorLabel,optional"`
 	}
 
 	LogExportPathCreateTrainingJob {