Skip to content

Commit 0a9106a

Browse files
committed
Merge 'integration_2026-04-02_1133150144002' into 'master'
merge branch integration_2026-04-02_1133150144002 into master See merge request: !1137
2 parents 7f7473f + 0c3abc8 commit 0a9106a

282 files changed

Lines changed: 47704 additions & 1492 deletions

File tree

Some content is hidden

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

meta.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"lasted": "5.0.21",
3-
"meta_commit": "4d23faddbb490000d3c4c575c97cafd7a4091f59"
2+
"lasted": "5.0.22",
3+
"meta_commit": "3e0f2fd9c3a0a6f68773d1e56dc888b5dd0ceb40"
44
}

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 = "5.0.21"
3+
version = "5.0.22"
44
authors = [
55
{name = "volc-engine", email = "volc-sdk-team@bytedance.com"},
66
]

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from setuptools import setup, find_packages # noqa: H301
44

55
NAME = "volcengine-python-sdk"
6-
VERSION = "5.0.21"
6+
VERSION = "5.0.22"
77
# To install the library, run the following
88
#
99
# python setup.py install

volcenginesdkbilling/models/instance_list_for_list_available_instances_output.py

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ class InstanceListForListAvailableInstancesOutput(object):
4141
'instance_name': 'str',
4242
'payment_method': 'str',
4343
'product': 'str',
44+
'product_name': 'str',
4445
'remain_renew_times': 'str',
4546
'renew_type': 'str',
4647
'renewal_duration_unit': 'str',
@@ -58,6 +59,7 @@ class InstanceListForListAvailableInstancesOutput(object):
5859
'instance_name': 'InstanceName',
5960
'payment_method': 'PaymentMethod',
6061
'product': 'Product',
62+
'product_name': 'ProductName',
6163
'remain_renew_times': 'RemainRenewTimes',
6264
'renew_type': 'RenewType',
6365
'renewal_duration_unit': 'RenewalDurationUnit',
@@ -66,7 +68,7 @@ class InstanceListForListAvailableInstancesOutput(object):
6668
'sub_status': 'SubStatus'
6769
}
6870

69-
def __init__(self, account_id=None, begin_time=None, configuration_code=None, expired_time=None, instance_id=None, instance_name=None, payment_method=None, product=None, remain_renew_times=None, renew_type=None, renewal_duration_unit=None, renewal_times=None, status=None, sub_status=None, _configuration=None): # noqa: E501
71+
def __init__(self, account_id=None, begin_time=None, configuration_code=None, expired_time=None, instance_id=None, instance_name=None, payment_method=None, product=None, product_name=None, remain_renew_times=None, renew_type=None, renewal_duration_unit=None, renewal_times=None, status=None, sub_status=None, _configuration=None): # noqa: E501
7072
"""InstanceListForListAvailableInstancesOutput - a model defined in Swagger""" # noqa: E501
7173
if _configuration is None:
7274
_configuration = Configuration()
@@ -80,6 +82,7 @@ def __init__(self, account_id=None, begin_time=None, configuration_code=None, ex
8082
self._instance_name = None
8183
self._payment_method = None
8284
self._product = None
85+
self._product_name = None
8386
self._remain_renew_times = None
8487
self._renew_type = None
8588
self._renewal_duration_unit = None
@@ -104,6 +107,8 @@ def __init__(self, account_id=None, begin_time=None, configuration_code=None, ex
104107
self.payment_method = payment_method
105108
if product is not None:
106109
self.product = product
110+
if product_name is not None:
111+
self.product_name = product_name
107112
if remain_renew_times is not None:
108113
self.remain_renew_times = remain_renew_times
109114
if renew_type is not None:
@@ -285,6 +290,27 @@ def product(self, product):
285290

286291
self._product = product
287292

293+
@property
294+
def product_name(self):
295+
"""Gets the product_name of this InstanceListForListAvailableInstancesOutput. # noqa: E501
296+
297+
298+
:return: The product_name of this InstanceListForListAvailableInstancesOutput. # noqa: E501
299+
:rtype: str
300+
"""
301+
return self._product_name
302+
303+
@product_name.setter
304+
def product_name(self, product_name):
305+
"""Sets the product_name of this InstanceListForListAvailableInstancesOutput.
306+
307+
308+
:param product_name: The product_name of this InstanceListForListAvailableInstancesOutput. # noqa: E501
309+
:type: str
310+
"""
311+
312+
self._product_name = product_name
313+
288314
@property
289315
def remain_renew_times(self):
290316
"""Gets the remain_renew_times of this InstanceListForListAvailableInstancesOutput. # noqa: E501

volcenginesdkcore/api_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
6464
self.default_headers[header_name] = header_value
6565
self.cookie = cookie
6666
# Set default User-Agent.
67-
self.user_agent = 'volcstack-python-sdk/5.0.21'
67+
self.user_agent = 'volcstack-python-sdk/5.0.22'
6868
self.client_side_validation = configuration.client_side_validation
6969

7070
self.interceptor_chain = InterceptorChain()

volcenginesdkcore/configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ def to_debug_report(self):
291291
"OS: {env}\n" \
292292
"Python Version: {pyversion}\n" \
293293
"Version of the API: 0.1.0\n" \
294-
"SDK Package Version: 5.0.21".\
294+
"SDK Package Version: 5.0.22".\
295295
format(env=sys.platform, pyversion=sys.version)
296296

297297
@property

volcenginesdkcore/feature/rds/connect_utils.py

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,22 @@ def build_auth_token(api_client, db_user, instance_id, expires=None):
6767
request.service = DEFAULT_SERVICE
6868
request.is_presign = True
6969

70-
# Create interceptor chain:
71-
# ResolveEndpointInterceptor - resolves endpoint + scheme
72-
# SignRequestInterceptor - presign URL signing
73-
chain = InterceptorChain()
74-
chain.append_request_interceptor(ResolveEndpointInterceptor())
75-
chain.append_request_interceptor(SignRequestInterceptor())
76-
7770
context = InterceptorContext(request=request)
78-
context = chain.execute_request(context)
7971

80-
return '{url}?{query}'.format(url=context.request.url, query=context.request.signed_query)
72+
# Step 1: Resolve endpoint to get host
73+
resolve_chain = InterceptorChain()
74+
resolve_chain.append_request_interceptor(ResolveEndpointInterceptor())
75+
context = resolve_chain.execute_request(context)
76+
77+
# Step 2: Save resolved host to X-Host query param, then clear host so it won't be signed
78+
resolved_host = context.request.host
79+
context.request.query_params['X-Host'] = '{scheme}://{host}'.format(
80+
scheme=context.request.scheme, host=resolved_host)
81+
context.request.host = None
82+
83+
# Step 3: Sign request (host is None, won't be included in signature)
84+
sign_chain = InterceptorChain()
85+
sign_chain.append_request_interceptor(SignRequestInterceptor())
86+
context = sign_chain.execute_request(context)
87+
88+
return context.request.signed_query

volcenginesdkfilenas/__init__.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
from volcenginesdkfilenas.models.create_permission_group_response import CreatePermissionGroupResponse
4444
from volcenginesdkfilenas.models.create_pre_signed_url_request import CreatePreSignedUrlRequest
4545
from volcenginesdkfilenas.models.create_pre_signed_url_response import CreatePreSignedUrlResponse
46-
from volcenginesdkfilenas.models.create_reserved_capacity_request import CreateReservedCapacityRequest
47-
from volcenginesdkfilenas.models.create_reserved_capacity_response import CreateReservedCapacityResponse
4846
from volcenginesdkfilenas.models.create_snapshot_request import CreateSnapshotRequest
4947
from volcenginesdkfilenas.models.create_snapshot_response import CreateSnapshotResponse
5048
from volcenginesdkfilenas.models.data_flow_for_describe_data_flows_output import DataFlowForDescribeDataFlowsOutput
@@ -61,6 +59,10 @@
6159
from volcenginesdkfilenas.models.delete_mount_point_response import DeleteMountPointResponse
6260
from volcenginesdkfilenas.models.delete_permission_group_request import DeletePermissionGroupRequest
6361
from volcenginesdkfilenas.models.delete_permission_group_response import DeletePermissionGroupResponse
62+
from volcenginesdkfilenas.models.delete_policy_for_create_data_flow_task_input import DeletePolicyForCreateDataFlowTaskInput
63+
from volcenginesdkfilenas.models.delete_policy_for_describe_data_flow_tasks_output import DeletePolicyForDescribeDataFlowTasksOutput
64+
from volcenginesdkfilenas.models.delete_rule_info_for_create_data_flow_task_input import DeleteRuleInfoForCreateDataFlowTaskInput
65+
from volcenginesdkfilenas.models.delete_rule_info_for_describe_data_flow_tasks_output import DeleteRuleInfoForDescribeDataFlowTasksOutput
6466
from volcenginesdkfilenas.models.delete_snapshot_request import DeleteSnapshotRequest
6567
from volcenginesdkfilenas.models.delete_snapshot_response import DeleteSnapshotResponse
6668
from volcenginesdkfilenas.models.describe_access_points_request import DescribeAccessPointsRequest
@@ -87,8 +89,6 @@
8789
from volcenginesdkfilenas.models.describe_permission_rules_response import DescribePermissionRulesResponse
8890
from volcenginesdkfilenas.models.describe_regions_request import DescribeRegionsRequest
8991
from volcenginesdkfilenas.models.describe_regions_response import DescribeRegionsResponse
90-
from volcenginesdkfilenas.models.describe_reserved_capacitys_request import DescribeReservedCapacitysRequest
91-
from volcenginesdkfilenas.models.describe_reserved_capacitys_response import DescribeReservedCapacitysResponse
9292
from volcenginesdkfilenas.models.describe_snapshots_request import DescribeSnapshotsRequest
9393
from volcenginesdkfilenas.models.describe_snapshots_response import DescribeSnapshotsResponse
9494
from volcenginesdkfilenas.models.describe_zones_request import DescribeZonesRequest
@@ -143,7 +143,6 @@
143143
from volcenginesdkfilenas.models.posix_user_for_create_access_point_input import PosixUserForCreateAccessPointInput
144144
from volcenginesdkfilenas.models.posix_user_for_describe_access_points_output import PosixUserForDescribeAccessPointsOutput
145145
from volcenginesdkfilenas.models.region_for_describe_regions_output import RegionForDescribeRegionsOutput
146-
from volcenginesdkfilenas.models.reserved_capacity_for_describe_reserved_capacitys_output import ReservedCapacityForDescribeReservedCapacitysOutput
147146
from volcenginesdkfilenas.models.root_path_permission_for_create_access_point_input import RootPathPermissionForCreateAccessPointInput
148147
from volcenginesdkfilenas.models.root_path_permission_for_describe_access_points_output import RootPathPermissionForDescribeAccessPointsOutput
149148
from volcenginesdkfilenas.models.sale_for_describe_zones_output import SaleForDescribeZonesOutput

volcenginesdkfilenas/api/filenas_api.py

Lines changed: 0 additions & 194 deletions
Original file line numberDiff line numberDiff line change
@@ -906,103 +906,6 @@ def create_pre_signed_url_with_http_info(self, body, **kwargs): # noqa: E501
906906
_request_timeout=params.get('_request_timeout'),
907907
collection_formats=collection_formats)
908908

909-
def create_reserved_capacity(self, body, **kwargs): # noqa: E501
910-
"""create_reserved_capacity # noqa: E501
911-
912-
This method makes a synchronous HTTP request by default. To make an
913-
asynchronous HTTP request, please pass async_req=True
914-
>>> thread = api.create_reserved_capacity(body, async_req=True)
915-
>>> result = thread.get()
916-
917-
:param async_req bool
918-
:param CreateReservedCapacityRequest body: (required)
919-
:return: CreateReservedCapacityResponse
920-
If the method is called asynchronously,
921-
returns the request thread.
922-
"""
923-
kwargs['_return_http_data_only'] = True
924-
if kwargs.get('async_req'):
925-
return self.create_reserved_capacity_with_http_info(body, **kwargs) # noqa: E501
926-
else:
927-
(data) = self.create_reserved_capacity_with_http_info(body, **kwargs) # noqa: E501
928-
return data
929-
930-
def create_reserved_capacity_with_http_info(self, body, **kwargs): # noqa: E501
931-
"""create_reserved_capacity # noqa: E501
932-
933-
This method makes a synchronous HTTP request by default. To make an
934-
asynchronous HTTP request, please pass async_req=True
935-
>>> thread = api.create_reserved_capacity_with_http_info(body, async_req=True)
936-
>>> result = thread.get()
937-
938-
:param async_req bool
939-
:param CreateReservedCapacityRequest body: (required)
940-
:return: CreateReservedCapacityResponse
941-
If the method is called asynchronously,
942-
returns the request thread.
943-
"""
944-
945-
all_params = ['body'] # noqa: E501
946-
all_params.append('async_req')
947-
all_params.append('_return_http_data_only')
948-
all_params.append('_preload_content')
949-
all_params.append('_request_timeout')
950-
951-
params = locals()
952-
for key, val in six.iteritems(params['kwargs']):
953-
if key not in all_params:
954-
raise TypeError(
955-
"Got an unexpected keyword argument '%s'"
956-
" to method create_reserved_capacity" % key
957-
)
958-
params[key] = val
959-
del params['kwargs']
960-
# verify the required parameter 'body' is set
961-
if self.api_client.client_side_validation and ('body' not in params or
962-
params['body'] is None): # noqa: E501
963-
raise ValueError("Missing the required parameter `body` when calling `create_reserved_capacity`") # noqa: E501
964-
965-
collection_formats = {}
966-
967-
path_params = {}
968-
969-
query_params = []
970-
971-
header_params = {}
972-
973-
form_params = []
974-
local_var_files = {}
975-
976-
body_params = None
977-
if 'body' in params:
978-
body_params = params['body']
979-
# HTTP header `Accept`
980-
header_params['Accept'] = self.api_client.select_header_accept(
981-
['application/json']) # noqa: E501
982-
983-
# HTTP header `Content-Type`
984-
header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501
985-
['application/json']) # noqa: E501
986-
987-
# Authentication setting
988-
auth_settings = ['volcengineSign'] # noqa: E501
989-
990-
return self.api_client.call_api(
991-
'/CreateReservedCapacity/2022-01-01/filenas/post/application_json/', 'POST',
992-
path_params,
993-
query_params,
994-
header_params,
995-
body=body_params,
996-
post_params=form_params,
997-
files=local_var_files,
998-
response_type='CreateReservedCapacityResponse', # noqa: E501
999-
auth_settings=auth_settings,
1000-
async_req=params.get('async_req'),
1001-
_return_http_data_only=params.get('_return_http_data_only'),
1002-
_preload_content=params.get('_preload_content', True),
1003-
_request_timeout=params.get('_request_timeout'),
1004-
collection_formats=collection_formats)
1005-
1006909
def create_snapshot(self, body, **kwargs): # noqa: E501
1007910
"""create_snapshot # noqa: E501
1008911
@@ -2943,103 +2846,6 @@ def describe_regions_with_http_info(self, body, **kwargs): # noqa: E501
29432846
_request_timeout=params.get('_request_timeout'),
29442847
collection_formats=collection_formats)
29452848

2946-
def describe_reserved_capacitys(self, body, **kwargs): # noqa: E501
2947-
"""describe_reserved_capacitys # noqa: E501
2948-
2949-
This method makes a synchronous HTTP request by default. To make an
2950-
asynchronous HTTP request, please pass async_req=True
2951-
>>> thread = api.describe_reserved_capacitys(body, async_req=True)
2952-
>>> result = thread.get()
2953-
2954-
:param async_req bool
2955-
:param DescribeReservedCapacitysRequest body: (required)
2956-
:return: DescribeReservedCapacitysResponse
2957-
If the method is called asynchronously,
2958-
returns the request thread.
2959-
"""
2960-
kwargs['_return_http_data_only'] = True
2961-
if kwargs.get('async_req'):
2962-
return self.describe_reserved_capacitys_with_http_info(body, **kwargs) # noqa: E501
2963-
else:
2964-
(data) = self.describe_reserved_capacitys_with_http_info(body, **kwargs) # noqa: E501
2965-
return data
2966-
2967-
def describe_reserved_capacitys_with_http_info(self, body, **kwargs): # noqa: E501
2968-
"""describe_reserved_capacitys # noqa: E501
2969-
2970-
This method makes a synchronous HTTP request by default. To make an
2971-
asynchronous HTTP request, please pass async_req=True
2972-
>>> thread = api.describe_reserved_capacitys_with_http_info(body, async_req=True)
2973-
>>> result = thread.get()
2974-
2975-
:param async_req bool
2976-
:param DescribeReservedCapacitysRequest body: (required)
2977-
:return: DescribeReservedCapacitysResponse
2978-
If the method is called asynchronously,
2979-
returns the request thread.
2980-
"""
2981-
2982-
all_params = ['body'] # noqa: E501
2983-
all_params.append('async_req')
2984-
all_params.append('_return_http_data_only')
2985-
all_params.append('_preload_content')
2986-
all_params.append('_request_timeout')
2987-
2988-
params = locals()
2989-
for key, val in six.iteritems(params['kwargs']):
2990-
if key not in all_params:
2991-
raise TypeError(
2992-
"Got an unexpected keyword argument '%s'"
2993-
" to method describe_reserved_capacitys" % key
2994-
)
2995-
params[key] = val
2996-
del params['kwargs']
2997-
# verify the required parameter 'body' is set
2998-
if self.api_client.client_side_validation and ('body' not in params or
2999-
params['body'] is None): # noqa: E501
3000-
raise ValueError("Missing the required parameter `body` when calling `describe_reserved_capacitys`") # noqa: E501
3001-
3002-
collection_formats = {}
3003-
3004-
path_params = {}
3005-
3006-
query_params = []
3007-
3008-
header_params = {}
3009-
3010-
form_params = []
3011-
local_var_files = {}
3012-
3013-
body_params = None
3014-
if 'body' in params:
3015-
body_params = params['body']
3016-
# HTTP header `Accept`
3017-
header_params['Accept'] = self.api_client.select_header_accept(
3018-
['application/json']) # noqa: E501
3019-
3020-
# HTTP header `Content-Type`
3021-
header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501
3022-
['application/json']) # noqa: E501
3023-
3024-
# Authentication setting
3025-
auth_settings = ['volcengineSign'] # noqa: E501
3026-
3027-
return self.api_client.call_api(
3028-
'/DescribeReservedCapacitys/2022-01-01/filenas/post/application_json/', 'POST',
3029-
path_params,
3030-
query_params,
3031-
header_params,
3032-
body=body_params,
3033-
post_params=form_params,
3034-
files=local_var_files,
3035-
response_type='DescribeReservedCapacitysResponse', # noqa: E501
3036-
auth_settings=auth_settings,
3037-
async_req=params.get('async_req'),
3038-
_return_http_data_only=params.get('_return_http_data_only'),
3039-
_preload_content=params.get('_preload_content', True),
3040-
_request_timeout=params.get('_request_timeout'),
3041-
collection_formats=collection_formats)
3042-
30432849
def describe_snapshots(self, body, **kwargs): # noqa: E501
30442850
"""describe_snapshots # noqa: E501
30452851

0 commit comments

Comments
 (0)