Skip to content

Commit 47a1f63

Browse files
author
BitsAdmin
committed
Merge branch 'waf-Python-2023-12-25-online-1250-2025_06_04_23_06_07' into 'integration_2025-06-05_933360919042'
feat: [development task] waf-1250-Python (1295218) See merge request iaasng/volcengine-python-sdk!646
2 parents 0c36ce3 + 2227c17 commit 47a1f63

13 files changed

+93
-244
lines changed

meta.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"lasted": "3.0.8",
3-
"meta_commit": "f636307d40bcc2d85a266d606f8208484b4f7f66"
2+
"lasted": "3.0.9",
3+
"meta_commit": "4f356ac9fe2d4848b58e84b478d5d925ffab00a0"
44
}

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 = "3.0.8"
6+
VERSION = "3.0.9"
77
# To install the library, run the following
88
#
99
# python setup.py install

volcenginesdkcore/api_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
6363
self.default_headers[header_name] = header_value
6464
self.cookie = cookie
6565
# Set default User-Agent.
66-
self.user_agent = 'volcstack-python-sdk/3.0.8'
66+
self.user_agent = 'volcstack-python-sdk/3.0.9'
6767
self.client_side_validation = configuration.client_side_validation
6868

6969
self.interceptor_chain = InterceptorChain()

volcenginesdkcore/configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,5 +257,5 @@ def to_debug_report(self):
257257
"OS: {env}\n" \
258258
"Python Version: {pyversion}\n" \
259259
"Version of the API: 0.1.0\n" \
260-
"SDK Package Version: 3.0.8".\
260+
"SDK Package Version: 3.0.9".\
261261
format(env=sys.platform, pyversion=sys.version)

volcenginesdkwaf/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@
190190
from volcenginesdkwaf.models.item_for_query_attack_analysis_terms_agg_lb_output import ItemForQueryAttackAnalysisTermsAggLbOutput
191191
from volcenginesdkwaf.models.item_for_query_attack_analysis_with_rule_agg_lb_output import ItemForQueryAttackAnalysisWithRuleAggLbOutput
192192
from volcenginesdkwaf.models.lb_info_for_list_domain_input import LBInfoForListDomainInput
193-
from volcenginesdkwaf.models.llm_path_info_for_update_domain_input import LLMPathInfoForUpdateDomainInput
194193
from volcenginesdkwaf.models.list_acl_rule_request import ListAclRuleRequest
195194
from volcenginesdkwaf.models.list_acl_rule_response import ListAclRuleResponse
196195
from volcenginesdkwaf.models.list_all_ip_groups_request import ListAllIpGroupsRequest

volcenginesdkwaf/models/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@
186186
from volcenginesdkwaf.models.item_for_query_attack_analysis_terms_agg_lb_output import ItemForQueryAttackAnalysisTermsAggLbOutput
187187
from volcenginesdkwaf.models.item_for_query_attack_analysis_with_rule_agg_lb_output import ItemForQueryAttackAnalysisWithRuleAggLbOutput
188188
from volcenginesdkwaf.models.lb_info_for_list_domain_input import LBInfoForListDomainInput
189-
from volcenginesdkwaf.models.llm_path_info_for_update_domain_input import LLMPathInfoForUpdateDomainInput
190189
from volcenginesdkwaf.models.list_acl_rule_request import ListAclRuleRequest
191190
from volcenginesdkwaf.models.list_acl_rule_response import ListAclRuleResponse
192191
from volcenginesdkwaf.models.list_all_ip_groups_request import ListAllIpGroupsRequest

volcenginesdkwaf/models/add_host_group_request.py

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,18 @@ class AddHostGroupRequest(object):
3535
swagger_types = {
3636
'description': 'str',
3737
'host_list': 'list[str]',
38-
'name': 'str'
38+
'name': 'str',
39+
'project_name': 'str'
3940
}
4041

4142
attribute_map = {
4243
'description': 'Description',
4344
'host_list': 'HostList',
44-
'name': 'Name'
45+
'name': 'Name',
46+
'project_name': 'ProjectName'
4547
}
4648

47-
def __init__(self, description=None, host_list=None, name=None, _configuration=None): # noqa: E501
49+
def __init__(self, description=None, host_list=None, name=None, project_name=None, _configuration=None): # noqa: E501
4850
"""AddHostGroupRequest - a model defined in Swagger""" # noqa: E501
4951
if _configuration is None:
5052
_configuration = Configuration()
@@ -53,13 +55,16 @@ def __init__(self, description=None, host_list=None, name=None, _configuration=N
5355
self._description = None
5456
self._host_list = None
5557
self._name = None
58+
self._project_name = None
5659
self.discriminator = None
5760

5861
if description is not None:
5962
self.description = description
6063
if host_list is not None:
6164
self.host_list = host_list
6265
self.name = name
66+
if project_name is not None:
67+
self.project_name = project_name
6368

6469
@property
6570
def description(self):
@@ -126,6 +131,27 @@ def name(self, name):
126131

127132
self._name = name
128133

134+
@property
135+
def project_name(self):
136+
"""Gets the project_name of this AddHostGroupRequest. # noqa: E501
137+
138+
139+
:return: The project_name of this AddHostGroupRequest. # noqa: E501
140+
:rtype: str
141+
"""
142+
return self._project_name
143+
144+
@project_name.setter
145+
def project_name(self, project_name):
146+
"""Sets the project_name of this AddHostGroupRequest.
147+
148+
149+
:param project_name: The project_name of this AddHostGroupRequest. # noqa: E501
150+
:type: str
151+
"""
152+
153+
self._project_name = project_name
154+
129155
def to_dict(self):
130156
"""Returns the model properties as a dict"""
131157
result = {}

volcenginesdkwaf/models/create_cc_rule_request.py

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class CreateCCRuleRequest(object):
3434
"""
3535
swagger_types = {
3636
'accurate_group': 'AccurateGroupForCreateCCRuleInput',
37-
'accurate_group_priority': 'int',
3837
'cc_type': 'int',
3938
'count_time': 'int',
4039
'cron_confs': 'list[CronConfForCreateCCRuleInput]',
@@ -55,7 +54,6 @@ class CreateCCRuleRequest(object):
5554

5655
attribute_map = {
5756
'accurate_group': 'AccurateGroup',
58-
'accurate_group_priority': 'AccurateGroupPriority',
5957
'cc_type': 'CCType',
6058
'count_time': 'CountTime',
6159
'cron_confs': 'CronConfs',
@@ -74,14 +72,13 @@ class CreateCCRuleRequest(object):
7472
'url': 'Url'
7573
}
7674

77-
def __init__(self, accurate_group=None, accurate_group_priority=None, cc_type=None, count_time=None, cron_confs=None, cron_enable=None, effect_time=None, enable=None, exemption_time=None, field=None, host=None, name=None, path_threshold=None, project_name=None, rule_priority=None, rule_tag=None, single_threshold=None, url=None, _configuration=None): # noqa: E501
75+
def __init__(self, accurate_group=None, cc_type=None, count_time=None, cron_confs=None, cron_enable=None, effect_time=None, enable=None, exemption_time=None, field=None, host=None, name=None, path_threshold=None, project_name=None, rule_priority=None, rule_tag=None, single_threshold=None, url=None, _configuration=None): # noqa: E501
7876
"""CreateCCRuleRequest - a model defined in Swagger""" # noqa: E501
7977
if _configuration is None:
8078
_configuration = Configuration()
8179
self._configuration = _configuration
8280

8381
self._accurate_group = None
84-
self._accurate_group_priority = None
8582
self._cc_type = None
8683
self._count_time = None
8784
self._cron_confs = None
@@ -102,8 +99,6 @@ def __init__(self, accurate_group=None, accurate_group_priority=None, cc_type=No
10299

103100
if accurate_group is not None:
104101
self.accurate_group = accurate_group
105-
if accurate_group_priority is not None:
106-
self.accurate_group_priority = accurate_group_priority
107102
if cc_type is not None:
108103
self.cc_type = cc_type
109104
if count_time is not None:
@@ -151,27 +146,6 @@ def accurate_group(self, accurate_group):
151146

152147
self._accurate_group = accurate_group
153148

154-
@property
155-
def accurate_group_priority(self):
156-
"""Gets the accurate_group_priority of this CreateCCRuleRequest. # noqa: E501
157-
158-
159-
:return: The accurate_group_priority of this CreateCCRuleRequest. # noqa: E501
160-
:rtype: int
161-
"""
162-
return self._accurate_group_priority
163-
164-
@accurate_group_priority.setter
165-
def accurate_group_priority(self, accurate_group_priority):
166-
"""Sets the accurate_group_priority of this CreateCCRuleRequest.
167-
168-
169-
:param accurate_group_priority: The accurate_group_priority of this CreateCCRuleRequest. # noqa: E501
170-
:type: int
171-
"""
172-
173-
self._accurate_group_priority = accurate_group_priority
174-
175149
@property
176150
def cc_type(self):
177151
"""Gets the cc_type of this CreateCCRuleRequest. # noqa: E501

volcenginesdkwaf/models/data_for_list_domain_output.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class DataForListDomainOutput(object):
5656
'clb_listener_id': 'str',
5757
'clb_pool_id': 'str',
5858
'clb_server_id': 'str',
59-
'client_ip_location': 'str',
59+
'client_ip_location': 'int',
6060
'client_max_body_size': 'int',
6161
'cloud_access_config': 'list[CloudAccessConfigForListDomainOutput]',
6262
'cname': 'str',
@@ -886,7 +886,7 @@ def client_ip_location(self):
886886
887887
888888
:return: The client_ip_location of this DataForListDomainOutput. # noqa: E501
889-
:rtype: str
889+
:rtype: int
890890
"""
891891
return self._client_ip_location
892892

@@ -896,7 +896,7 @@ def client_ip_location(self, client_ip_location):
896896
897897
898898
:param client_ip_location: The client_ip_location of this DataForListDomainOutput. # noqa: E501
899-
:type: str
899+
:type: int
900900
"""
901901

902902
self._client_ip_location = client_ip_location

volcenginesdkwaf/models/list_domain_request.py

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ class ListDomainRequest(object):
4343
'lb_info': 'list[LBInfoForListDomainInput]',
4444
'page': 'int',
4545
'page_size': 'int',
46+
'project_name': 'str',
4647
'public_real_server': 'list[int]',
4748
'region': 'str',
4849
'sort_by_create_time': 'str',
@@ -67,6 +68,7 @@ class ListDomainRequest(object):
6768
'lb_info': 'LBInfo',
6869
'page': 'Page',
6970
'page_size': 'PageSize',
71+
'project_name': 'ProjectName',
7072
'public_real_server': 'PublicRealServer',
7173
'region': 'Region',
7274
'sort_by_create_time': 'SortByCreateTime',
@@ -80,7 +82,7 @@ class ListDomainRequest(object):
8082
'vpc_owner_name': 'VpcOwnerName'
8183
}
8284

83-
def __init__(self, access_mode=None, accurate_query=None, attack_status=None, client_ip=None, defence_mode=None, domain=None, domain_or_path=None, lb_info=None, page=None, page_size=None, public_real_server=None, region=None, sort_by_create_time=None, sort_by_domain_name=None, sort_by_update_time=None, status=None, tls_enable=None, vpc_id=None, vpc_name=None, vpc_owner_id=None, vpc_owner_name=None, _configuration=None): # noqa: E501
85+
def __init__(self, access_mode=None, accurate_query=None, attack_status=None, client_ip=None, defence_mode=None, domain=None, domain_or_path=None, lb_info=None, page=None, page_size=None, project_name=None, public_real_server=None, region=None, sort_by_create_time=None, sort_by_domain_name=None, sort_by_update_time=None, status=None, tls_enable=None, vpc_id=None, vpc_name=None, vpc_owner_id=None, vpc_owner_name=None, _configuration=None): # noqa: E501
8486
"""ListDomainRequest - a model defined in Swagger""" # noqa: E501
8587
if _configuration is None:
8688
_configuration = Configuration()
@@ -96,6 +98,7 @@ def __init__(self, access_mode=None, accurate_query=None, attack_status=None, cl
9698
self._lb_info = None
9799
self._page = None
98100
self._page_size = None
101+
self._project_name = None
99102
self._public_real_server = None
100103
self._region = None
101104
self._sort_by_create_time = None
@@ -127,6 +130,8 @@ def __init__(self, access_mode=None, accurate_query=None, attack_status=None, cl
127130
self.lb_info = lb_info
128131
self.page = page
129132
self.page_size = page_size
133+
if project_name is not None:
134+
self.project_name = project_name
130135
if public_real_server is not None:
131136
self.public_real_server = public_real_server
132137
self.region = region
@@ -363,6 +368,27 @@ def page_size(self, page_size):
363368

364369
self._page_size = page_size
365370

371+
@property
372+
def project_name(self):
373+
"""Gets the project_name of this ListDomainRequest. # noqa: E501
374+
375+
376+
:return: The project_name of this ListDomainRequest. # noqa: E501
377+
:rtype: str
378+
"""
379+
return self._project_name
380+
381+
@project_name.setter
382+
def project_name(self, project_name):
383+
"""Sets the project_name of this ListDomainRequest.
384+
385+
386+
:param project_name: The project_name of this ListDomainRequest. # noqa: E501
387+
:type: str
388+
"""
389+
390+
self._project_name = project_name
391+
366392
@property
367393
def public_real_server(self):
368394
"""Gets the public_real_server of this ListDomainRequest. # noqa: E501

volcenginesdkwaf/models/list_host_group_request.py

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class ListHostGroupRequest(object):
3939
'name_fix': 'str',
4040
'page': 'int',
4141
'page_size': 'int',
42+
'project_name': 'str',
4243
'rule_tag': 'str',
4344
'time_order_by': 'str'
4445
}
@@ -50,11 +51,12 @@ class ListHostGroupRequest(object):
5051
'name_fix': 'NameFix',
5152
'page': 'Page',
5253
'page_size': 'PageSize',
54+
'project_name': 'ProjectName',
5355
'rule_tag': 'RuleTag',
5456
'time_order_by': 'TimeOrderBy'
5557
}
5658

57-
def __init__(self, host_fix=None, host_group_id=None, list_all=None, name_fix=None, page=None, page_size=None, rule_tag=None, time_order_by=None, _configuration=None): # noqa: E501
59+
def __init__(self, host_fix=None, host_group_id=None, list_all=None, name_fix=None, page=None, page_size=None, project_name=None, rule_tag=None, time_order_by=None, _configuration=None): # noqa: E501
5860
"""ListHostGroupRequest - a model defined in Swagger""" # noqa: E501
5961
if _configuration is None:
6062
_configuration = Configuration()
@@ -66,6 +68,7 @@ def __init__(self, host_fix=None, host_group_id=None, list_all=None, name_fix=No
6668
self._name_fix = None
6769
self._page = None
6870
self._page_size = None
71+
self._project_name = None
6972
self._rule_tag = None
7073
self._time_order_by = None
7174
self.discriminator = None
@@ -82,6 +85,8 @@ def __init__(self, host_fix=None, host_group_id=None, list_all=None, name_fix=No
8285
self.page = page
8386
if page_size is not None:
8487
self.page_size = page_size
88+
if project_name is not None:
89+
self.project_name = project_name
8590
if rule_tag is not None:
8691
self.rule_tag = rule_tag
8792
if time_order_by is not None:
@@ -213,6 +218,27 @@ def page_size(self, page_size):
213218

214219
self._page_size = page_size
215220

221+
@property
222+
def project_name(self):
223+
"""Gets the project_name of this ListHostGroupRequest. # noqa: E501
224+
225+
226+
:return: The project_name of this ListHostGroupRequest. # noqa: E501
227+
:rtype: str
228+
"""
229+
return self._project_name
230+
231+
@project_name.setter
232+
def project_name(self, project_name):
233+
"""Sets the project_name of this ListHostGroupRequest.
234+
235+
236+
:param project_name: The project_name of this ListHostGroupRequest. # noqa: E501
237+
:type: str
238+
"""
239+
240+
self._project_name = project_name
241+
216242
@property
217243
def rule_tag(self):
218244
"""Gets the rule_tag of this ListHostGroupRequest. # noqa: E501

0 commit comments

Comments
 (0)