From b2f83c906dec7dfcdfd46802b0fef11c0674f81c Mon Sep 17 00:00:00 2001
From: lee <320844511@qq.com>
Date: Tue, 21 Mar 2023 09:15:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=9B=E5=BB=BA=E7=AE=97?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E8=AE=AD=E7=BB=83=E4=BD=9C=E4=B8=9A=E7=AD=89?=
 =?UTF-8?q?=E5=87=BA=E5=8F=82=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api    | 30 ++++++++++---------
 .../PCM-MODELARTS/rpc/pb/pcm-modelarts.proto  | 12 ++++++--
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api b/adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api
index dde9f633..5d4cf75f 100644
--- a/adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api
+++ b/adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api
@@ -512,18 +512,18 @@ type FlavorDetail {
 	FlavorInfo FlavorInfo `json:"flavor_info"`
 }
 type Resource {
-	Policy       string       `json:"policy"`
-	FlavorID     string       `json:"flavor_id"`
-	FlavorName   string       `json:"flavor_name"`
-	NodeCount    int32        `json:"node_count"`
-	FlavorDetail FlavorDetail `json:"flavor_detail"`
+	Policy       string       `json:"policy,optional"`
+	FlavorId     string       `json:"flavor_id,optional"`
+	FlavorName   string       `json:"flavor_name,optional"`
+	NodeCount    int32        `json:"node_count,optional"`
+	FlavorDetail FlavorDetail `json:"flavor_detail,optional"`
 }
 type LogExportPathCreateTraining {
 }
 type Spec {
-	Resource      Resource                    `json:"resource"`
-	LogExportPath LogExportPathCreateTraining `json:"log_export_path"`
-	IsHostedLog   bool                        `json:"is_hosted_log"`
+	Resource      Resource      `json:"resource"`
+	LogExportPath LogExportPath `json:"log_export_path"`
+	IsHostedLog   bool          `json:"is_hosted_log"`
 }
 type Items {
 	Kind      string    `json:"kind"`
@@ -1404,6 +1404,7 @@ type (
 		EngineCreateTraining   EngineCreateTraining   `json:"engine,optional"`
 		ParametersTrainJob     []ParametersTrainJob   `json:"parameters,optional"`
 		PoliciesCreateTraining PoliciesCreateTraining `json:"policies,optional"`
+		Command                string                 `json:"command,optional"`
 	}
 
 	ResourceCreateTraining {
@@ -1412,17 +1413,18 @@ type (
 	}
 
 	LogExportPathCreateTrainingJob {
+		ObsUrl string `json:"obs_url,optional"`
 	}
 
 	SpecsCtRq {
-		ResourceCreateTraining         ResourceCreateTraining         `json:"resource,optional"`
-		LogExportPathCreateTrainingJob LogExportPathCreateTrainingJob `json:"logExportPath,optional"`
-		IsHostedLog                    bool                           `json:"isHostedLog,optional"`
+		Resource      ResourceCreateTraining `json:"resource,optional"`
+		Volumes       []Volumes              `json:"volumes,optional"`
+		LogExportPath LogExportPath          `json:"log_export_path,optional"`
 	}
 	SpecCtRp {
-		Resource      *Resource      `json:"resource,optional"`
-		Volumes       []*Volumes     `json:"volumes,optional"`
-		LogExportPath *LogExportPath `json:"log_export_path,optional"`
+		Resource      ResourceCreateTraining `json:"resource,optional"`
+		Volumes       []Volumes              `json:"volumes,optional"`
+		LogExportPath LogExportPath          `json:"log_export_path,optional"`
 	}
 	LogExportPath {
 		ObsUrl   string `json:"obs_url,optional"`
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 4b08d735..8387ad97 100644
--- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto
+++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto
@@ -482,7 +482,7 @@ message CreateTrainingJobReq {
   string kind = 1;            // @gotags: copier:"Kind"
   MetadataS metadata = 2;     // @gotags: copier:"Metadatas"
   Algorithms algorithm = 3;   // @gotags: copier:"AlgorithmsCtRq"
-  Specs spec = 4;             // @gotags: copier:"SpecsCtRq"
+  SpecsC spec = 4;             // @gotags: copier:"SpecsCtRq"
   string project_id =5;       // @gotags: copier:"ProjectId"
 }
 //创建训练任务出参
@@ -544,11 +544,12 @@ message Algorithms {
   EngineCreateTraining engine = 5;// @gotags: copier:"EngineCreateTraining"
   repeated ParametersTrainJob parameters = 6;// @gotags: copier:"ParametersTrainJob"
   PoliciesCreateTraining policies = 7;// @gotags: copier:"PoliciesCreateTraining"
+  string command =8; // @gotags: copier:"Command"
 }
 
 message ResourceCreateTraining {
-  string flavor_id = 1;
-  int32 node_count = 2;
+  string flavor_id = 1;      // @gotags: copier:"FlavorId"
+  int32 node_count = 2;      // @gotags: copier:"NodeCount"
 }
 
 message LogExportPathCreateTraining {
@@ -562,6 +563,11 @@ message Specs {
 /******************CreateTrainingJob end*************************/
 
 /******************CreateTrainingJobConfig start*************************/
+message SpecsC {
+  ResourceCreateTraining resource = 1;         // @gotags: copier:"Resource"
+  log_export_path log_export_path = 2;   // @gotags: copier:"LogExportPath"
+  repeated volumes volumes = 3;                        // @gotags: copier:"Volumes"
+}
 message CreateTrainingJobConfigReq {
   string config_name = 1;
   string app_url = 2;