Merge "integration_2025-11-13_1083916009218" into "auto_scaling-Python-2020-01-01-online-1776-2025_11_04_14_26_06"

Conflicts:
pyproject.toml

Author: bytestarter

SDK_Integration_zh.md

@@ -13,6 +13,7 @@
   - [自定义RegionId](#自定义regionid)
   - [自动化Endpoint寻址](#自动化endpoint寻址)
     - [Endpoint默认寻址](#endpoint默认寻址)
+    - [Endpoint标准寻址](#endpoint标准寻址)
 - [Http连接池配置](#http连接池配置)
 - [Https请求配置](#https请求配置)
   - [指定scheme](#指定scheme)
@@ -415,6 +416,33 @@ configuration.custom_bootstrap_region = {
 volcenginesdkcore.Configuration.set_default(configuration)
 ```
 
+### Endpoint标准寻址
+**标准寻址规则**  
+
+| Global服务 | 双栈 | 格式                                                                                                               |
+|----------|----|------------------------------------------------------------------------------------------------------------------|
+| 是        | 是  | `{Service}.volcengine-api.com`                                                                                   |
+| 是        | 否  | `{Service}.volcengineapi.com`                                                                                    |
+| 否        | 是  | `{Service}.{region}.volcengine-api.com`|
+| 否        | 否  | `{Service}.{region}.volcengineapi.com` |
+
+**代码示例：**  
+
+是否global服务根据具体调用的服务决定的，是否global无法修改的。  
+可以参考列表：[./volcenginesdkcore/endpoint/providers/standard_provider.py#ServiceInfos](./volcenginesdkcore/endpoint/providers/standard_provider.py#L51)  
+```python
+import volcenginesdkcore
+from volcenginesdkcore.endpoint.providers.standard_provider import StandardEndpointResolver
+configuration = volcenginesdkcore.Configuration()
+configuration.ak = "Your ak"
+configuration.sk = "Your sk"
+configuration.endpoint_provider = StandardEndpointResolver() # 配置标准寻址
+configuration.use_dual_stack = True # 配置是否双栈
+configuration.region = "cn-beijing" # 配置region
+volcenginesdkcore.Configuration.set_default(configuration)
+```
+
+
 # Http连接池配置
 
 > **默认**  

pyproject.toml

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

volcenginesdkcdn/__init__.py

@@ -627,6 +627,7 @@
 from volcenginesdkcdn.models.submit_refresh_task_response import SubmitRefreshTaskResponse
 from volcenginesdkcdn.models.submit_unblock_task_request import SubmitUnblockTaskRequest
 from volcenginesdkcdn.models.submit_unblock_task_response import SubmitUnblockTaskResponse
+from volcenginesdkcdn.models.system_tag_for_list_resource_tags_output import SystemTagForListResourceTagsOutput
 from volcenginesdkcdn.models.target_query_components_for_add_cdn_domain_input import TargetQueryComponentsForAddCdnDomainInput
 from volcenginesdkcdn.models.target_query_components_for_batch_update_cdn_config_input import TargetQueryComponentsForBatchUpdateCdnConfigInput
 from volcenginesdkcdn.models.target_query_components_for_describe_cdn_config_output import TargetQueryComponentsForDescribeCdnConfigOutput

volcenginesdkcdn/models/__init__.py

@@ -623,6 +623,7 @@
 from volcenginesdkcdn.models.submit_refresh_task_response import SubmitRefreshTaskResponse
 from volcenginesdkcdn.models.submit_unblock_task_request import SubmitUnblockTaskRequest
 from volcenginesdkcdn.models.submit_unblock_task_response import SubmitUnblockTaskResponse
+from volcenginesdkcdn.models.system_tag_for_list_resource_tags_output import SystemTagForListResourceTagsOutput
 from volcenginesdkcdn.models.target_query_components_for_add_cdn_domain_input import TargetQueryComponentsForAddCdnDomainInput
 from volcenginesdkcdn.models.target_query_components_for_batch_update_cdn_config_input import TargetQueryComponentsForBatchUpdateCdnConfigInput
 from volcenginesdkcdn.models.target_query_components_for_describe_cdn_config_output import TargetQueryComponentsForDescribeCdnConfigOutput

volcenginesdkcdn/models/batch_deploy_cert_request.py

@@ -35,16 +35,18 @@ class BatchDeployCertRequest(object):
     swagger_types = {
         'cert_id': 'str',
         'cert_id2': 'str',
-        'domain': 'str'
+        'domain': 'str',
+        'target_config': 'str'
     }
 
     attribute_map = {
         'cert_id': 'CertId',
         'cert_id2': 'CertId2',
-        'domain': 'Domain'
+        'domain': 'Domain',
+        'target_config': 'TargetConfig'
     }
 
-    def __init__(self, cert_id=None, cert_id2=None, domain=None, _configuration=None):  # noqa: E501
+    def __init__(self, cert_id=None, cert_id2=None, domain=None, target_config=None, _configuration=None):  # noqa: E501
         """BatchDeployCertRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -53,12 +55,15 @@ def __init__(self, cert_id=None, cert_id2=None, domain=None, _configuration=None
         self._cert_id = None
         self._cert_id2 = None
         self._domain = None
+        self._target_config = None
         self.discriminator = None
 
         self.cert_id = cert_id
         if cert_id2 is not None:
             self.cert_id2 = cert_id2
         self.domain = domain
+        if target_config is not None:
+            self.target_config = target_config
 
     @property
     def cert_id(self):
@@ -127,6 +132,27 @@ def domain(self, domain):
 
         self._domain = domain
 
+    @property
+    def target_config(self):
+        """Gets the target_config of this BatchDeployCertRequest.  # noqa: E501
+
+
+        :return: The target_config of this BatchDeployCertRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._target_config
+
+    @target_config.setter
+    def target_config(self, target_config):
+        """Sets the target_config of this BatchDeployCertRequest.
+
+
+        :param target_config: The target_config of this BatchDeployCertRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._target_config = target_config
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

volcenginesdkcdn/models/data_for_describe_content_tasks_output.py

@@ -40,6 +40,7 @@ class DataForDescribeContentTasksOutput(object):
         'refresh_prefix': 'bool',
         'remark': 'str',
         'status': 'str',
+        'status_code': 'int',
         'task_id': 'str',
         'task_type': 'str',
         'url': 'str'
@@ -53,12 +54,13 @@ class DataForDescribeContentTasksOutput(object):
         'refresh_prefix': 'RefreshPrefix',
         'remark': 'Remark',
         'status': 'Status',
+        'status_code': 'StatusCode',
         'task_id': 'TaskID',
         'task_type': 'TaskType',
         'url': 'Url'
     }
 
-    def __init__(self, create_time=None, delete=None, layer=None, process=None, refresh_prefix=None, remark=None, status=None, task_id=None, task_type=None, url=None, _configuration=None):  # noqa: E501
+    def __init__(self, create_time=None, delete=None, layer=None, process=None, refresh_prefix=None, remark=None, status=None, status_code=None, task_id=None, task_type=None, url=None, _configuration=None):  # noqa: E501
         """DataForDescribeContentTasksOutput - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -71,6 +73,7 @@ def __init__(self, create_time=None, delete=None, layer=None, process=None, refr
         self._refresh_prefix = None
         self._remark = None
         self._status = None
+        self._status_code = None
         self._task_id = None
         self._task_type = None
         self._url = None
@@ -90,6 +93,8 @@ def __init__(self, create_time=None, delete=None, layer=None, process=None, refr
             self.remark = remark
         if status is not None:
             self.status = status
+        if status_code is not None:
+            self.status_code = status_code
         if task_id is not None:
             self.task_id = task_id
         if task_type is not None:
@@ -244,6 +249,27 @@ def status(self, status):
 
         self._status = status
 
+    @property
+    def status_code(self):
+        """Gets the status_code of this DataForDescribeContentTasksOutput.  # noqa: E501
+
+
+        :return: The status_code of this DataForDescribeContentTasksOutput.  # noqa: E501
+        :rtype: int
+        """
+        return self._status_code
+
+    @status_code.setter
+    def status_code(self, status_code):
+        """Sets the status_code of this DataForDescribeContentTasksOutput.
+
+
+        :param status_code: The status_code of this DataForDescribeContentTasksOutput.  # noqa: E501
+        :type: int
+        """
+
+        self._status_code = status_code
+
     @property
     def task_id(self):
         """Gets the task_id of this DataForDescribeContentTasksOutput.  # noqa: E501

volcenginesdkcdn/models/describe_cert_config_request.py

@@ -37,18 +37,20 @@ class DescribeCertConfigRequest(object):
         'cert_id2': 'str',
         'cert_type': 'str',
         'encry_type': 'str',
-        'status': 'str'
+        'status': 'str',
+        'target_config': 'str'
     }
 
     attribute_map = {
         'cert_id': 'CertId',
         'cert_id2': 'CertId2',
         'cert_type': 'CertType',
         'encry_type': 'EncryType',
-        'status': 'Status'
+        'status': 'Status',
+        'target_config': 'TargetConfig'
     }
 
-    def __init__(self, cert_id=None, cert_id2=None, cert_type=None, encry_type=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, cert_id=None, cert_id2=None, cert_type=None, encry_type=None, status=None, target_config=None, _configuration=None):  # noqa: E501
         """DescribeCertConfigRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -59,6 +61,7 @@ def __init__(self, cert_id=None, cert_id2=None, cert_type=None, encry_type=None,
         self._cert_type = None
         self._encry_type = None
         self._status = None
+        self._target_config = None
         self.discriminator = None
 
         self.cert_id = cert_id
@@ -70,6 +73,8 @@ def __init__(self, cert_id=None, cert_id2=None, cert_type=None, encry_type=None,
             self.encry_type = encry_type
         if status is not None:
             self.status = status
+        if target_config is not None:
+            self.target_config = target_config
 
     @property
     def cert_id(self):
@@ -178,6 +183,27 @@ def status(self, status):
 
         self._status = status
 
+    @property
+    def target_config(self):
+        """Gets the target_config of this DescribeCertConfigRequest.  # noqa: E501
+
+
+        :return: The target_config of this DescribeCertConfigRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._target_config
+
+    @target_config.setter
+    def target_config(self, target_config):
+        """Sets the target_config of this DescribeCertConfigRequest.
+
+
+        :param target_config: The target_config of this DescribeCertConfigRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._target_config = target_config
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

volcenginesdkcdn/models/describe_content_tasks_request.py

@@ -42,7 +42,8 @@ class DescribeContentTasksRequest(object):
         'status': 'str',
         'task_id': 'str',
         'task_type': 'str',
-        'url': 'str'
+        'url': 'str',
+        'url_list': 'list[str]'
     }
 
     attribute_map = {
@@ -55,10 +56,11 @@ class DescribeContentTasksRequest(object):
         'status': 'Status',
         'task_id': 'TaskID',
         'task_type': 'TaskType',
-        'url': 'Url'
+        'url': 'Url',
+        'url_list': 'UrlList'
     }
 
-    def __init__(self, domain_name=None, end_time=None, page_num=None, page_size=None, remark=None, start_time=None, status=None, task_id=None, task_type=None, url=None, _configuration=None):  # noqa: E501
+    def __init__(self, domain_name=None, end_time=None, page_num=None, page_size=None, remark=None, start_time=None, status=None, task_id=None, task_type=None, url=None, url_list=None, _configuration=None):  # noqa: E501
         """DescribeContentTasksRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -74,6 +76,7 @@ def __init__(self, domain_name=None, end_time=None, page_num=None, page_size=Non
         self._task_id = None
         self._task_type = None
         self._url = None
+        self._url_list = None
         self.discriminator = None
 
         if domain_name is not None:
@@ -95,6 +98,8 @@ def __init__(self, domain_name=None, end_time=None, page_num=None, page_size=Non
         self.task_type = task_type
         if url is not None:
             self.url = url
+        if url_list is not None:
+            self.url_list = url_list
 
     @property
     def domain_name(self):
@@ -308,6 +313,27 @@ def url(self, url):
 
         self._url = url
 
+    @property
+    def url_list(self):
+        """Gets the url_list of this DescribeContentTasksRequest.  # noqa: E501
+
+
+        :return: The url_list of this DescribeContentTasksRequest.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._url_list
+
+    @url_list.setter
+    def url_list(self, url_list):
+        """Sets the url_list of this DescribeContentTasksRequest.
+
+
+        :param url_list: The url_list of this DescribeContentTasksRequest.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._url_list = url_list
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

volcenginesdkcdn/models/feature_config_for_describe_cdn_config_output.py

@@ -33,24 +33,29 @@ class FeatureConfigForDescribeCdnConfigOutput(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'origin_v2': 'bool'
+        'origin_v2': 'bool',
+        'rule_engine': 'bool'
     }
 
     attribute_map = {
-        'origin_v2': 'OriginV2'
+        'origin_v2': 'OriginV2',
+        'rule_engine': 'RuleEngine'
     }
 
-    def __init__(self, origin_v2=None, _configuration=None):  # noqa: E501
+    def __init__(self, origin_v2=None, rule_engine=None, _configuration=None):  # noqa: E501
         """FeatureConfigForDescribeCdnConfigOutput - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
         self._origin_v2 = None
+        self._rule_engine = None
         self.discriminator = None
 
         if origin_v2 is not None:
             self.origin_v2 = origin_v2
+        if rule_engine is not None:
+            self.rule_engine = rule_engine
 
     @property
     def origin_v2(self):
@@ -73,6 +78,27 @@ def origin_v2(self, origin_v2):
 
         self._origin_v2 = origin_v2
 
+    @property
+    def rule_engine(self):
+        """Gets the rule_engine of this FeatureConfigForDescribeCdnConfigOutput.  # noqa: E501
+
+
+        :return: The rule_engine of this FeatureConfigForDescribeCdnConfigOutput.  # noqa: E501
+        :rtype: bool
+        """
+        return self._rule_engine
+
+    @rule_engine.setter
+    def rule_engine(self, rule_engine):
+        """Sets the rule_engine of this FeatureConfigForDescribeCdnConfigOutput.
+
+
+        :param rule_engine: The rule_engine of this FeatureConfigForDescribeCdnConfigOutput.  # noqa: E501
+        :type: bool
+        """
+
+        self._rule_engine = rule_engine
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}