@alicloud/pai-dlc20201203 1.2.3 → 1.2.5

package/dist/client.d.ts

@@ -211,6 +211,57 @@ export declare class ExtraPodSpec extends $tea.Model {
         [key: string]: any;
     });
 }
+export declare class FreeResourceClusterControlItem extends $tea.Model {
+    clusterID?: string;
+    clusterName?: string;
+    crossClusters?: boolean;
+    enableFreeResource?: boolean;
+    freeResourceClusterControlId?: string;
+    gmtCreateTime?: string;
+    gmtModifyTime?: string;
+    regionID?: string;
+    static names(): {
+        [key: string]: string;
+    };
+    static types(): {
+        [key: string]: any;
+    };
+    constructor(map?: {
+        [key: string]: any;
+    });
+}
+export declare class FreeResourceDetail extends $tea.Model {
+    amount?: number;
+    resourceType?: string;
+    static names(): {
+        [key: string]: string;
+    };
+    static types(): {
+        [key: string]: any;
+    };
+    constructor(map?: {
+        [key: string]: any;
+    });
+}
+export declare class FreeResourceItem extends $tea.Model {
+    availableNumber?: number;
+    clusterID?: string;
+    clusterName?: string;
+    freeResourceId?: string;
+    gmtCreateTime?: string;
+    gmtModifyTime?: string;
+    regionID?: string;
+    resourceType?: string;
+    static names(): {
+        [key: string]: string;
+    };
+    static types(): {
+        [key: string]: any;
+    };
+    constructor(map?: {
+        [key: string]: any;
+    });
+}
 export declare class GPUDetail extends $tea.Model {
     GPU?: string;
     GPUType?: string;
@@ -225,6 +276,21 @@ export declare class GPUDetail extends $tea.Model {
         [key: string]: any;
     });
 }
+export declare class ImageConfig extends $tea.Model {
+    auth?: string;
+    dockerRegistry?: string;
+    password?: string;
+    username?: string;
+    static names(): {
+        [key: string]: string;
+    };
+    static types(): {
+        [key: string]: any;
+    };
+    constructor(map?: {
+        [key: string]: any;
+    });
+}
 export declare class ImageItem extends $tea.Model {
     acceleratorType?: string;
     authorId?: string;
@@ -259,10 +325,21 @@ export declare class JobDebuggerConfig extends $tea.Model {
     });
 }
 export declare class JobElasticSpec extends $tea.Model {
+    AIMasterDockerImage?: string;
     AIMasterType?: string;
+    EDPMaxParallelism?: number;
+    EDPMinParallelism?: number;
+    elasticStrategy?: string;
+    enableAIMaster?: boolean;
+    enableEDP?: boolean;
     enableElasticTraining?: boolean;
+    enablePsJobElasticPS?: boolean;
+    enablePsJobElasticWorker?: boolean;
+    enablePsResourceEstimate?: boolean;
     maxParallelism?: number;
     minParallelism?: number;
+    PSMaxParallelism?: number;
+    PSMinParallelism?: number;
     static names(): {
         [key: string]: string;
     };
@@ -300,6 +377,7 @@ export declare class JobItem extends $tea.Model {
     resourceName?: string;
     settings?: JobSettings;
     status?: string;
+    subStatus?: string;
     thirdpartyLibDir?: string;
     thirdpartyLibs?: string[];
     userCommand?: string;
@@ -317,6 +395,9 @@ export declare class JobItem extends $tea.Model {
     });
 }
 export declare class JobSettings extends $tea.Model {
+    advancedSettings?: {
+        [key: string]: any;
+    };
     businessUserId?: string;
     caller?: string;
     enableErrorMonitoringInAIMaster?: boolean;
@@ -324,6 +405,7 @@ export declare class JobSettings extends $tea.Model {
     enableRDMA?: boolean;
     enableTideResource?: boolean;
     errorMonitoringArgs?: string;
+    oversoldType?: string;
     pipelineId?: string;
     tags?: {
         [key: string]: string;
@@ -342,6 +424,7 @@ export declare class JobSpec extends $tea.Model {
     ecsSpec?: string;
     extraPodSpec?: ExtraPodSpec;
     image?: string;
+    imageConfig?: ImageConfig;
     podCount?: number;
     resourceConfig?: ResourceConfig;
     type?: string;
@@ -395,6 +478,26 @@ export declare class NodeMetric extends $tea.Model {
         [key: string]: any;
     });
 }
+export declare class PodItem extends $tea.Model {
+    gmtCreateTime?: string;
+    gmtFinishTime?: string;
+    gmtStartTime?: string;
+    historyPods?: PodItem[];
+    ip?: string;
+    podId?: string;
+    podUid?: string;
+    status?: string;
+    type?: string;
+    static names(): {
+        [key: string]: string;
+    };
+    static types(): {
+        [key: string]: any;
+    };
+    constructor(map?: {
+        [key: string]: any;
+    });
+}
 export declare class PodMetric extends $tea.Model {
     metrics?: Metric[];
     podId?: string;
@@ -643,12 +746,14 @@ export declare class CreateJobResponse extends $tea.Model {
     });
 }
 export declare class CreateTensorboardRequest extends $tea.Model {
+    cpu?: number;
     dataSourceId?: string;
     dataSourceType?: string;
     dataSources?: DataSourceItem[];
     displayName?: string;
     jobId?: string;
     maxRunningTimeMinutes?: number;
+    memory?: number;
     options?: string;
     sourceId?: string;
     sourceType?: string;
@@ -767,6 +872,18 @@ export declare class DeleteTensorboardResponse extends $tea.Model {
         [key: string]: any;
     });
 }
+export declare class GetJobRequest extends $tea.Model {
+    needDetail?: boolean;
+    static names(): {
+        [key: string]: string;
+    };
+    static types(): {
+        [key: string]: any;
+    };
+    constructor(map?: {
+        [key: string]: any;
+    });
+}
 export declare class GetJobResponseBody extends $tea.Model {
     clusterId?: string;
     codeSource?: GetJobResponseBodyCodeSource;
@@ -795,8 +912,10 @@ export declare class GetJobResponseBody extends $tea.Model {
     requestId?: string;
     resourceId?: string;
     resourceLevel?: string;
+    restartTimes?: string;
     settings?: JobSettings;
     status?: string;
+    subStatus?: string;
     thirdpartyLibDir?: string;
     thirdpartyLibs?: string[];
     userCommand?: string;
@@ -846,7 +965,7 @@ export declare class GetJobEventsRequest extends $tea.Model {
 export declare class GetJobEventsResponseBody extends $tea.Model {
     events?: string[];
     jobId?: string;
-    requestId?: number;
+    requestId?: string;
     static names(): {
         [key: string]: string;
     };
@@ -1534,7 +1653,9 @@ export declare class GetJobResponseBodyPodsHistoryPods extends $tea.Model {
     ip?: string;
     podId?: string;
     podUid?: string;
+    resourceType?: string;
     status?: string;
+    subStatus?: string;
     type?: string;
     static names(): {
         [key: string]: string;
@@ -1554,7 +1675,9 @@ export declare class GetJobResponseBodyPods extends $tea.Model {
     ip?: string;
     podId?: string;
     podUid?: string;
+    resourceType?: string;
     status?: string;
+    subStatus?: string;
     type?: string;
     static names(): {
         [key: string]: string;
@@ -1587,10 +1710,10 @@ export default class Client extends OpenApi {
         [key: string]: string;
     }, runtime: $Util.RuntimeOptions): Promise<DeleteTensorboardResponse>;
     deleteTensorboard(TensorboardId: string, request: DeleteTensorboardRequest): Promise<DeleteTensorboardResponse>;
-    getJobWithOptions(JobId: string, headers: {
+    getJobWithOptions(JobId: string, request: GetJobRequest, headers: {
         [key: string]: string;
     }, runtime: $Util.RuntimeOptions): Promise<GetJobResponse>;
-    getJob(JobId: string): Promise<GetJobResponse>;
+    getJob(JobId: string, request: GetJobRequest): Promise<GetJobResponse>;
     getJobEventsWithOptions(JobId: string, request: GetJobEventsRequest, headers: {
         [key: string]: string;
     }, runtime: $Util.RuntimeOptions): Promise<GetJobEventsResponse>;

package/dist/client.js

@@ -337,6 +337,84 @@ class ExtraPodSpec extends $tea.Model {
     }
 }
 exports.ExtraPodSpec = ExtraPodSpec;
+class FreeResourceClusterControlItem extends $tea.Model {
+    constructor(map) {
+        super(map);
+    }
+    static names() {
+        return {
+            clusterID: 'ClusterID',
+            clusterName: 'ClusterName',
+            crossClusters: 'CrossClusters',
+            enableFreeResource: 'EnableFreeResource',
+            freeResourceClusterControlId: 'FreeResourceClusterControlId',
+            gmtCreateTime: 'GmtCreateTime',
+            gmtModifyTime: 'GmtModifyTime',
+            regionID: 'RegionID',
+        };
+    }
+    static types() {
+        return {
+            clusterID: 'string',
+            clusterName: 'string',
+            crossClusters: 'boolean',
+            enableFreeResource: 'boolean',
+            freeResourceClusterControlId: 'string',
+            gmtCreateTime: 'string',
+            gmtModifyTime: 'string',
+            regionID: 'string',
+        };
+    }
+}
+exports.FreeResourceClusterControlItem = FreeResourceClusterControlItem;
+class FreeResourceDetail extends $tea.Model {
+    constructor(map) {
+        super(map);
+    }
+    static names() {
+        return {
+            amount: 'Amount',
+            resourceType: 'ResourceType',
+        };
+    }
+    static types() {
+        return {
+            amount: 'number',
+            resourceType: 'string',
+        };
+    }
+}
+exports.FreeResourceDetail = FreeResourceDetail;
+class FreeResourceItem extends $tea.Model {
+    constructor(map) {
+        super(map);
+    }
+    static names() {
+        return {
+            availableNumber: 'AvailableNumber',
+            clusterID: 'ClusterID',
+            clusterName: 'ClusterName',
+            freeResourceId: 'FreeResourceId',
+            gmtCreateTime: 'GmtCreateTime',
+            gmtModifyTime: 'GmtModifyTime',
+            regionID: 'RegionID',
+            resourceType: 'ResourceType',
+        };
+    }
+    static types() {
+        return {
+            availableNumber: 'number',
+            clusterID: 'string',
+            clusterName: 'string',
+            freeResourceId: 'string',
+            gmtCreateTime: 'string',
+            gmtModifyTime: 'string',
+            regionID: 'string',
+            resourceType: 'string',
+        };
+    }
+}
+exports.FreeResourceItem = FreeResourceItem;
 class GPUDetail extends $tea.Model {
     constructor(map) {
         super(map);
@@ -357,6 +435,28 @@ class GPUDetail extends $tea.Model {
     }
 }
 exports.GPUDetail = GPUDetail;
+class ImageConfig extends $tea.Model {
+    constructor(map) {
+        super(map);
+    }
+    static names() {
+        return {
+            auth: 'Auth',
+            dockerRegistry: 'DockerRegistry',
+            password: 'Password',
+            username: 'Username',
+        };
+    }
+    static types() {
+        return {
+            auth: 'string',
+            dockerRegistry: 'string',
+            password: 'string',
+            username: 'string',
+        };
+    }
+}
+exports.ImageConfig = ImageConfig;
 class ImageItem extends $tea.Model {
     constructor(map) {
         super(map);
@@ -413,18 +513,40 @@ class JobElasticSpec extends $tea.Model {
     }
     static names() {
         return {
+            AIMasterDockerImage: 'AIMasterDockerImage',
             AIMasterType: 'AIMasterType',
+            EDPMaxParallelism: 'EDPMaxParallelism',
+            EDPMinParallelism: 'EDPMinParallelism',
+            elasticStrategy: 'ElasticStrategy',
+            enableAIMaster: 'EnableAIMaster',
+            enableEDP: 'EnableEDP',
             enableElasticTraining: 'EnableElasticTraining',
+            enablePsJobElasticPS: 'EnablePsJobElasticPS',
+            enablePsJobElasticWorker: 'EnablePsJobElasticWorker',
+            enablePsResourceEstimate: 'EnablePsResourceEstimate',
             maxParallelism: 'MaxParallelism',
             minParallelism: 'MinParallelism',
+            PSMaxParallelism: 'PSMaxParallelism',
+            PSMinParallelism: 'PSMinParallelism',
         };
     }
     static types() {
         return {
+            AIMasterDockerImage: 'string',
             AIMasterType: 'string',
+            EDPMaxParallelism: 'number',
+            EDPMinParallelism: 'number',
+            elasticStrategy: 'string',
+            enableAIMaster: 'boolean',
+            enableEDP: 'boolean',
             enableElasticTraining: 'boolean',
+            enablePsJobElasticPS: 'boolean',
+            enablePsJobElasticWorker: 'boolean',
+            enablePsResourceEstimate: 'boolean',
             maxParallelism: 'number',
             minParallelism: 'number',
+            PSMaxParallelism: 'number',
+            PSMinParallelism: 'number',
         };
     }
 }
@@ -459,6 +581,7 @@ class JobItem extends $tea.Model {
             resourceName: 'ResourceName',
             settings: 'Settings',
             status: 'Status',
+            subStatus: 'SubStatus',
             thirdpartyLibDir: 'ThirdpartyLibDir',
             thirdpartyLibs: 'ThirdpartyLibs',
             userCommand: 'UserCommand',
@@ -493,6 +616,7 @@ class JobItem extends $tea.Model {
             resourceName: 'string',
             settings: JobSettings,
             status: 'string',
+            subStatus: 'string',
             thirdpartyLibDir: 'string',
             thirdpartyLibs: { 'type': 'array', 'itemType': 'string' },
             userCommand: 'string',
@@ -509,6 +633,7 @@ class JobSettings extends $tea.Model {
     }
     static names() {
         return {
+            advancedSettings: 'AdvancedSettings',
             businessUserId: 'BusinessUserId',
             caller: 'Caller',
             enableErrorMonitoringInAIMaster: 'EnableErrorMonitoringInAIMaster',
@@ -516,12 +641,14 @@ class JobSettings extends $tea.Model {
             enableRDMA: 'EnableRDMA',
             enableTideResource: 'EnableTideResource',
             errorMonitoringArgs: 'ErrorMonitoringArgs',
+            oversoldType: 'OversoldType',
             pipelineId: 'PipelineId',
             tags: 'Tags',
         };
     }
     static types() {
         return {
+            advancedSettings: { 'type': 'map', 'keyType': 'string', 'valueType': 'any' },
             businessUserId: 'string',
             caller: 'string',
             enableErrorMonitoringInAIMaster: 'boolean',
@@ -529,6 +656,7 @@ class JobSettings extends $tea.Model {
             enableRDMA: 'boolean',
             enableTideResource: 'boolean',
             errorMonitoringArgs: 'string',
+            oversoldType: 'string',
             pipelineId: 'string',
             tags: { 'type': 'map', 'keyType': 'string', 'valueType': 'string' },
         };
@@ -544,6 +672,7 @@ class JobSpec extends $tea.Model {
             ecsSpec: 'EcsSpec',
             extraPodSpec: 'ExtraPodSpec',
             image: 'Image',
+            imageConfig: 'ImageConfig',
             podCount: 'PodCount',
             resourceConfig: 'ResourceConfig',
             type: 'Type',
@@ -555,6 +684,7 @@ class JobSpec extends $tea.Model {
             ecsSpec: 'string',
             extraPodSpec: ExtraPodSpec,
             image: 'string',
+            imageConfig: ImageConfig,
             podCount: 'number',
             resourceConfig: ResourceConfig,
             type: 'string',
@@ -617,6 +747,38 @@ class NodeMetric extends $tea.Model {
     }
 }
 exports.NodeMetric = NodeMetric;
+class PodItem extends $tea.Model {
+    constructor(map) {
+        super(map);
+    }
+    static names() {
+        return {
+            gmtCreateTime: 'GmtCreateTime',
+            gmtFinishTime: 'GmtFinishTime',
+            gmtStartTime: 'GmtStartTime',
+            historyPods: 'HistoryPods',
+            ip: 'Ip',
+            podId: 'PodId',
+            podUid: 'PodUid',
+            status: 'Status',
+            type: 'Type',
+        };
+    }
+    static types() {
+        return {
+            gmtCreateTime: 'string',
+            gmtFinishTime: 'string',
+            gmtStartTime: 'string',
+            historyPods: { 'type': 'array', 'itemType': PodItem },
+            ip: 'string',
+            podId: 'string',
+            podUid: 'string',
+            status: 'string',
+            type: 'string',
+        };
+    }
+}
+exports.PodItem = PodItem;
 class PodMetric extends $tea.Model {
     constructor(map) {
         super(map);
@@ -997,12 +1159,14 @@ class CreateTensorboardRequest extends $tea.Model {
     }
     static names() {
         return {
+            cpu: 'Cpu',
             dataSourceId: 'DataSourceId',
             dataSourceType: 'DataSourceType',
             dataSources: 'DataSources',
             displayName: 'DisplayName',
             jobId: 'JobId',
             maxRunningTimeMinutes: 'MaxRunningTimeMinutes',
+            memory: 'Memory',
             options: 'Options',
             sourceId: 'SourceId',
             sourceType: 'SourceType',
@@ -1014,12 +1178,14 @@ class CreateTensorboardRequest extends $tea.Model {
     }
     static types() {
         return {
+            cpu: 'number',
             dataSourceId: 'string',
             dataSourceType: 'string',
             dataSources: { 'type': 'array', 'itemType': DataSourceItem },
             displayName: 'string',
             jobId: 'string',
             maxRunningTimeMinutes: 'number',
+            memory: 'number',
             options: 'string',
             sourceId: 'string',
             sourceType: 'string',
@@ -1165,6 +1331,22 @@ class DeleteTensorboardResponse extends $tea.Model {
     }
 }
 exports.DeleteTensorboardResponse = DeleteTensorboardResponse;
+class GetJobRequest extends $tea.Model {
+    constructor(map) {
+        super(map);
+    }
+    static names() {
+        return {
+            needDetail: 'NeedDetail',
+        };
+    }
+    static types() {
+        return {
+            needDetail: 'boolean',
+        };
+    }
+}
+exports.GetJobRequest = GetJobRequest;
 class GetJobResponseBody extends $tea.Model {
     constructor(map) {
         super(map);
@@ -1196,8 +1378,10 @@ class GetJobResponseBody extends $tea.Model {
             requestId: 'RequestId',
             resourceId: 'ResourceId',
             resourceLevel: 'ResourceLevel',
+            restartTimes: 'RestartTimes',
             settings: 'Settings',
             status: 'Status',
+            subStatus: 'SubStatus',
             thirdpartyLibDir: 'ThirdpartyLibDir',
             thirdpartyLibs: 'ThirdpartyLibs',
             userCommand: 'UserCommand',
@@ -1233,8 +1417,10 @@ class GetJobResponseBody extends $tea.Model {
             requestId: 'string',
             resourceId: 'string',
             resourceLevel: 'string',
+            restartTimes: 'string',
             settings: JobSettings,
             status: 'string',
+            subStatus: 'string',
             thirdpartyLibDir: 'string',
             thirdpartyLibs: { 'type': 'array', 'itemType': 'string' },
             userCommand: 'string',
@@ -1300,7 +1486,7 @@ class GetJobEventsResponseBody extends $tea.Model {
         return {
             events: { 'type': 'array', 'itemType': 'string' },
             jobId: 'string',
-            requestId: 'number',
+            requestId: 'string',
         };
     }
 }
@@ -2257,7 +2443,9 @@ class GetJobResponseBodyPodsHistoryPods extends $tea.Model {
             ip: 'Ip',
             podId: 'PodId',
             podUid: 'PodUid',
+            resourceType: 'ResourceType',
             status: 'Status',
+            subStatus: 'SubStatus',
             type: 'Type',
         };
     }
@@ -2269,7 +2457,9 @@ class GetJobResponseBodyPodsHistoryPods extends $tea.Model {
             ip: 'string',
             podId: 'string',
             podUid: 'string',
+            resourceType: 'string',
             status: 'string',
+            subStatus: 'string',
             type: 'string',
         };
     }
@@ -2288,7 +2478,9 @@ class GetJobResponseBodyPods extends $tea.Model {
             ip: 'Ip',
             podId: 'PodId',
             podUid: 'PodUid',
+            resourceType: 'ResourceType',
             status: 'Status',
+            subStatus: 'SubStatus',
             type: 'Type',
         };
     }
@@ -2301,7 +2493,9 @@ class GetJobResponseBodyPods extends $tea.Model {
             ip: 'string',
             podId: 'string',
             podUid: 'string',
+            resourceType: 'string',
             status: 'string',
+            subStatus: 'string',
             type: 'string',
         };
     }
@@ -2460,6 +2654,9 @@ class Client extends openapi_client_1.default {
     async createTensorboardWithOptions(request, headers, runtime) {
         tea_util_1.default.validateModel(request);
         let body = {};
+        if (!tea_util_1.default.isUnset(request.cpu)) {
+            body["Cpu"] = request.cpu;
+        }
         if (!tea_util_1.default.isUnset(request.dataSourceId)) {
             body["DataSourceId"] = request.dataSourceId;
         }
@@ -2478,6 +2675,9 @@ class Client extends openapi_client_1.default {
         if (!tea_util_1.default.isUnset(request.maxRunningTimeMinutes)) {
             body["MaxRunningTimeMinutes"] = request.maxRunningTimeMinutes;
         }
+        if (!tea_util_1.default.isUnset(request.memory)) {
+            body["Memory"] = request.memory;
+        }
         if (!tea_util_1.default.isUnset(request.options)) {
             body["Options"] = request.options;
         }
@@ -2571,9 +2771,15 @@ class Client extends openapi_client_1.default {
         let headers = {};
         return await this.deleteTensorboardWithOptions(TensorboardId, request, headers, runtime);
     }
-    async getJobWithOptions(JobId, headers, runtime) {
+    async getJobWithOptions(JobId, request, headers, runtime) {
+        tea_util_1.default.validateModel(request);
+        let query = {};
+        if (!tea_util_1.default.isUnset(request.needDetail)) {
+            query["NeedDetail"] = request.needDetail;
+        }
         let req = new $OpenApi.OpenApiRequest({
             headers: headers,
+            query: openapi_util_1.default.query(query),
         });
         let params = new $OpenApi.Params({
             action: "GetJob",
@@ -2588,10 +2794,10 @@ class Client extends openapi_client_1.default {
         });
         return $tea.cast(await this.callApi(params, req, runtime), new GetJobResponse({}));
     }
-    async getJob(JobId) {
+    async getJob(JobId, request) {
         let runtime = new $Util.RuntimeOptions({});
         let headers = {};
-        return await this.getJobWithOptions(JobId, headers, runtime);
+        return await this.getJobWithOptions(JobId, request, headers, runtime);
     }
     async getJobEventsWithOptions(JobId, request, headers, runtime) {
         tea_util_1.default.validateModel(request);