Skip to content

Commit b6823c3

Browse files
msyycmsyyc
authored
[Botservice]fix model (Azure#24971)
* fix model * add test * Update CHANGELOG.md
1 parent 4899065 commit b6823c3

File tree

4 files changed

+348
-2
lines changed

4 files changed

+348
-2
lines changed

‎sdk/botservice/azure-mgmt-botservice/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Release History
22

3+
## 2.0.0b3 (2022-06-27)
4+
5+
**Bugfixes**
6+
7+
- Fix multi inheritance problem for Model `Site`
8+
39
## 2.0.0b2 (2022-04-15)
410

511
**Features**

‎sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/_patch.py‎

Lines changed: 317 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,324 @@
2424
# IN THE SOFTWARE.
2525
#
2626
# --------------------------------------------------------------------------
27+
from typing import Optional, List
28+
import importlib
29+
import msrest
30+
31+
32+
class WebChatSite(msrest.serialization.Model):
33+
"""A site for the Webchat channel.
34+
35+
Variables are only populated by the server, and will be ignored when sending a request.
36+
37+
All required parameters must be populated in order to send to Azure.
38+
39+
:ivar site_id: Site Id.
40+
:vartype site_id: str
41+
:ivar site_name: Required. Site name.
42+
:vartype site_name: str
43+
:ivar key: Primary key. Value only returned through POST to the action Channel List API,
44+
otherwise empty.
45+
:vartype key: str
46+
:ivar key2: Secondary key. Value only returned through POST to the action Channel List API,
47+
otherwise empty.
48+
:vartype key2: str
49+
:ivar is_enabled: Required. Whether this site is enabled for DirectLine channel.
50+
:vartype is_enabled: bool
51+
:ivar is_webchat_preview_enabled: Required. Whether this site is enabled for preview versions
52+
of Webchat.
53+
:vartype is_webchat_preview_enabled: bool
54+
"""
55+
56+
_validation = {
57+
'site_id': {'readonly': True},
58+
'site_name': {'required': True},
59+
'key': {'readonly': True},
60+
'key2': {'readonly': True},
61+
'is_enabled': {'required': True},
62+
'is_webchat_preview_enabled': {'required': True},
63+
}
64+
65+
_attribute_map = {
66+
'site_id': {'key': 'siteId', 'type': 'str'},
67+
'site_name': {'key': 'siteName', 'type': 'str'},
68+
'key': {'key': 'key', 'type': 'str'},
69+
'key2': {'key': 'key2', 'type': 'str'},
70+
'is_enabled': {'key': 'isEnabled', 'type': 'bool'},
71+
'is_webchat_preview_enabled': {'key': 'isWebchatPreviewEnabled', 'type': 'bool'},
72+
}
73+
74+
def __init__(
75+
self,
76+
*,
77+
site_name: str,
78+
is_enabled: bool,
79+
is_webchat_preview_enabled: bool,
80+
**kwargs
81+
):
82+
"""
83+
:keyword site_name: Required. Site name.
84+
:paramtype site_name: str
85+
:keyword is_enabled: Required. Whether this site is enabled for DirectLine channel.
86+
:paramtype is_enabled: bool
87+
:keyword is_webchat_preview_enabled: Required. Whether this site is enabled for preview
88+
versions of Webchat.
89+
:paramtype is_webchat_preview_enabled: bool
90+
"""
91+
super(WebChatSite, self).__init__(
92+
site_name=site_name,
93+
is_enabled=is_enabled,
94+
is_webchat_preview_enabled=is_webchat_preview_enabled,
95+
**kwargs
96+
)
97+
self.site_id = None
98+
self.site_name = site_name
99+
self.key = None
100+
self.key2 = None
101+
self.is_enabled = is_enabled
102+
self.is_webchat_preview_enabled = is_webchat_preview_enabled
103+
104+
105+
class DirectLineSite(msrest.serialization.Model):
106+
"""A site for the Direct Line channel.
107+
108+
Variables are only populated by the server, and will be ignored when sending a request.
109+
110+
All required parameters must be populated in order to send to Azure.
111+
112+
:ivar site_id: Site Id.
113+
:vartype site_id: str
114+
:ivar site_name: Required. Site name.
115+
:vartype site_name: str
116+
:ivar key: Primary key. Value only returned through POST to the action Channel List API,
117+
otherwise empty.
118+
:vartype key: str
119+
:ivar key2: Secondary key. Value only returned through POST to the action Channel List API,
120+
otherwise empty.
121+
:vartype key2: str
122+
:ivar is_enabled: Required. Whether this site is enabled for DirectLine channel.
123+
:vartype is_enabled: bool
124+
:ivar is_v1_enabled: Required. Whether this site is enabled for Bot Framework V1 protocol.
125+
:vartype is_v1_enabled: bool
126+
:ivar is_v3_enabled: Required. Whether this site is enabled for Bot Framework V1 protocol.
127+
:vartype is_v3_enabled: bool
128+
:ivar is_secure_site_enabled: Whether this site is enabled for authentication with Bot
129+
Framework.
130+
:vartype is_secure_site_enabled: bool
131+
:ivar is_block_user_upload_enabled: Whether this site is enabled for block user upload.
132+
:vartype is_block_user_upload_enabled: bool
133+
:ivar trusted_origins: List of Trusted Origin URLs for this site. This field is applicable only
134+
if isSecureSiteEnabled is True.
135+
:vartype trusted_origins: list[str]
136+
"""
137+
138+
_validation = {
139+
'site_id': {'readonly': True},
140+
'site_name': {'required': True},
141+
'key': {'readonly': True},
142+
'key2': {'readonly': True},
143+
'is_enabled': {'required': True},
144+
'is_v1_enabled': {'required': True},
145+
'is_v3_enabled': {'required': True},
146+
}
147+
148+
_attribute_map = {
149+
'site_id': {'key': 'siteId', 'type': 'str'},
150+
'site_name': {'key': 'siteName', 'type': 'str'},
151+
'key': {'key': 'key', 'type': 'str'},
152+
'key2': {'key': 'key2', 'type': 'str'},
153+
'is_enabled': {'key': 'isEnabled', 'type': 'bool'},
154+
'is_v1_enabled': {'key': 'isV1Enabled', 'type': 'bool'},
155+
'is_v3_enabled': {'key': 'isV3Enabled', 'type': 'bool'},
156+
'is_secure_site_enabled': {'key': 'isSecureSiteEnabled', 'type': 'bool'},
157+
'is_block_user_upload_enabled': {'key': 'isBlockUserUploadEnabled', 'type': 'bool'},
158+
'trusted_origins': {'key': 'trustedOrigins', 'type': '[str]'},
159+
}
160+
161+
def __init__(
162+
self,
163+
*,
164+
site_name: str,
165+
is_enabled: bool,
166+
is_v1_enabled: bool,
167+
is_v3_enabled: bool,
168+
is_secure_site_enabled: Optional[bool] = None,
169+
is_block_user_upload_enabled: Optional[bool] = None,
170+
trusted_origins: Optional[List[str]] = None,
171+
**kwargs
172+
):
173+
"""
174+
:keyword site_name: Required. Site name.
175+
:paramtype site_name: str
176+
:keyword is_enabled: Required. Whether this site is enabled for DirectLine channel.
177+
:paramtype is_enabled: bool
178+
:keyword is_v1_enabled: Required. Whether this site is enabled for Bot Framework V1 protocol.
179+
:paramtype is_v1_enabled: bool
180+
:keyword is_v3_enabled: Required. Whether this site is enabled for Bot Framework V1 protocol.
181+
:paramtype is_v3_enabled: bool
182+
:keyword is_secure_site_enabled: Whether this site is enabled for authentication with Bot
183+
Framework.
184+
:paramtype is_secure_site_enabled: bool
185+
:keyword is_block_user_upload_enabled: Whether this site is enabled for block user upload.
186+
:paramtype is_block_user_upload_enabled: bool
187+
:keyword trusted_origins: List of Trusted Origin URLs for this site. This field is applicable
188+
only if isSecureSiteEnabled is True.
189+
:paramtype trusted_origins: list[str]
190+
"""
191+
super(DirectLineSite, self).__init__(
192+
site_name=site_name,
193+
is_enabled=is_enabled,
194+
is_v1_enabled=is_v1_enabled,
195+
is_v3_enabled=is_v3_enabled,
196+
is_secure_site_enabled=is_secure_site_enabled,
197+
is_block_user_upload_enabled=is_block_user_upload_enabled,
198+
**kwargs
199+
)
200+
self.site_id = None
201+
self.site_name = site_name
202+
self.key = None
203+
self.key2 = None
204+
self.is_enabled = is_enabled
205+
self.is_v1_enabled = is_v1_enabled
206+
self.is_v3_enabled = is_v3_enabled
207+
self.is_secure_site_enabled = is_secure_site_enabled
208+
self.is_block_user_upload_enabled = is_block_user_upload_enabled
209+
self.trusted_origins = trusted_origins
210+
211+
212+
class Site(WebChatSite, DirectLineSite):
213+
"""A site for the channel.
214+
215+
Variables are only populated by the server, and will be ignored when sending a request.
216+
217+
All required parameters must be populated in order to send to Azure.
218+
219+
:ivar is_v1_enabled: Required. Whether this site is enabled for Bot Framework V1 protocol.
220+
:vartype is_v1_enabled: bool
221+
:ivar is_v3_enabled: Required. Whether this site is enabled for Bot Framework V1 protocol.
222+
:vartype is_v3_enabled: bool
223+
:ivar is_secure_site_enabled: Whether this site is enabled for authentication with Bot
224+
Framework.
225+
:vartype is_secure_site_enabled: bool
226+
:ivar is_block_user_upload_enabled: Whether this site is enabled for block user upload.
227+
:vartype is_block_user_upload_enabled: bool
228+
:ivar trusted_origins: List of Trusted Origin URLs for this site. This field is applicable only
229+
if isSecureSiteEnabled is True.
230+
:vartype trusted_origins: list[str]
231+
:ivar site_id: Site Id.
232+
:vartype site_id: str
233+
:ivar site_name: Required. Site name.
234+
:vartype site_name: str
235+
:ivar key: Primary key. Value only returned through POST to the action Channel List API,
236+
otherwise empty.
237+
:vartype key: str
238+
:ivar key2: Secondary key. Value only returned through POST to the action Channel List API,
239+
otherwise empty.
240+
:vartype key2: str
241+
:ivar is_enabled: Required. Whether this site is enabled for DirectLine channel.
242+
:vartype is_enabled: bool
243+
:ivar is_webchat_preview_enabled: Required. Whether this site is enabled for preview versions
244+
of Webchat.
245+
:vartype is_webchat_preview_enabled: bool
246+
:ivar is_token_enabled: Whether this site is token enabled for channel.
247+
:vartype is_token_enabled: bool
248+
:ivar e_tag: Entity Tag.
249+
:vartype e_tag: str
250+
"""
251+
252+
_validation = {
253+
'is_v1_enabled': {'required': True},
254+
'is_v3_enabled': {'required': True},
255+
'site_id': {'readonly': True},
256+
'site_name': {'required': True},
257+
'key': {'readonly': True},
258+
'key2': {'readonly': True},
259+
'is_enabled': {'required': True},
260+
'is_webchat_preview_enabled': {'required': True},
261+
}
262+
263+
_attribute_map = {
264+
'is_v1_enabled': {'key': 'isV1Enabled', 'type': 'bool'},
265+
'is_v3_enabled': {'key': 'isV3Enabled', 'type': 'bool'},
266+
'is_secure_site_enabled': {'key': 'isSecureSiteEnabled', 'type': 'bool'},
267+
'is_block_user_upload_enabled': {'key': 'isBlockUserUploadEnabled', 'type': 'bool'},
268+
'trusted_origins': {'key': 'trustedOrigins', 'type': '[str]'},
269+
'site_id': {'key': 'siteId', 'type': 'str'},
270+
'site_name': {'key': 'siteName', 'type': 'str'},
271+
'key': {'key': 'key', 'type': 'str'},
272+
'key2': {'key': 'key2', 'type': 'str'},
273+
'is_enabled': {'key': 'isEnabled', 'type': 'bool'},
274+
'is_webchat_preview_enabled': {'key': 'isWebchatPreviewEnabled', 'type': 'bool'},
275+
'is_token_enabled': {'key': 'isTokenEnabled', 'type': 'bool'},
276+
'e_tag': {'key': 'eTag', 'type': 'str'},
277+
}
278+
279+
def __init__(
280+
self,
281+
*,
282+
is_v1_enabled: bool,
283+
is_v3_enabled: bool,
284+
site_name: str,
285+
is_enabled: bool,
286+
is_webchat_preview_enabled: bool,
287+
is_secure_site_enabled: Optional[bool] = None,
288+
is_block_user_upload_enabled: Optional[bool] = None,
289+
trusted_origins: Optional[List[str]] = None,
290+
is_token_enabled: Optional[bool] = None,
291+
e_tag: Optional[str] = None,
292+
**kwargs
293+
):
294+
"""
295+
:keyword is_v1_enabled: Required. Whether this site is enabled for Bot Framework V1 protocol.
296+
:paramtype is_v1_enabled: bool
297+
:keyword is_v3_enabled: Required. Whether this site is enabled for Bot Framework V1 protocol.
298+
:paramtype is_v3_enabled: bool
299+
:keyword is_secure_site_enabled: Whether this site is enabled for authentication with Bot
300+
Framework.
301+
:paramtype is_secure_site_enabled: bool
302+
:keyword is_block_user_upload_enabled: Whether this site is enabled for block user upload.
303+
:paramtype is_block_user_upload_enabled: bool
304+
:keyword trusted_origins: List of Trusted Origin URLs for this site. This field is applicable
305+
only if isSecureSiteEnabled is True.
306+
:paramtype trusted_origins: list[str]
307+
:keyword site_name: Required. Site name.
308+
:paramtype site_name: str
309+
:keyword is_enabled: Required. Whether this site is enabled for DirectLine channel.
310+
:paramtype is_enabled: bool
311+
:keyword is_webchat_preview_enabled: Required. Whether this site is enabled for preview
312+
versions of Webchat.
313+
:paramtype is_webchat_preview_enabled: bool
314+
:keyword is_token_enabled: Whether this site is token enabled for channel.
315+
:paramtype is_token_enabled: bool
316+
:keyword e_tag: Entity Tag.
317+
:paramtype e_tag: str
318+
"""
319+
super(Site, self).__init__(site_name=site_name, is_enabled=is_enabled,
320+
is_webchat_preview_enabled=is_webchat_preview_enabled, is_v1_enabled=is_v1_enabled,
321+
is_v3_enabled=is_v3_enabled, is_secure_site_enabled=is_secure_site_enabled,
322+
is_block_user_upload_enabled=is_block_user_upload_enabled,
323+
trusted_origins=trusted_origins, **kwargs)
324+
self.is_v1_enabled = is_v1_enabled
325+
self.is_v3_enabled = is_v3_enabled
326+
self.is_secure_site_enabled = is_secure_site_enabled
327+
self.is_block_user_upload_enabled = is_block_user_upload_enabled
328+
self.trusted_origins = trusted_origins
329+
self.is_token_enabled = is_token_enabled
330+
self.e_tag = e_tag
331+
self.site_id = None
332+
self.site_name = site_name
333+
self.key = None
334+
self.key2 = None
335+
self.is_enabled = is_enabled
336+
self.is_webchat_preview_enabled = is_webchat_preview_enabled
337+
self.is_token_enabled = is_token_enabled
338+
self.e_tag = e_tag
339+
27340

28341
# This file is used for handwritten extensions to the generated code. Example:
29342
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
30343
def patch_sdk():
31-
pass
344+
curr_package = importlib.import_module("azure.mgmt.botservice")
345+
curr_package.models.WebChatSite = WebChatSite
346+
curr_package.models.DirectLineSite = DirectLineSite
347+
curr_package.models.Site = Site

‎sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
VERSION = "2.0.0b2"
9+
VERSION = "2.0.0b3"

‎sdk/botservice/azure-mgmt-botservice/tests/test_mgmt_botservice_model.py‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# coding: utf-8
2+
3+
# -------------------------------------------------------------------------
4+
# Copyright (c) Microsoft Corporation. All rights reserved.
5+
# Licensed under the MIT License. See License.txt in the project root for
6+
# license information.
7+
# --------------------------------------------------------------------------
8+
9+
10+
from azure.mgmt.botservice.models import Site
11+
12+
13+
class TestMgmtBotServiceModel:
14+
15+
def test_model_site(self):
16+
# the model shall not raise error
17+
Site(
18+
is_v1_enabled=True,
19+
is_v3_enabled=True,
20+
site_name="xxx",
21+
is_enabled=True,
22+
is_webchat_preview_enabled=True,
23+
is_secure_site_enabled=True
24+
)

0 commit comments

Comments
 (0)