alibabacloud-ehpcinstant20230701 2.0.2__py3-none-any.whl → 2.0.4__py3-none-any.whl

alibabacloud_ehpcinstant20230701/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.2'
+__version__ = '2.0.4'

alibabacloud_ehpcinstant20230701/client.py

@@ -963,18 +963,24 @@ class Client(OpenApiClient):
 
     def get_image_with_options(
         self,
-        request: ehpc_instant_20230701_models.GetImageRequest,
+        tmp_req: ehpc_instant_20230701_models.GetImageRequest,
         runtime: util_models.RuntimeOptions,
     ) -> ehpc_instant_20230701_models.GetImageResponse:
         """
         @summary 查询托管侧镜像详情。
         
-        @param request: GetImageRequest
+        @param tmp_req: GetImageRequest
         @param runtime: runtime options for this request RuntimeOptions
         @return: GetImageResponse
         """
-        UtilClient.validate_model(request)
+        UtilClient.validate_model(tmp_req)
+        request = ehpc_instant_20230701_models.GetImageShrinkRequest()
+        OpenApiUtilClient.convert(tmp_req, request)
+        if not UtilClient.is_unset(tmp_req.additional_region_ids):
+            request.additional_region_ids_shrink = OpenApiUtilClient.array_to_string_with_specified_style(tmp_req.additional_region_ids, 'AdditionalRegionIds', 'json')
         query = {}
+        if not UtilClient.is_unset(request.additional_region_ids_shrink):
+            query['AdditionalRegionIds'] = request.additional_region_ids_shrink
         if not UtilClient.is_unset(request.image_category):
             query['ImageCategory'] = request.image_category
         if not UtilClient.is_unset(request.image_id):
@@ -1002,18 +1008,24 @@ class Client(OpenApiClient):
 
     async def get_image_with_options_async(
         self,
-        request: ehpc_instant_20230701_models.GetImageRequest,
+        tmp_req: ehpc_instant_20230701_models.GetImageRequest,
         runtime: util_models.RuntimeOptions,
     ) -> ehpc_instant_20230701_models.GetImageResponse:
         """
         @summary 查询托管侧镜像详情。
         
-        @param request: GetImageRequest
+        @param tmp_req: GetImageRequest
         @param runtime: runtime options for this request RuntimeOptions
         @return: GetImageResponse
         """
-        UtilClient.validate_model(request)
+        UtilClient.validate_model(tmp_req)
+        request = ehpc_instant_20230701_models.GetImageShrinkRequest()
+        OpenApiUtilClient.convert(tmp_req, request)
+        if not UtilClient.is_unset(tmp_req.additional_region_ids):
+            request.additional_region_ids_shrink = OpenApiUtilClient.array_to_string_with_specified_style(tmp_req.additional_region_ids, 'AdditionalRegionIds', 'json')
         query = {}
+        if not UtilClient.is_unset(request.additional_region_ids_shrink):
+            query['AdditionalRegionIds'] = request.additional_region_ids_shrink
         if not UtilClient.is_unset(request.image_category):
             query['ImageCategory'] = request.image_category
         if not UtilClient.is_unset(request.image_id):

alibabacloud_ehpcinstant20230701/models.py

@@ -397,11 +397,15 @@ class CreateJobRequestDeploymentPolicy(TeaModel):
         allocation_spec: str = None,
         level: str = None,
         network: CreateJobRequestDeploymentPolicyNetwork = None,
+        pool: str = None,
+        priority: int = None,
         tag: List[CreateJobRequestDeploymentPolicyTag] = None,
     ):
         self.allocation_spec = allocation_spec
         self.level = level
         self.network = network
+        self.pool = pool
+        self.priority = priority
         self.tag = tag
 
     def validate(self):
@@ -424,6 +428,10 @@ class CreateJobRequestDeploymentPolicy(TeaModel):
             result['Level'] = self.level
         if self.network is not None:
             result['Network'] = self.network.to_map()
+        if self.pool is not None:
+            result['Pool'] = self.pool
+        if self.priority is not None:
+            result['Priority'] = self.priority
         result['Tag'] = []
         if self.tag is not None:
             for k in self.tag:
@@ -439,6 +447,10 @@ class CreateJobRequestDeploymentPolicy(TeaModel):
         if m.get('Network') is not None:
             temp_model = CreateJobRequestDeploymentPolicyNetwork()
             self.network = temp_model.from_map(m['Network'])
+        if m.get('Pool') is not None:
+            self.pool = m.get('Pool')
+        if m.get('Priority') is not None:
+            self.priority = m.get('Priority')
         self.tag = []
         if m.get('Tag') is not None:
             for k in m.get('Tag'):
@@ -615,10 +627,12 @@ class CreateJobRequestTasksTaskSpecResource(TeaModel):
         self,
         cores: float = None,
         disks: List[CreateJobRequestTasksTaskSpecResourceDisks] = None,
+        instance_types: List[str] = None,
         memory: float = None,
     ):
         self.cores = cores
         self.disks = disks
+        self.instance_types = instance_types
         self.memory = memory
 
     def validate(self):
@@ -639,6 +653,8 @@ class CreateJobRequestTasksTaskSpecResource(TeaModel):
         if self.disks is not None:
             for k in self.disks:
                 result['Disks'].append(k.to_map() if k else None)
+        if self.instance_types is not None:
+            result['InstanceTypes'] = self.instance_types
         if self.memory is not None:
             result['Memory'] = self.memory
         return result
@@ -652,6 +668,8 @@ class CreateJobRequestTasksTaskSpecResource(TeaModel):
             for k in m.get('Disks'):
                 temp_model = CreateJobRequestTasksTaskSpecResourceDisks()
                 self.disks.append(temp_model.from_map(k))
+        if m.get('InstanceTypes') is not None:
+            self.instance_types = m.get('InstanceTypes')
         if m.get('Memory') is not None:
             self.memory = m.get('Memory')
         return self
@@ -694,12 +712,14 @@ class CreateJobRequestTasksTaskSpecTaskExecutorContainer(TeaModel):
     def __init__(
         self,
         app_id: str = None,
+        arg: List[str] = None,
         command: List[str] = None,
         environment_vars: List[CreateJobRequestTasksTaskSpecTaskExecutorContainerEnvironmentVars] = None,
         image: str = None,
         working_dir: str = None,
     ):
         self.app_id = app_id
+        self.arg = arg
         self.command = command
         self.environment_vars = environment_vars
         # This parameter is required.
@@ -720,6 +740,8 @@ class CreateJobRequestTasksTaskSpecTaskExecutorContainer(TeaModel):
         result = dict()
         if self.app_id is not None:
             result['AppId'] = self.app_id
+        if self.arg is not None:
+            result['Arg'] = self.arg
         if self.command is not None:
             result['Command'] = self.command
         result['EnvironmentVars'] = []
@@ -736,6 +758,8 @@ class CreateJobRequestTasksTaskSpecTaskExecutorContainer(TeaModel):
         m = m or dict()
         if m.get('AppId') is not None:
             self.app_id = m.get('AppId')
+        if m.get('Arg') is not None:
+            self.arg = m.get('Arg')
         if m.get('Command') is not None:
             self.command = m.get('Command')
         self.environment_vars = []
@@ -755,12 +779,14 @@ class CreateJobRequestTasksTaskSpecTaskExecutorVM(TeaModel):
         self,
         app_id: str = None,
         image: str = None,
+        password: str = None,
         prolog_script: str = None,
         script: str = None,
     ):
         self.app_id = app_id
         # This parameter is required.
         self.image = image
+        self.password = password
         self.prolog_script = prolog_script
         self.script = script
 
@@ -777,6 +803,8 @@ class CreateJobRequestTasksTaskSpecTaskExecutorVM(TeaModel):
             result['AppId'] = self.app_id
         if self.image is not None:
             result['Image'] = self.image
+        if self.password is not None:
+            result['Password'] = self.password
         if self.prolog_script is not None:
             result['PrologScript'] = self.prolog_script
         if self.script is not None:
@@ -789,6 +817,8 @@ class CreateJobRequestTasksTaskSpecTaskExecutorVM(TeaModel):
             self.app_id = m.get('AppId')
         if m.get('Image') is not None:
             self.image = m.get('Image')
+        if m.get('Password') is not None:
+            self.password = m.get('Password')
         if m.get('PrologScript') is not None:
             self.prolog_script = m.get('PrologScript')
         if m.get('Script') is not None:
@@ -839,10 +869,12 @@ class CreateJobRequestTasksTaskSpecVolumeMount(TeaModel):
         self,
         mount_options: str = None,
         mount_path: str = None,
+        read_only: bool = None,
         volume_driver: str = None,
     ):
         self.mount_options = mount_options
         self.mount_path = mount_path
+        self.read_only = read_only
         self.volume_driver = volume_driver
 
     def validate(self):
@@ -858,6 +890,8 @@ class CreateJobRequestTasksTaskSpecVolumeMount(TeaModel):
             result['MountOptions'] = self.mount_options
         if self.mount_path is not None:
             result['MountPath'] = self.mount_path
+        if self.read_only is not None:
+            result['ReadOnly'] = self.read_only
         if self.volume_driver is not None:
             result['VolumeDriver'] = self.volume_driver
         return result
@@ -868,6 +902,8 @@ class CreateJobRequestTasksTaskSpecVolumeMount(TeaModel):
             self.mount_options = m.get('MountOptions')
         if m.get('MountPath') is not None:
             self.mount_path = m.get('MountPath')
+        if m.get('ReadOnly') is not None:
+            self.read_only = m.get('ReadOnly')
         if m.get('VolumeDriver') is not None:
             self.volume_driver = m.get('VolumeDriver')
         return self
@@ -2291,12 +2327,13 @@ class GetAppVersionsResponse(TeaModel):
 class GetImageRequest(TeaModel):
     def __init__(
         self,
+        additional_region_ids: List[str] = None,
         image_category: str = None,
         image_id: str = None,
         image_type: str = None,
     ):
+        self.additional_region_ids = additional_region_ids
         self.image_category = image_category
-        # This parameter is required.
         self.image_id = image_id
         self.image_type = image_type
 
@@ -2309,6 +2346,8 @@ class GetImageRequest(TeaModel):
             return _map
 
         result = dict()
+        if self.additional_region_ids is not None:
+            result['AdditionalRegionIds'] = self.additional_region_ids
         if self.image_category is not None:
             result['ImageCategory'] = self.image_category
         if self.image_id is not None:
@@ -2319,6 +2358,8 @@ class GetImageRequest(TeaModel):
 
     def from_map(self, m: dict = None):
         m = m or dict()
+        if m.get('AdditionalRegionIds') is not None:
+            self.additional_region_ids = m.get('AdditionalRegionIds')
         if m.get('ImageCategory') is not None:
             self.image_category = m.get('ImageCategory')
         if m.get('ImageId') is not None:
@@ -2328,6 +2369,90 @@ class GetImageRequest(TeaModel):
         return self
 
 
+class GetImageShrinkRequest(TeaModel):
+    def __init__(
+        self,
+        additional_region_ids_shrink: str = None,
+        image_category: str = None,
+        image_id: str = None,
+        image_type: str = None,
+    ):
+        self.additional_region_ids_shrink = additional_region_ids_shrink
+        self.image_category = image_category
+        self.image_id = image_id
+        self.image_type = image_type
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.additional_region_ids_shrink is not None:
+            result['AdditionalRegionIds'] = self.additional_region_ids_shrink
+        if self.image_category is not None:
+            result['ImageCategory'] = self.image_category
+        if self.image_id is not None:
+            result['ImageId'] = self.image_id
+        if self.image_type is not None:
+            result['ImageType'] = self.image_type
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('AdditionalRegionIds') is not None:
+            self.additional_region_ids_shrink = m.get('AdditionalRegionIds')
+        if m.get('ImageCategory') is not None:
+            self.image_category = m.get('ImageCategory')
+        if m.get('ImageId') is not None:
+            self.image_id = m.get('ImageId')
+        if m.get('ImageType') is not None:
+            self.image_type = m.get('ImageType')
+        return self
+
+
+class GetImageResponseBodyImageAdditionalRegionsInfo(TeaModel):
+    def __init__(
+        self,
+        image_id: str = None,
+        region_id: str = None,
+        status: str = None,
+    ):
+        self.image_id = image_id
+        self.region_id = region_id
+        self.status = status
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.image_id is not None:
+            result['ImageId'] = self.image_id
+        if self.region_id is not None:
+            result['RegionId'] = self.region_id
+        if self.status is not None:
+            result['Status'] = self.status
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('ImageId') is not None:
+            self.image_id = m.get('ImageId')
+        if m.get('RegionId') is not None:
+            self.region_id = m.get('RegionId')
+        if m.get('Status') is not None:
+            self.status = m.get('Status')
+        return self
+
+
 class GetImageResponseBodyImageContainerImageSpecRegistryCredential(TeaModel):
     def __init__(
         self,
@@ -2525,6 +2650,7 @@ class GetImageResponseBodyImageVMImageSpec(TeaModel):
 class GetImageResponseBodyImage(TeaModel):
     def __init__(
         self,
+        additional_regions_info: List[GetImageResponseBodyImageAdditionalRegionsInfo] = None,
         app_id: str = None,
         container_image_spec: GetImageResponseBodyImageContainerImageSpec = None,
         create_time: str = None,
@@ -2537,6 +2663,7 @@ class GetImageResponseBodyImage(TeaModel):
         vmimage_spec: GetImageResponseBodyImageVMImageSpec = None,
         version: str = None,
     ):
+        self.additional_regions_info = additional_regions_info
         self.app_id = app_id
         self.container_image_spec = container_image_spec
         self.create_time = create_time
@@ -2551,6 +2678,10 @@ class GetImageResponseBodyImage(TeaModel):
         self.version = version
 
     def validate(self):
+        if self.additional_regions_info:
+            for k in self.additional_regions_info:
+                if k:
+                    k.validate()
         if self.container_image_spec:
             self.container_image_spec.validate()
         if self.document_info:
@@ -2564,6 +2695,10 @@ class GetImageResponseBodyImage(TeaModel):
             return _map
 
         result = dict()
+        result['AdditionalRegionsInfo'] = []
+        if self.additional_regions_info is not None:
+            for k in self.additional_regions_info:
+                result['AdditionalRegionsInfo'].append(k.to_map() if k else None)
         if self.app_id is not None:
             result['AppId'] = self.app_id
         if self.container_image_spec is not None:
@@ -2590,6 +2725,11 @@ class GetImageResponseBodyImage(TeaModel):
 
     def from_map(self, m: dict = None):
         m = m or dict()
+        self.additional_regions_info = []
+        if m.get('AdditionalRegionsInfo') is not None:
+            for k in m.get('AdditionalRegionsInfo'):
+                temp_model = GetImageResponseBodyImageAdditionalRegionsInfo()
+                self.additional_regions_info.append(temp_model.from_map(k))
         if m.get('AppId') is not None:
             self.app_id = m.get('AppId')
         if m.get('ContainerImageSpec') is not None:
@@ -3030,10 +3170,12 @@ class GetJobResponseBodyJobInfoTasksTaskSpecResource(TeaModel):
         self,
         cores: float = None,
         disks: List[GetJobResponseBodyJobInfoTasksTaskSpecResourceDisks] = None,
+        instance_types: List[str] = None,
         memory: int = None,
     ):
         self.cores = cores
         self.disks = disks
+        self.instance_types = instance_types
         self.memory = memory
 
     def validate(self):
@@ -3054,6 +3196,8 @@ class GetJobResponseBodyJobInfoTasksTaskSpecResource(TeaModel):
         if self.disks is not None:
             for k in self.disks:
                 result['Disks'].append(k.to_map() if k else None)
+        if self.instance_types is not None:
+            result['InstanceTypes'] = self.instance_types
         if self.memory is not None:
             result['Memory'] = self.memory
         return result
@@ -3067,6 +3211,8 @@ class GetJobResponseBodyJobInfoTasksTaskSpecResource(TeaModel):
             for k in m.get('Disks'):
                 temp_model = GetJobResponseBodyJobInfoTasksTaskSpecResourceDisks()
                 self.disks.append(temp_model.from_map(k))
+        if m.get('InstanceTypes') is not None:
+            self.instance_types = m.get('InstanceTypes')
         if m.get('Memory') is not None:
             self.memory = m.get('Memory')
         return self
@@ -3078,10 +3224,12 @@ class GetJobResponseBodyJobInfoTasksTaskSpecTaskExecutorVM(TeaModel):
         image: str = None,
         prolog_script: str = None,
         script: str = None,
+        user_name: str = None,
     ):
         self.image = image
         self.prolog_script = prolog_script
         self.script = script
+        self.user_name = user_name
 
     def validate(self):
         pass
@@ -3098,6 +3246,8 @@ class GetJobResponseBodyJobInfoTasksTaskSpecTaskExecutorVM(TeaModel):
             result['PrologScript'] = self.prolog_script
         if self.script is not None:
             result['Script'] = self.script
+        if self.user_name is not None:
+            result['UserName'] = self.user_name
         return result
 
     def from_map(self, m: dict = None):
@@ -3108,6 +3258,8 @@ class GetJobResponseBodyJobInfoTasksTaskSpecTaskExecutorVM(TeaModel):
             self.prolog_script = m.get('PrologScript')
         if m.get('Script') is not None:
             self.script = m.get('Script')
+        if m.get('UserName') is not None:
+            self.user_name = m.get('UserName')
         return self
 
 

{alibabacloud_ehpcinstant20230701-2.0.2.dist-info → alibabacloud_ehpcinstant20230701-2.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: alibabacloud-ehpcinstant20230701
-Version: 2.0.2
+Version: 2.0.4
 Summary: Alibaba Cloud EhpcInstant (20230701) SDK Library for Python
 Home-page: https://github.com/aliyun/alibabacloud-python-sdk
 Author: Alibaba Cloud SDK
@@ -21,7 +21,7 @@ Classifier: Topic :: Software Development
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: alibabacloud-endpoint-util (<1.0.0,>=0.0.3)
+Requires-Dist: alibabacloud-endpoint-util (<1.0.0,>=0.0.4)
 Requires-Dist: alibabacloud-openapi-util (<1.0.0,>=0.2.2)
 Requires-Dist: alibabacloud-tea-openapi (<1.0.0,>=0.3.15)
 Requires-Dist: alibabacloud-tea-util (<1.0.0,>=0.3.13)

alibabacloud_ehpcinstant20230701-2.0.4.dist-info/RECORD

@@ -0,0 +1,8 @@
+alibabacloud_ehpcinstant20230701/__init__.py,sha256=jqC1bY-kWG8sFN8e9uXLMX7-JLItJoVYGK55Mm3rfLM,21
+alibabacloud_ehpcinstant20230701/client.py,sha256=5Sk3yeNuQJfjR_S2i_M16okr9rDmRi-FGqsWnQtYYZo,93552
+alibabacloud_ehpcinstant20230701/models.py,sha256=U8jkiNtUo7sp_DtgUq9-FI18meyPe5vTii-ePPah9D0,202574
+alibabacloud_ehpcinstant20230701-2.0.4.dist-info/LICENSE,sha256=0CFItL6bHvxqS44T6vlLoW2R4Zaic304OO3WxN0oXF0,600
+alibabacloud_ehpcinstant20230701-2.0.4.dist-info/METADATA,sha256=fFrT0gZvsBJykHqwvT2nzqQ_M9ajayOwty3JoMxxuU0,2368
+alibabacloud_ehpcinstant20230701-2.0.4.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+alibabacloud_ehpcinstant20230701-2.0.4.dist-info/top_level.txt,sha256=2xOp8gwGZyTr4yO4gb1EEvC7CFiyZnvob-AgjZHkZJc,33
+alibabacloud_ehpcinstant20230701-2.0.4.dist-info/RECORD,,

alibabacloud_ehpcinstant20230701-2.0.2.dist-info/RECORD

@@ -1,8 +0,0 @@
-alibabacloud_ehpcinstant20230701/__init__.py,sha256=GAIRmJowMWRtWQeCyC7ifwuM8E1mb_c41kcL-Cp0kAc,21
-alibabacloud_ehpcinstant20230701/client.py,sha256=us5cb18qAX0U1-xaIah7h14-xFQJ1VkOfM5JIs3ANZM,92528
-alibabacloud_ehpcinstant20230701/models.py,sha256=Y7ZhMhXotSvzigeUEXJmE5h_5CmBYRCbRSqnjPmcYGQ,196886
-alibabacloud_ehpcinstant20230701-2.0.2.dist-info/LICENSE,sha256=0CFItL6bHvxqS44T6vlLoW2R4Zaic304OO3WxN0oXF0,600
-alibabacloud_ehpcinstant20230701-2.0.2.dist-info/METADATA,sha256=J6XJCmCNhnVMe8b1gz0zuNEe1n1lzHrJV4J1hCdwS_w,2368
-alibabacloud_ehpcinstant20230701-2.0.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-alibabacloud_ehpcinstant20230701-2.0.2.dist-info/top_level.txt,sha256=2xOp8gwGZyTr4yO4gb1EEvC7CFiyZnvob-AgjZHkZJc,33
-alibabacloud_ehpcinstant20230701-2.0.2.dist-info/RECORD,,