Merge "integration_2025-12-22_1095718133250" into "graph-Python-2018-01-01-online-1944-2025_12_16_10_29_38"

Conflicts:
pyproject.toml

Author: bytestarter

SDK_Integration_zh.md

@@ -603,7 +603,7 @@ configuration.sk = "Your sk"
 # 全局配置
 configuration.auto_retry = True # 开启自动重试,默认开启
 configuration.num_max_retries = 4 # 最大重试次数，默认3次
-configuration.min_retry_delay_ms = 200 # 最小重试延迟毫秒，默认30毫秒
+configuration.min_retry_delay_ms = 200 # 最小重试延迟毫秒，默认300毫秒
 configuration.max_retry_delay_ms = 6000 # 最大重试延迟毫秒，默认300000毫秒
 configuration.backoff_strategy = ExponentialWithRandomJitterBackoffStrategy() # 重试策略，默认ExponentialWithRandomJitterBackoffStrategy
 configuration.retry_condition = DefaultRetryCondition() # 重试条件，默认DefaultRetryCondition
@@ -614,7 +614,7 @@ volcenginesdkcore.Configuration.set_default(configuration)
 runtime_options = RuntimeOption(
   auto_retry = True, # 开启自动重试,默认开启
   num_max_retries = 4, # 最大重试次数，默认3次
-  min_retry_delay_ms = 200, # 最小重试延迟毫秒，默认30毫秒
+  min_retry_delay_ms = 200, # 最小重试延迟毫秒，默认300毫秒
   max_retry_delay_ms = 6000, # 最大重试延迟毫秒，默认300000毫秒
   backoff_strategy = ExponentialWithRandomJitterBackoffStrategy(), # 重试策略，默认ExponentialWithRandomJitterBackoffStrategy
   retry_condition = DefaultRetryCondition(), # 重试条件，默认DefaultRetryCondition

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "volcengine-python-sdk"
-version = "4.0.43"
+version = "4.0.44"
 authors = [
     {name = "volc-engine", email = "[email protected]"},
 ]

volcenginesdkcore/api_client.py

@@ -154,6 +154,7 @@ def __call_api(
                     raise retry_err
                 break
             retry_count += 1
+            retry_err = None
 
         interceptor_context.response = Response(response_data)
         interceptor_context = self.interceptor_chain.execute_response(interceptor_context)

volcenginesdki18nopenapi/models/task_info_for_video_project_serial_task_create_input.py

@@ -35,12 +35,13 @@ class TaskInfoForVideoProjectSerialTaskCreateInput(object):
     swagger_types = {
         'ai_remove_type': 'str',
         'asr_model': 'int',
+        'bgm_policy': 'int',
         'comment': 'str',
         'deadline': 'int',
         'drama_cover_url': 'str',
         'drama_description': 'str',
         'drama_title': 'str',
-        'is_dub': 'int',
+        'is_dub': 'bool',
         'need_translate_cover': 'bool',
         'need_translate_desc': 'bool',
         'need_translate_title': 'bool',
@@ -56,6 +57,7 @@ class TaskInfoForVideoProjectSerialTaskCreateInput(object):
     attribute_map = {
         'ai_remove_type': 'aiRemoveType',
         'asr_model': 'asrModel',
+        'bgm_policy': 'bgmPolicy',
         'comment': 'comment',
         'deadline': 'deadline',
         'drama_cover_url': 'dramaCoverUrl',
@@ -74,14 +76,15 @@ class TaskInfoForVideoProjectSerialTaskCreateInput(object):
         'use_mt': 'useMT'
     }
 
-    def __init__(self, ai_remove_type=None, asr_model=None, comment=None, deadline=None, drama_cover_url=None, drama_description=None, drama_title=None, is_dub=None, need_translate_cover=None, need_translate_desc=None, need_translate_title=None, need_translate_title_and_desc=None, serial_number=None, source_lang=None, target_langs=None, target_style_map=None, task_name=None, use_mt=None, _configuration=None):  # noqa: E501
+    def __init__(self, ai_remove_type=None, asr_model=None, bgm_policy=None, comment=None, deadline=None, drama_cover_url=None, drama_description=None, drama_title=None, is_dub=None, need_translate_cover=None, need_translate_desc=None, need_translate_title=None, need_translate_title_and_desc=None, serial_number=None, source_lang=None, target_langs=None, target_style_map=None, task_name=None, use_mt=None, _configuration=None):  # noqa: E501
         """TaskInfoForVideoProjectSerialTaskCreateInput - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
         self._ai_remove_type = None
         self._asr_model = None
+        self._bgm_policy = None
         self._comment = None
         self._deadline = None
         self._drama_cover_url = None
@@ -104,6 +107,8 @@ def __init__(self, ai_remove_type=None, asr_model=None, comment=None, deadline=N
             self.ai_remove_type = ai_remove_type
         if asr_model is not None:
             self.asr_model = asr_model
+        if bgm_policy is not None:
+            self.bgm_policy = bgm_policy
         if comment is not None:
             self.comment = comment
         if deadline is not None:
@@ -179,6 +184,27 @@ def asr_model(self, asr_model):
 
         self._asr_model = asr_model
 
+    @property
+    def bgm_policy(self):
+        """Gets the bgm_policy of this TaskInfoForVideoProjectSerialTaskCreateInput.  # noqa: E501
+
+
+        :return: The bgm_policy of this TaskInfoForVideoProjectSerialTaskCreateInput.  # noqa: E501
+        :rtype: int
+        """
+        return self._bgm_policy
+
+    @bgm_policy.setter
+    def bgm_policy(self, bgm_policy):
+        """Sets the bgm_policy of this TaskInfoForVideoProjectSerialTaskCreateInput.
+
+
+        :param bgm_policy: The bgm_policy of this TaskInfoForVideoProjectSerialTaskCreateInput.  # noqa: E501
+        :type: int
+        """
+
+        self._bgm_policy = bgm_policy
+
     @property
     def comment(self):
         """Gets the comment of this TaskInfoForVideoProjectSerialTaskCreateInput.  # noqa: E501
@@ -290,7 +316,7 @@ def is_dub(self):
 
 
         :return: The is_dub of this TaskInfoForVideoProjectSerialTaskCreateInput.  # noqa: E501
-        :rtype: int
+        :rtype: bool
         """
         return self._is_dub
 
@@ -300,7 +326,7 @@ def is_dub(self, is_dub):
 
 
         :param is_dub: The is_dub of this TaskInfoForVideoProjectSerialTaskCreateInput.  # noqa: E501
-        :type: int
+        :type: bool
         """
 
         self._is_dub = is_dub

volcenginesdkkms/models/create_key_request.py

@@ -42,6 +42,7 @@ class CreateKeyRequest(object):
         'multi_region': 'bool',
         'origin': 'str',
         'protection_level': 'str',
+        'rotate_interval': 'int',
         'rotate_state': 'str',
         'tags': 'list[TagForCreateKeyInput]',
         'xks_key_id': 'str'
@@ -57,12 +58,13 @@ class CreateKeyRequest(object):
         'multi_region': 'MultiRegion',
         'origin': 'Origin',
         'protection_level': 'ProtectionLevel',
+        'rotate_interval': 'RotateInterval',
         'rotate_state': 'RotateState',
         'tags': 'Tags',
         'xks_key_id': 'XksKeyID'
     }
 
-    def __init__(self, custom_key_store_id=None, description=None, key_name=None, key_spec=None, key_usage=None, keyring_name=None, multi_region=None, origin=None, protection_level=None, rotate_state=None, tags=None, xks_key_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, custom_key_store_id=None, description=None, key_name=None, key_spec=None, key_usage=None, keyring_name=None, multi_region=None, origin=None, protection_level=None, rotate_interval=None, rotate_state=None, tags=None, xks_key_id=None, _configuration=None):  # noqa: E501
         """CreateKeyRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -77,6 +79,7 @@ def __init__(self, custom_key_store_id=None, description=None, key_name=None, ke
         self._multi_region = None
         self._origin = None
         self._protection_level = None
+        self._rotate_interval = None
         self._rotate_state = None
         self._tags = None
         self._xks_key_id = None
@@ -98,6 +101,8 @@ def __init__(self, custom_key_store_id=None, description=None, key_name=None, ke
             self.origin = origin
         if protection_level is not None:
             self.protection_level = protection_level
+        if rotate_interval is not None:
+            self.rotate_interval = rotate_interval
         if rotate_state is not None:
             self.rotate_state = rotate_state
         if tags is not None:
@@ -319,6 +324,33 @@ def protection_level(self, protection_level):
 
         self._protection_level = protection_level
 
+    @property
+    def rotate_interval(self):
+        """Gets the rotate_interval of this CreateKeyRequest.  # noqa: E501
+
+
+        :return: The rotate_interval of this CreateKeyRequest.  # noqa: E501
+        :rtype: int
+        """
+        return self._rotate_interval
+
+    @rotate_interval.setter
+    def rotate_interval(self, rotate_interval):
+        """Sets the rotate_interval of this CreateKeyRequest.
+
+
+        :param rotate_interval: The rotate_interval of this CreateKeyRequest.  # noqa: E501
+        :type: int
+        """
+        if (self._configuration.client_side_validation and
+                rotate_interval is not None and rotate_interval > 2560):  # noqa: E501
+            raise ValueError("Invalid value for `rotate_interval`, must be a value less than or equal to `2560`")  # noqa: E501
+        if (self._configuration.client_side_validation and
+                rotate_interval is not None and rotate_interval < 90):  # noqa: E501
+            raise ValueError("Invalid value for `rotate_interval`, must be a value greater than or equal to `90`")  # noqa: E501
+
+        self._rotate_interval = rotate_interval
+
     @property
     def rotate_state(self):
         """Gets the rotate_state of this CreateKeyRequest.  # noqa: E501

volcenginesdkkms/models/enable_key_rotation_request.py

@@ -35,16 +35,18 @@ class EnableKeyRotationRequest(object):
     swagger_types = {
         'key_id': 'str',
         'key_name': 'str',
-        'keyring_name': 'str'
+        'keyring_name': 'str',
+        'rotate_interval': 'int'
     }
 
     attribute_map = {
         'key_id': 'KeyID',
         'key_name': 'KeyName',
-        'keyring_name': 'KeyringName'
+        'keyring_name': 'KeyringName',
+        'rotate_interval': 'RotateInterval'
     }
 
-    def __init__(self, key_id=None, key_name=None, keyring_name=None, _configuration=None):  # noqa: E501
+    def __init__(self, key_id=None, key_name=None, keyring_name=None, rotate_interval=None, _configuration=None):  # noqa: E501
         """EnableKeyRotationRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -53,6 +55,7 @@ def __init__(self, key_id=None, key_name=None, keyring_name=None, _configuration
         self._key_id = None
         self._key_name = None
         self._keyring_name = None
+        self._rotate_interval = None
         self.discriminator = None
 
         if key_id is not None:
@@ -61,6 +64,8 @@ def __init__(self, key_id=None, key_name=None, keyring_name=None, _configuration
             self.key_name = key_name
         if keyring_name is not None:
             self.keyring_name = keyring_name
+        if rotate_interval is not None:
+            self.rotate_interval = rotate_interval
 
     @property
     def key_id(self):
@@ -137,6 +142,33 @@ def keyring_name(self, keyring_name):
 
         self._keyring_name = keyring_name
 
+    @property
+    def rotate_interval(self):
+        """Gets the rotate_interval of this EnableKeyRotationRequest.  # noqa: E501
+
+
+        :return: The rotate_interval of this EnableKeyRotationRequest.  # noqa: E501
+        :rtype: int
+        """
+        return self._rotate_interval
+
+    @rotate_interval.setter
+    def rotate_interval(self, rotate_interval):
+        """Sets the rotate_interval of this EnableKeyRotationRequest.
+
+
+        :param rotate_interval: The rotate_interval of this EnableKeyRotationRequest.  # noqa: E501
+        :type: int
+        """
+        if (self._configuration.client_side_validation and
+                rotate_interval is not None and rotate_interval > 2560):  # noqa: E501
+            raise ValueError("Invalid value for `rotate_interval`, must be a value less than or equal to `2560`")  # noqa: E501
+        if (self._configuration.client_side_validation and
+                rotate_interval is not None and rotate_interval < 90):  # noqa: E501
+            raise ValueError("Invalid value for `rotate_interval`, must be a value greater than or equal to `90`")  # noqa: E501
+
+        self._rotate_interval = rotate_interval
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}