Merge branch 'ecs-Python-2020-04-01-online-485-2024_05_09_16_49_56' into 'master'

Ecs python 2020 04 01 online 485 2024 05 09 16 49 56

See merge request iaasng/volcengine-python-sdk!294

Author: volc-sdk-team

meta.json

@@ -1,4 +1,4 @@
 {
-	"lasted": "1.0.78",
-	"meta_commit": "b59de31606872af9acb9113fa227e1ad0cd42f98"
+	"lasted": "1.0.79",
+	"meta_commit": "47356c17fece2006e8b3a1348f420fdf1de04d4e"
 }

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "volcengine-python-sdk"
-VERSION = "1.0.78"
+VERSION = "1.0.79"
 # To install the library, run the following
 #
 # python setup.py install

volcenginesdkcore/api_client.py

@@ -67,7 +67,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'volcstack-python-sdk/1.0.78'
+        self.user_agent = 'volcstack-python-sdk/1.0.79'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):

volcenginesdkcore/configuration.py

@@ -221,5 +221,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 0.1.0\n"\
-               "SDK Package Version: 1.0.78".\
+               "SDK Package Version: 1.0.79".\
                format(env=sys.platform, pyversion=sys.version)

volcenginesdkecs/__init__.py

@@ -135,6 +135,9 @@
 from volcenginesdkecs.models.describe_zones_response import DescribeZonesResponse
 from volcenginesdkecs.models.detach_key_pair_request import DetachKeyPairRequest
 from volcenginesdkecs.models.detach_key_pair_response import DetachKeyPairResponse
+from volcenginesdkecs.models.detect_image_request import DetectImageRequest
+from volcenginesdkecs.models.detect_image_response import DetectImageResponse
+from volcenginesdkecs.models.detection_result_for_describe_images_output import DetectionResultForDescribeImagesOutput
 from volcenginesdkecs.models.disassociate_instances_iam_role_request import DisassociateInstancesIamRoleRequest
 from volcenginesdkecs.models.disassociate_instances_iam_role_response import DisassociateInstancesIamRoleResponse
 from volcenginesdkecs.models.eip_address_for_describe_instances_output import EipAddressForDescribeInstancesOutput
@@ -183,6 +186,7 @@
 from volcenginesdkecs.models.invocation_result_for_describe_invocation_results_output import InvocationResultForDescribeInvocationResultsOutput
 from volcenginesdkecs.models.invoke_command_request import InvokeCommandRequest
 from volcenginesdkecs.models.invoke_command_response import InvokeCommandResponse
+from volcenginesdkecs.models.item_for_describe_images_output import ItemForDescribeImagesOutput
 from volcenginesdkecs.models.key_pair_for_describe_key_pairs_output import KeyPairForDescribeKeyPairsOutput
 from volcenginesdkecs.models.local_volume_for_describe_instance_types_output import LocalVolumeForDescribeInstanceTypesOutput
 from volcenginesdkecs.models.local_volume_for_describe_instances_output import LocalVolumeForDescribeInstancesOutput
@@ -256,6 +260,7 @@
 from volcenginesdkecs.models.run_command_response import RunCommandResponse
 from volcenginesdkecs.models.run_instances_request import RunInstancesRequest
 from volcenginesdkecs.models.run_instances_response import RunInstancesResponse
+from volcenginesdkecs.models.snapshot_for_describe_images_output import SnapshotForDescribeImagesOutput
 from volcenginesdkecs.models.spot_price_for_describe_spot_price_history_output import SpotPriceForDescribeSpotPriceHistoryOutput
 from volcenginesdkecs.models.start_instance_request import StartInstanceRequest
 from volcenginesdkecs.models.start_instance_response import StartInstanceResponse

volcenginesdkecs/api/ecs_api.py

@@ -4980,6 +4980,103 @@ def detach_key_pair_with_http_info(self, body, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def detect_image(self, body, **kwargs):  # noqa: E501
+        """detect_image  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.detect_image(body, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param DetectImageRequest body: (required)
+        :return: DetectImageResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.detect_image_with_http_info(body, **kwargs)  # noqa: E501
+        else:
+            (data) = self.detect_image_with_http_info(body, **kwargs)  # noqa: E501
+            return data
+
+    def detect_image_with_http_info(self, body, **kwargs):  # noqa: E501
+        """detect_image  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.detect_image_with_http_info(body, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param DetectImageRequest body: (required)
+        :return: DetectImageResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method detect_image" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'body' is set
+        if self.api_client.client_side_validation and ('body' not in params or
+                                                       params['body'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `body` when calling `detect_image`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['text/plain'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['volcengineSign']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/DetectImage/2020-04-01/ecs/get/text_plain/', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='DetectImageResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def disassociate_instances_iam_role(self, body, **kwargs):  # noqa: E501
         """disassociate_instances_iam_role  # noqa: E501
 

volcenginesdkecs/models/__init__.py

@@ -131,6 +131,9 @@
 from volcenginesdkecs.models.describe_zones_response import DescribeZonesResponse
 from volcenginesdkecs.models.detach_key_pair_request import DetachKeyPairRequest
 from volcenginesdkecs.models.detach_key_pair_response import DetachKeyPairResponse
+from volcenginesdkecs.models.detect_image_request import DetectImageRequest
+from volcenginesdkecs.models.detect_image_response import DetectImageResponse
+from volcenginesdkecs.models.detection_result_for_describe_images_output import DetectionResultForDescribeImagesOutput
 from volcenginesdkecs.models.disassociate_instances_iam_role_request import DisassociateInstancesIamRoleRequest
 from volcenginesdkecs.models.disassociate_instances_iam_role_response import DisassociateInstancesIamRoleResponse
 from volcenginesdkecs.models.eip_address_for_describe_instances_output import EipAddressForDescribeInstancesOutput
@@ -179,6 +182,7 @@
 from volcenginesdkecs.models.invocation_result_for_describe_invocation_results_output import InvocationResultForDescribeInvocationResultsOutput
 from volcenginesdkecs.models.invoke_command_request import InvokeCommandRequest
 from volcenginesdkecs.models.invoke_command_response import InvokeCommandResponse
+from volcenginesdkecs.models.item_for_describe_images_output import ItemForDescribeImagesOutput
 from volcenginesdkecs.models.key_pair_for_describe_key_pairs_output import KeyPairForDescribeKeyPairsOutput
 from volcenginesdkecs.models.local_volume_for_describe_instance_types_output import LocalVolumeForDescribeInstanceTypesOutput
 from volcenginesdkecs.models.local_volume_for_describe_instances_output import LocalVolumeForDescribeInstancesOutput
@@ -252,6 +256,7 @@
 from volcenginesdkecs.models.run_command_response import RunCommandResponse
 from volcenginesdkecs.models.run_instances_request import RunInstancesRequest
 from volcenginesdkecs.models.run_instances_response import RunInstancesResponse
+from volcenginesdkecs.models.snapshot_for_describe_images_output import SnapshotForDescribeImagesOutput
 from volcenginesdkecs.models.spot_price_for_describe_spot_price_history_output import SpotPriceForDescribeSpotPriceHistoryOutput
 from volcenginesdkecs.models.start_instance_request import StartInstanceRequest
 from volcenginesdkecs.models.start_instance_response import StartInstanceResponse

volcenginesdkecs/models/create_image_request.py

@@ -36,19 +36,25 @@ class CreateImageRequest(object):
         'description': 'str',
         'image_name': 'str',
         'instance_id': 'str',
+        'need_detection': 'bool',
         'project_name': 'str',
+        'snapshot_group_id': 'str',
+        'snapshot_id': 'str',
         'tags': 'list[TagForCreateImageInput]'
     }
 
     attribute_map = {
         'description': 'Description',
         'image_name': 'ImageName',
         'instance_id': 'InstanceId',
+        'need_detection': 'NeedDetection',
         'project_name': 'ProjectName',
+        'snapshot_group_id': 'SnapshotGroupId',
+        'snapshot_id': 'SnapshotId',
         'tags': 'Tags'
     }
 
-    def __init__(self, description=None, image_name=None, instance_id=None, project_name=None, tags=None, _configuration=None):  # noqa: E501
+    def __init__(self, description=None, image_name=None, instance_id=None, need_detection=None, project_name=None, snapshot_group_id=None, snapshot_id=None, tags=None, _configuration=None):  # noqa: E501
         """CreateImageRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -57,16 +63,26 @@ def __init__(self, description=None, image_name=None, instance_id=None, project_
         self._description = None
         self._image_name = None
         self._instance_id = None
+        self._need_detection = None
         self._project_name = None
+        self._snapshot_group_id = None
+        self._snapshot_id = None
         self._tags = None
         self.discriminator = None
 
         if description is not None:
             self.description = description
         self.image_name = image_name
-        self.instance_id = instance_id
+        if instance_id is not None:
+            self.instance_id = instance_id
+        if need_detection is not None:
+            self.need_detection = need_detection
         if project_name is not None:
             self.project_name = project_name
+        if snapshot_group_id is not None:
+            self.snapshot_group_id = snapshot_group_id
+        if snapshot_id is not None:
+            self.snapshot_id = snapshot_id
         if tags is not None:
             self.tags = tags
 
@@ -132,11 +148,30 @@ def instance_id(self, instance_id):
         :param instance_id: The instance_id of this CreateImageRequest.  # noqa: E501
         :type: str
         """
-        if self._configuration.client_side_validation and instance_id is None:
-            raise ValueError("Invalid value for `instance_id`, must not be `None`")  # noqa: E501
 
         self._instance_id = instance_id
 
+    @property
+    def need_detection(self):
+        """Gets the need_detection of this CreateImageRequest.  # noqa: E501
+
+
+        :return: The need_detection of this CreateImageRequest.  # noqa: E501
+        :rtype: bool
+        """
+        return self._need_detection
+
+    @need_detection.setter
+    def need_detection(self, need_detection):
+        """Sets the need_detection of this CreateImageRequest.
+
+
+        :param need_detection: The need_detection of this CreateImageRequest.  # noqa: E501
+        :type: bool
+        """
+
+        self._need_detection = need_detection
+
     @property
     def project_name(self):
         """Gets the project_name of this CreateImageRequest.  # noqa: E501
@@ -158,6 +193,48 @@ def project_name(self, project_name):
 
         self._project_name = project_name
 
+    @property
+    def snapshot_group_id(self):
+        """Gets the snapshot_group_id of this CreateImageRequest.  # noqa: E501
+
+
+        :return: The snapshot_group_id of this CreateImageRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._snapshot_group_id
+
+    @snapshot_group_id.setter
+    def snapshot_group_id(self, snapshot_group_id):
+        """Sets the snapshot_group_id of this CreateImageRequest.
+
+
+        :param snapshot_group_id: The snapshot_group_id of this CreateImageRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._snapshot_group_id = snapshot_group_id
+
+    @property
+    def snapshot_id(self):
+        """Gets the snapshot_id of this CreateImageRequest.  # noqa: E501
+
+
+        :return: The snapshot_id of this CreateImageRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._snapshot_id
+
+    @snapshot_id.setter
+    def snapshot_id(self, snapshot_id):
+        """Sets the snapshot_id of this CreateImageRequest.
+
+
+        :param snapshot_id: The snapshot_id of this CreateImageRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._snapshot_id = snapshot_id
+
     @property
     def tags(self):
         """Gets the tags of this CreateImageRequest.  # noqa: E501

volcenginesdkecs/models/delete_images_request.py

@@ -33,25 +33,51 @@ class DeleteImagesRequest(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'delete_binded_snapshots': 'bool',
         'image_ids': 'list[str]'
     }
 
     attribute_map = {
+        'delete_binded_snapshots': 'DeleteBindedSnapshots',
         'image_ids': 'ImageIds'
     }
 
-    def __init__(self, image_ids=None, _configuration=None):  # noqa: E501
+    def __init__(self, delete_binded_snapshots=None, image_ids=None, _configuration=None):  # noqa: E501
         """DeleteImagesRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._delete_binded_snapshots = None
         self._image_ids = None
         self.discriminator = None
 
+        if delete_binded_snapshots is not None:
+            self.delete_binded_snapshots = delete_binded_snapshots
         if image_ids is not None:
             self.image_ids = image_ids
 
+    @property
+    def delete_binded_snapshots(self):
+        """Gets the delete_binded_snapshots of this DeleteImagesRequest.  # noqa: E501
+
+
+        :return: The delete_binded_snapshots of this DeleteImagesRequest.  # noqa: E501
+        :rtype: bool
+        """
+        return self._delete_binded_snapshots
+
+    @delete_binded_snapshots.setter
+    def delete_binded_snapshots(self, delete_binded_snapshots):
+        """Sets the delete_binded_snapshots of this DeleteImagesRequest.
+
+
+        :param delete_binded_snapshots: The delete_binded_snapshots of this DeleteImagesRequest.  # noqa: E501
+        :type: bool
+        """
+
+        self._delete_binded_snapshots = delete_binded_snapshots
+
     @property
     def image_ids(self):
         """Gets the image_ids of this DeleteImagesRequest.  # noqa: E501