Skip to content

Commit 73c87ae

Browse files
committed
Merge branch 'integration_2025-11-13_1083916009218' into vikingdb-Python-2025-06-09-online-1774-2025_11_04_10_25_49
2 parents d48003c + 8f1617c commit 73c87ae

File tree

445 files changed

+42954
-15625
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

445 files changed

+42954
-15625
lines changed

SDK_Integration_zh.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
- [自定义RegionId](#自定义regionid)
1414
- [自动化Endpoint寻址](#自动化endpoint寻址)
1515
- [Endpoint默认寻址](#endpoint默认寻址)
16+
- [Endpoint标准寻址](#endpoint标准寻址)
1617
- [Http连接池配置](#http连接池配置)
1718
- [Https请求配置](#https请求配置)
1819
- [指定scheme](#指定scheme)
@@ -415,6 +416,33 @@ configuration.custom_bootstrap_region = {
415416
volcenginesdkcore.Configuration.set_default(configuration)
416417
```
417418

419+
### Endpoint标准寻址
420+
**标准寻址规则**
421+
422+
| Global服务 | 双栈 | 格式 |
423+
|----------|----|------------------------------------------------------------------------------------------------------------------|
424+
||| `{Service}.volcengine-api.com` |
425+
||| `{Service}.volcengineapi.com` |
426+
||| `{Service}.{region}.volcengine-api.com`|
427+
||| `{Service}.{region}.volcengineapi.com` |
428+
429+
**代码示例:**
430+
431+
是否global服务根据具体调用的服务决定的,是否global无法修改的。
432+
可以参考列表:[./volcenginesdkcore/endpoint/providers/standard_provider.py#ServiceInfos](./volcenginesdkcore/endpoint/providers/standard_provider.py#L51)
433+
```python
434+
import volcenginesdkcore
435+
from volcenginesdkcore.endpoint.providers.standard_provider import StandardEndpointResolver
436+
configuration = volcenginesdkcore.Configuration()
437+
configuration.ak = "Your ak"
438+
configuration.sk = "Your sk"
439+
configuration.endpoint_provider = StandardEndpointResolver() # 配置标准寻址
440+
configuration.use_dual_stack = True # 配置是否双栈
441+
configuration.region = "cn-beijing" # 配置region
442+
volcenginesdkcore.Configuration.set_default(configuration)
443+
```
444+
445+
418446
# Http连接池配置
419447

420448
> **默认**

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "volcengine-python-sdk"
3-
version = "4.0.32"
3+
version = "4.0.34"
44
authors = [
55
{name = "volc-engine", email = "[email protected]"},
66
]

volcenginesdkautoscaling/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
from volcenginesdkautoscaling.models.alarm_policy_for_create_scaling_policy_input import AlarmPolicyForCreateScalingPolicyInput
2525
from volcenginesdkautoscaling.models.alarm_policy_for_describe_scaling_policies_output import AlarmPolicyForDescribeScalingPoliciesOutput
2626
from volcenginesdkautoscaling.models.alarm_policy_for_modify_scaling_policy_input import AlarmPolicyForModifyScalingPolicyInput
27-
from volcenginesdkautoscaling.models.attach_db_instances_request import AttachDBInstancesRequest
28-
from volcenginesdkautoscaling.models.attach_db_instances_response import AttachDBInstancesResponse
2927
from volcenginesdkautoscaling.models.attach_instances_request import AttachInstancesRequest
3028
from volcenginesdkautoscaling.models.attach_instances_response import AttachInstancesResponse
3129
from volcenginesdkautoscaling.models.attach_server_groups_request import AttachServerGroupsRequest
3230
from volcenginesdkautoscaling.models.attach_server_groups_response import AttachServerGroupsResponse
3331
from volcenginesdkautoscaling.models.complete_lifecycle_activity_request import CompleteLifecycleActivityRequest
3432
from volcenginesdkautoscaling.models.complete_lifecycle_activity_response import CompleteLifecycleActivityResponse
33+
from volcenginesdkautoscaling.models.condition_for_create_scaling_policy_input import ConditionForCreateScalingPolicyInput
3534
from volcenginesdkautoscaling.models.condition_for_describe_scaling_policies_output import ConditionForDescribeScalingPoliciesOutput
35+
from volcenginesdkautoscaling.models.condition_for_modify_scaling_policy_input import ConditionForModifyScalingPolicyInput
3636
from volcenginesdkautoscaling.models.create_lifecycle_hook_request import CreateLifecycleHookRequest
3737
from volcenginesdkautoscaling.models.create_lifecycle_hook_response import CreateLifecycleHookResponse
3838
from volcenginesdkautoscaling.models.create_notification_configuration_request import CreateNotificationConfigurationRequest
@@ -69,8 +69,6 @@
6969
from volcenginesdkautoscaling.models.describe_scaling_instances_response import DescribeScalingInstancesResponse
7070
from volcenginesdkautoscaling.models.describe_scaling_policies_request import DescribeScalingPoliciesRequest
7171
from volcenginesdkautoscaling.models.describe_scaling_policies_response import DescribeScalingPoliciesResponse
72-
from volcenginesdkautoscaling.models.detach_db_instances_request import DetachDBInstancesRequest
73-
from volcenginesdkautoscaling.models.detach_db_instances_response import DetachDBInstancesResponse
7472
from volcenginesdkautoscaling.models.detach_instances_request import DetachInstancesRequest
7573
from volcenginesdkautoscaling.models.detach_instances_response import DetachInstancesResponse
7674
from volcenginesdkautoscaling.models.detach_server_groups_request import DetachServerGroupsRequest

volcenginesdkautoscaling/api/auto_scaling_api.py

Lines changed: 0 additions & 194 deletions
Original file line numberDiff line numberDiff line change
@@ -33,103 +33,6 @@ def __init__(self, api_client=None):
3333
api_client = volcenginesdkcore.ApiClient()
3434
self.api_client = api_client
3535

36-
def attach_db_instances(self, body, **kwargs): # noqa: E501
37-
"""attach_db_instances # noqa: E501
38-
39-
This method makes a synchronous HTTP request by default. To make an
40-
asynchronous HTTP request, please pass async_req=True
41-
>>> thread = api.attach_db_instances(body, async_req=True)
42-
>>> result = thread.get()
43-
44-
:param async_req bool
45-
:param AttachDBInstancesRequest body: (required)
46-
:return: AttachDBInstancesResponse
47-
If the method is called asynchronously,
48-
returns the request thread.
49-
"""
50-
kwargs['_return_http_data_only'] = True
51-
if kwargs.get('async_req'):
52-
return self.attach_db_instances_with_http_info(body, **kwargs) # noqa: E501
53-
else:
54-
(data) = self.attach_db_instances_with_http_info(body, **kwargs) # noqa: E501
55-
return data
56-
57-
def attach_db_instances_with_http_info(self, body, **kwargs): # noqa: E501
58-
"""attach_db_instances # noqa: E501
59-
60-
This method makes a synchronous HTTP request by default. To make an
61-
asynchronous HTTP request, please pass async_req=True
62-
>>> thread = api.attach_db_instances_with_http_info(body, async_req=True)
63-
>>> result = thread.get()
64-
65-
:param async_req bool
66-
:param AttachDBInstancesRequest body: (required)
67-
:return: AttachDBInstancesResponse
68-
If the method is called asynchronously,
69-
returns the request thread.
70-
"""
71-
72-
all_params = ['body'] # noqa: E501
73-
all_params.append('async_req')
74-
all_params.append('_return_http_data_only')
75-
all_params.append('_preload_content')
76-
all_params.append('_request_timeout')
77-
78-
params = locals()
79-
for key, val in six.iteritems(params['kwargs']):
80-
if key not in all_params:
81-
raise TypeError(
82-
"Got an unexpected keyword argument '%s'"
83-
" to method attach_db_instances" % key
84-
)
85-
params[key] = val
86-
del params['kwargs']
87-
# verify the required parameter 'body' is set
88-
if self.api_client.client_side_validation and ('body' not in params or
89-
params['body'] is None): # noqa: E501
90-
raise ValueError("Missing the required parameter `body` when calling `attach_db_instances`") # noqa: E501
91-
92-
collection_formats = {}
93-
94-
path_params = {}
95-
96-
query_params = []
97-
98-
header_params = {}
99-
100-
form_params = []
101-
local_var_files = {}
102-
103-
body_params = None
104-
if 'body' in params:
105-
body_params = params['body']
106-
# HTTP header `Accept`
107-
header_params['Accept'] = self.api_client.select_header_accept(
108-
['application/json']) # noqa: E501
109-
110-
# HTTP header `Content-Type`
111-
header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501
112-
['text/plain']) # noqa: E501
113-
114-
# Authentication setting
115-
auth_settings = ['volcengineSign'] # noqa: E501
116-
117-
return self.api_client.call_api(
118-
'/AttachDBInstances/2020-01-01/auto_scaling/get/text_plain/', 'GET',
119-
path_params,
120-
query_params,
121-
header_params,
122-
body=body_params,
123-
post_params=form_params,
124-
files=local_var_files,
125-
response_type='AttachDBInstancesResponse', # noqa: E501
126-
auth_settings=auth_settings,
127-
async_req=params.get('async_req'),
128-
_return_http_data_only=params.get('_return_http_data_only'),
129-
_preload_content=params.get('_preload_content', True),
130-
_request_timeout=params.get('_request_timeout'),
131-
collection_formats=collection_formats)
132-
13336
def attach_instances(self, body, **kwargs): # noqa: E501
13437
"""attach_instances # noqa: E501
13538
@@ -2167,103 +2070,6 @@ def describe_scaling_policies_with_http_info(self, body, **kwargs): # noqa: E50
21672070
_request_timeout=params.get('_request_timeout'),
21682071
collection_formats=collection_formats)
21692072

2170-
def detach_db_instances(self, body, **kwargs): # noqa: E501
2171-
"""detach_db_instances # noqa: E501
2172-
2173-
This method makes a synchronous HTTP request by default. To make an
2174-
asynchronous HTTP request, please pass async_req=True
2175-
>>> thread = api.detach_db_instances(body, async_req=True)
2176-
>>> result = thread.get()
2177-
2178-
:param async_req bool
2179-
:param DetachDBInstancesRequest body: (required)
2180-
:return: DetachDBInstancesResponse
2181-
If the method is called asynchronously,
2182-
returns the request thread.
2183-
"""
2184-
kwargs['_return_http_data_only'] = True
2185-
if kwargs.get('async_req'):
2186-
return self.detach_db_instances_with_http_info(body, **kwargs) # noqa: E501
2187-
else:
2188-
(data) = self.detach_db_instances_with_http_info(body, **kwargs) # noqa: E501
2189-
return data
2190-
2191-
def detach_db_instances_with_http_info(self, body, **kwargs): # noqa: E501
2192-
"""detach_db_instances # noqa: E501
2193-
2194-
This method makes a synchronous HTTP request by default. To make an
2195-
asynchronous HTTP request, please pass async_req=True
2196-
>>> thread = api.detach_db_instances_with_http_info(body, async_req=True)
2197-
>>> result = thread.get()
2198-
2199-
:param async_req bool
2200-
:param DetachDBInstancesRequest body: (required)
2201-
:return: DetachDBInstancesResponse
2202-
If the method is called asynchronously,
2203-
returns the request thread.
2204-
"""
2205-
2206-
all_params = ['body'] # noqa: E501
2207-
all_params.append('async_req')
2208-
all_params.append('_return_http_data_only')
2209-
all_params.append('_preload_content')
2210-
all_params.append('_request_timeout')
2211-
2212-
params = locals()
2213-
for key, val in six.iteritems(params['kwargs']):
2214-
if key not in all_params:
2215-
raise TypeError(
2216-
"Got an unexpected keyword argument '%s'"
2217-
" to method detach_db_instances" % key
2218-
)
2219-
params[key] = val
2220-
del params['kwargs']
2221-
# verify the required parameter 'body' is set
2222-
if self.api_client.client_side_validation and ('body' not in params or
2223-
params['body'] is None): # noqa: E501
2224-
raise ValueError("Missing the required parameter `body` when calling `detach_db_instances`") # noqa: E501
2225-
2226-
collection_formats = {}
2227-
2228-
path_params = {}
2229-
2230-
query_params = []
2231-
2232-
header_params = {}
2233-
2234-
form_params = []
2235-
local_var_files = {}
2236-
2237-
body_params = None
2238-
if 'body' in params:
2239-
body_params = params['body']
2240-
# HTTP header `Accept`
2241-
header_params['Accept'] = self.api_client.select_header_accept(
2242-
['application/json']) # noqa: E501
2243-
2244-
# HTTP header `Content-Type`
2245-
header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501
2246-
['text/plain']) # noqa: E501
2247-
2248-
# Authentication setting
2249-
auth_settings = ['volcengineSign'] # noqa: E501
2250-
2251-
return self.api_client.call_api(
2252-
'/DetachDBInstances/2020-01-01/auto_scaling/get/text_plain/', 'GET',
2253-
path_params,
2254-
query_params,
2255-
header_params,
2256-
body=body_params,
2257-
post_params=form_params,
2258-
files=local_var_files,
2259-
response_type='DetachDBInstancesResponse', # noqa: E501
2260-
auth_settings=auth_settings,
2261-
async_req=params.get('async_req'),
2262-
_return_http_data_only=params.get('_return_http_data_only'),
2263-
_preload_content=params.get('_preload_content', True),
2264-
_request_timeout=params.get('_request_timeout'),
2265-
collection_formats=collection_formats)
2266-
22672073
def detach_instances(self, body, **kwargs): # noqa: E501
22682074
"""detach_instances # noqa: E501
22692075

volcenginesdkautoscaling/models/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
from volcenginesdkautoscaling.models.alarm_policy_for_create_scaling_policy_input import AlarmPolicyForCreateScalingPolicyInput
2121
from volcenginesdkautoscaling.models.alarm_policy_for_describe_scaling_policies_output import AlarmPolicyForDescribeScalingPoliciesOutput
2222
from volcenginesdkautoscaling.models.alarm_policy_for_modify_scaling_policy_input import AlarmPolicyForModifyScalingPolicyInput
23-
from volcenginesdkautoscaling.models.attach_db_instances_request import AttachDBInstancesRequest
24-
from volcenginesdkautoscaling.models.attach_db_instances_response import AttachDBInstancesResponse
2523
from volcenginesdkautoscaling.models.attach_instances_request import AttachInstancesRequest
2624
from volcenginesdkautoscaling.models.attach_instances_response import AttachInstancesResponse
2725
from volcenginesdkautoscaling.models.attach_server_groups_request import AttachServerGroupsRequest
2826
from volcenginesdkautoscaling.models.attach_server_groups_response import AttachServerGroupsResponse
2927
from volcenginesdkautoscaling.models.complete_lifecycle_activity_request import CompleteLifecycleActivityRequest
3028
from volcenginesdkautoscaling.models.complete_lifecycle_activity_response import CompleteLifecycleActivityResponse
29+
from volcenginesdkautoscaling.models.condition_for_create_scaling_policy_input import ConditionForCreateScalingPolicyInput
3130
from volcenginesdkautoscaling.models.condition_for_describe_scaling_policies_output import ConditionForDescribeScalingPoliciesOutput
31+
from volcenginesdkautoscaling.models.condition_for_modify_scaling_policy_input import ConditionForModifyScalingPolicyInput
3232
from volcenginesdkautoscaling.models.create_lifecycle_hook_request import CreateLifecycleHookRequest
3333
from volcenginesdkautoscaling.models.create_lifecycle_hook_response import CreateLifecycleHookResponse
3434
from volcenginesdkautoscaling.models.create_notification_configuration_request import CreateNotificationConfigurationRequest
@@ -65,8 +65,6 @@
6565
from volcenginesdkautoscaling.models.describe_scaling_instances_response import DescribeScalingInstancesResponse
6666
from volcenginesdkautoscaling.models.describe_scaling_policies_request import DescribeScalingPoliciesRequest
6767
from volcenginesdkautoscaling.models.describe_scaling_policies_response import DescribeScalingPoliciesResponse
68-
from volcenginesdkautoscaling.models.detach_db_instances_request import DetachDBInstancesRequest
69-
from volcenginesdkautoscaling.models.detach_db_instances_response import DetachDBInstancesResponse
7068
from volcenginesdkautoscaling.models.detach_instances_request import DetachInstancesRequest
7169
from volcenginesdkautoscaling.models.detach_instances_response import DetachInstancesResponse
7270
from volcenginesdkautoscaling.models.detach_server_groups_request import DetachServerGroupsRequest

volcenginesdkautoscaling/models/alarm_policy_condition_for_create_scaling_policy_input.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ def __init__(self, comparison_operator=None, metric_name=None, metric_unit=None,
6464
self.metric_name = metric_name
6565
if metric_unit is not None:
6666
self.metric_unit = metric_unit
67-
if threshold is not None:
68-
self.threshold = threshold
67+
self.threshold = threshold
6968

7069
@property
7170
def comparison_operator(self):
@@ -148,6 +147,8 @@ def threshold(self, threshold):
148147
:param threshold: The threshold of this AlarmPolicyConditionForCreateScalingPolicyInput. # noqa: E501
149148
:type: str
150149
"""
150+
if self._configuration.client_side_validation and threshold is None:
151+
raise ValueError("Invalid value for `threshold`, must not be `None`") # noqa: E501
151152

152153
self._threshold = threshold
153154

0 commit comments

Comments
 (0)