Merge 'integration_2024-09-26_456241000194' into 'master'

merge branch integration_2024-09-26_456241000194 into master

See merge request: !393

Author: liuweiwei-xyz

meta.json

@@ -1,4 +1,4 @@
 {
-	"lasted": "1.0.102",
-	"meta_commit": "7fa59c76c8e4b7ce16fbe25739045ea42bef5b52"
+	"lasted": "1.0.103",
+	"meta_commit": "6d6a9aeba0b4536128f8f1f27b25c3fb1d661595"
 }

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "volcengine-python-sdk"
-VERSION = "1.0.102"
+VERSION = "1.0.103"
 # 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.102'
+        self.user_agent = 'volcstack-python-sdk/1.0.103'
         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.102".\
+               "SDK Package Version: 1.0.103".\
                format(env=sys.platform, pyversion=sys.version)

volcenginesdkrdsmssql/models/describe_backups_request.py

@@ -76,8 +76,10 @@ def __init__(self, backup_end_time=None, backup_id=None, backup_start_time=None,
         if backup_type is not None:
             self.backup_type = backup_type
         self.instance_id = instance_id
-        self.page_number = page_number
-        self.page_size = page_size
+        if page_number is not None:
+            self.page_number = page_number
+        if page_size is not None:
+            self.page_size = page_size
 
     @property
     def backup_end_time(self):
@@ -204,8 +206,6 @@ def page_number(self, page_number):
         :param page_number: The page_number of this DescribeBackupsRequest.  # noqa: E501
         :type: int
         """
-        if self._configuration.client_side_validation and page_number is None:
-            raise ValueError("Invalid value for `page_number`, must not be `None`")  # noqa: E501
 
         self._page_number = page_number
 
@@ -227,8 +227,6 @@ def page_size(self, page_size):
         :param page_size: The page_size of this DescribeBackupsRequest.  # noqa: E501
         :type: int
         """
-        if self._configuration.client_side_validation and page_size is None:
-            raise ValueError("Invalid value for `page_size`, must not be `None`")  # noqa: E501
 
         self._page_size = page_size
 

volcenginesdkrdsmssql/models/describe_db_instances_request.py

@@ -37,12 +37,14 @@ class DescribeDBInstancesRequest(object):
         'create_time_end': 'str',
         'create_time_start': 'str',
         'db_engine_version': 'str',
+        'instance_category': 'str',
         'instance_id': 'str',
         'instance_name': 'str',
         'instance_status': 'str',
         'instance_type': 'str',
         'page_number': 'int',
         'page_size': 'int',
+        'primary_instance_id': 'str',
         'tag_filters': 'list[TagFilterForDescribeDBInstancesInput]',
         'zone_id': 'str'
     }
@@ -52,17 +54,19 @@ class DescribeDBInstancesRequest(object):
         'create_time_end': 'CreateTimeEnd',
         'create_time_start': 'CreateTimeStart',
         'db_engine_version': 'DBEngineVersion',
+        'instance_category': 'InstanceCategory',
         'instance_id': 'InstanceId',
         'instance_name': 'InstanceName',
         'instance_status': 'InstanceStatus',
         'instance_type': 'InstanceType',
         'page_number': 'PageNumber',
         'page_size': 'PageSize',
+        'primary_instance_id': 'PrimaryInstanceId',
         'tag_filters': 'TagFilters',
         'zone_id': 'ZoneId'
     }
 
-    def __init__(self, charge_type=None, create_time_end=None, create_time_start=None, db_engine_version=None, instance_id=None, instance_name=None, instance_status=None, instance_type=None, page_number=None, page_size=None, tag_filters=None, zone_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, charge_type=None, create_time_end=None, create_time_start=None, db_engine_version=None, instance_category=None, instance_id=None, instance_name=None, instance_status=None, instance_type=None, page_number=None, page_size=None, primary_instance_id=None, tag_filters=None, zone_id=None, _configuration=None):  # noqa: E501
         """DescribeDBInstancesRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -72,12 +76,14 @@ def __init__(self, charge_type=None, create_time_end=None, create_time_start=Non
         self._create_time_end = None
         self._create_time_start = None
         self._db_engine_version = None
+        self._instance_category = None
         self._instance_id = None
         self._instance_name = None
         self._instance_status = None
         self._instance_type = None
         self._page_number = None
         self._page_size = None
+        self._primary_instance_id = None
         self._tag_filters = None
         self._zone_id = None
         self.discriminator = None
@@ -90,6 +96,8 @@ def __init__(self, charge_type=None, create_time_end=None, create_time_start=Non
             self.create_time_start = create_time_start
         if db_engine_version is not None:
             self.db_engine_version = db_engine_version
+        if instance_category is not None:
+            self.instance_category = instance_category
         if instance_id is not None:
             self.instance_id = instance_id
         if instance_name is not None:
@@ -102,6 +110,8 @@ def __init__(self, charge_type=None, create_time_end=None, create_time_start=Non
             self.page_number = page_number
         if page_size is not None:
             self.page_size = page_size
+        if primary_instance_id is not None:
+            self.primary_instance_id = primary_instance_id
         if tag_filters is not None:
             self.tag_filters = tag_filters
         if zone_id is not None:
@@ -191,6 +201,27 @@ def db_engine_version(self, db_engine_version):
 
         self._db_engine_version = db_engine_version
 
+    @property
+    def instance_category(self):
+        """Gets the instance_category of this DescribeDBInstancesRequest.  # noqa: E501
+
+
+        :return: The instance_category of this DescribeDBInstancesRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._instance_category
+
+    @instance_category.setter
+    def instance_category(self, instance_category):
+        """Sets the instance_category of this DescribeDBInstancesRequest.
+
+
+        :param instance_category: The instance_category of this DescribeDBInstancesRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._instance_category = instance_category
+
     @property
     def instance_id(self):
         """Gets the instance_id of this DescribeDBInstancesRequest.  # noqa: E501
@@ -317,6 +348,27 @@ def page_size(self, page_size):
 
         self._page_size = page_size
 
+    @property
+    def primary_instance_id(self):
+        """Gets the primary_instance_id of this DescribeDBInstancesRequest.  # noqa: E501
+
+
+        :return: The primary_instance_id of this DescribeDBInstancesRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._primary_instance_id
+
+    @primary_instance_id.setter
+    def primary_instance_id(self, primary_instance_id):
+        """Sets the primary_instance_id of this DescribeDBInstancesRequest.
+
+
+        :param primary_instance_id: The primary_instance_id of this DescribeDBInstancesRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._primary_instance_id = primary_instance_id
+
     @property
     def tag_filters(self):
         """Gets the tag_filters of this DescribeDBInstancesRequest.  # noqa: E501

volcenginesdkrdsmssql/models/describe_tos_restore_task_detail_request.py

@@ -55,8 +55,10 @@ def __init__(self, page_number=None, page_size=None, restore_task_id=None, _conf
         self._restore_task_id = None
         self.discriminator = None
 
-        self.page_number = page_number
-        self.page_size = page_size
+        if page_number is not None:
+            self.page_number = page_number
+        if page_size is not None:
+            self.page_size = page_size
         self.restore_task_id = restore_task_id
 
     @property
@@ -77,8 +79,6 @@ def page_number(self, page_number):
         :param page_number: The page_number of this DescribeTosRestoreTaskDetailRequest.  # noqa: E501
         :type: int
         """
-        if self._configuration.client_side_validation and page_number is None:
-            raise ValueError("Invalid value for `page_number`, must not be `None`")  # noqa: E501
 
         self._page_number = page_number
 
@@ -100,8 +100,6 @@ def page_size(self, page_size):
         :param page_size: The page_size of this DescribeTosRestoreTaskDetailRequest.  # noqa: E501
         :type: int
         """
-        if self._configuration.client_side_validation and page_size is None:
-            raise ValueError("Invalid value for `page_size`, must not be `None`")  # noqa: E501
 
         self._page_size = page_size
 

volcenginesdkrdsmssql/models/describe_tos_restore_tasks_request.py

@@ -68,8 +68,10 @@ def __init__(self, instance_id=None, instance_name=None, page_number=None, page_
             self.instance_id = instance_id
         if instance_name is not None:
             self.instance_name = instance_name
-        self.page_number = page_number
-        self.page_size = page_size
+        if page_number is not None:
+            self.page_number = page_number
+        if page_size is not None:
+            self.page_size = page_size
         if query_end_time is not None:
             self.query_end_time = query_end_time
         if query_start_time is not None:
@@ -135,8 +137,6 @@ def page_number(self, page_number):
         :param page_number: The page_number of this DescribeTosRestoreTasksRequest.  # noqa: E501
         :type: int
         """
-        if self._configuration.client_side_validation and page_number is None:
-            raise ValueError("Invalid value for `page_number`, must not be `None`")  # noqa: E501
 
         self._page_number = page_number
 
@@ -158,8 +158,6 @@ def page_size(self, page_size):
         :param page_size: The page_size of this DescribeTosRestoreTasksRequest.  # noqa: E501
         :type: int
         """
-        if self._configuration.client_side_validation and page_size is None:
-            raise ValueError("Invalid value for `page_size`, must not be `None`")  # noqa: E501
 
         self._page_size = page_size