Skip to content

Commit b7d25cc

Browse files
author
SDKAuto
committed
CodeGen from PR 17112 in Azure/azure-rest-api-specs
Merge 189d52b6a02f86e912ccc72a9447899c8d97cd00 into 270ba89
1 parent 6c50bbe commit b7d25cc

36 files changed

+7433
-2114
lines changed

‎sdk/botservice/azure-mgmt-botservice/_meta.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"autorest": "3.4.2",
2+
"autorest": "3.7.2",
33
"use": [
4-
"@autorest/python@5.8.0",
5-
"@autorest/modelerfour@4.19.1"
4+
"@autorest/python@5.12.0",
5+
"@autorest/modelerfour@4.19.3"
66
],
7-
"commit": "e23a53d64f46db42df2886989a3436f7431168f4",
7+
"commit": "f578f5a36e422e6c903148abb456a125746b4bc5",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/botservice/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.0 --use=@autorest/modelerfour@4.19.1 --version=3.4.2",
9+
"autorest_command": "autorest specification/botservice/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.12.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2",
1010
"readme": "specification/botservice/resource-manager/readme.md"
1111
}

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
__version__ = VERSION
1313
__all__ = ['AzureBotService']
1414

15-
try:
16-
from ._patch import patch_sdk # type: ignore
17-
patch_sdk()
18-
except ImportError:
19-
pass
15+
# `._patch.py` is used for handwritten extensions to the generated code
16+
# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
17+
from ._patch import patch_sdk
18+
patch_sdk()

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

Lines changed: 54 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,22 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9+
from copy import deepcopy
910
from typing import TYPE_CHECKING
1011

1112
from azure.mgmt.core import ARMPipelineClient
1213
from msrest import Deserializer, Serializer
1314

15+
from . import models
16+
from ._configuration import AzureBotServiceConfiguration
17+
from .operations import BotConnectionOperations, BotsOperations, ChannelsOperations, DirectLineOperations, HostSettingsOperations, OperationResultsOperations, Operations, PrivateEndpointConnectionsOperations, PrivateLinkResourcesOperations
18+
1419
if TYPE_CHECKING:
1520
# pylint: disable=unused-import,ungrouped-imports
1621
from typing import Any, Optional
1722

1823
from azure.core.credentials import TokenCredential
19-
from azure.core.pipeline.transport import HttpRequest, HttpResponse
20-
21-
from ._configuration import AzureBotServiceConfiguration
22-
from .operations import BotsOperations
23-
from .operations import ChannelsOperations
24-
from .operations import DirectLineOperations
25-
from .operations import Operations
26-
from .operations import BotConnectionOperations
27-
from .operations import HostSettingsOperations
28-
from . import models
29-
24+
from azure.core.rest import HttpRequest, HttpResponse
3025

3126
class AzureBotService(object):
3227
"""Azure Bot Service is a platform for creating smart conversational agents.
@@ -43,61 +38,76 @@ class AzureBotService(object):
4338
:vartype bot_connection: azure.mgmt.botservice.operations.BotConnectionOperations
4439
:ivar host_settings: HostSettingsOperations operations
4540
:vartype host_settings: azure.mgmt.botservice.operations.HostSettingsOperations
41+
:ivar operation_results: OperationResultsOperations operations
42+
:vartype operation_results: azure.mgmt.botservice.operations.OperationResultsOperations
43+
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
44+
:vartype private_endpoint_connections:
45+
azure.mgmt.botservice.operations.PrivateEndpointConnectionsOperations
46+
:ivar private_link_resources: PrivateLinkResourcesOperations operations
47+
:vartype private_link_resources:
48+
azure.mgmt.botservice.operations.PrivateLinkResourcesOperations
4649
:param credential: Credential needed for the client to connect to Azure.
4750
:type credential: ~azure.core.credentials.TokenCredential
4851
:param subscription_id: Azure Subscription ID.
4952
:type subscription_id: str
50-
:param str base_url: Service URL
53+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
54+
:type base_url: str
55+
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
56+
Retry-After header is present.
5157
"""
5258

5359
def __init__(
5460
self,
5561
credential, # type: "TokenCredential"
5662
subscription_id, # type: str
57-
base_url=None, # type: Optional[str]
63+
base_url="https://management.azure.com", # type: str
5864
**kwargs # type: Any
5965
):
6066
# type: (...) -> None
61-
if not base_url:
62-
base_url = 'https://management.azure.com'
63-
self._config = AzureBotServiceConfiguration(credential, subscription_id, **kwargs)
67+
self._config = AzureBotServiceConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
6468
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
6569

6670
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
6771
self._serialize = Serializer(client_models)
68-
self._serialize.client_side_validation = False
6972
self._deserialize = Deserializer(client_models)
70-
71-
self.bots = BotsOperations(
72-
self._client, self._config, self._serialize, self._deserialize)
73-
self.channels = ChannelsOperations(
74-
self._client, self._config, self._serialize, self._deserialize)
75-
self.direct_line = DirectLineOperations(
76-
self._client, self._config, self._serialize, self._deserialize)
77-
self.operations = Operations(
78-
self._client, self._config, self._serialize, self._deserialize)
79-
self.bot_connection = BotConnectionOperations(
80-
self._client, self._config, self._serialize, self._deserialize)
81-
self.host_settings = HostSettingsOperations(
82-
self._client, self._config, self._serialize, self._deserialize)
83-
84-
def _send_request(self, http_request, **kwargs):
85-
# type: (HttpRequest, Any) -> HttpResponse
73+
self._serialize.client_side_validation = False
74+
self.bots = BotsOperations(self._client, self._config, self._serialize, self._deserialize)
75+
self.channels = ChannelsOperations(self._client, self._config, self._serialize, self._deserialize)
76+
self.direct_line = DirectLineOperations(self._client, self._config, self._serialize, self._deserialize)
77+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
78+
self.bot_connection = BotConnectionOperations(self._client, self._config, self._serialize, self._deserialize)
79+
self.host_settings = HostSettingsOperations(self._client, self._config, self._serialize, self._deserialize)
80+
self.operation_results = OperationResultsOperations(self._client, self._config, self._serialize, self._deserialize)
81+
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(self._client, self._config, self._serialize, self._deserialize)
82+
self.private_link_resources = PrivateLinkResourcesOperations(self._client, self._config, self._serialize, self._deserialize)
83+
84+
85+
def _send_request(
86+
self,
87+
request, # type: HttpRequest
88+
**kwargs # type: Any
89+
):
90+
# type: (...) -> HttpResponse
8691
"""Runs the network request through the client's chained policies.
8792
88-
:param http_request: The network request you want to make. Required.
89-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
90-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
93+
>>> from azure.core.rest import HttpRequest
94+
>>> request = HttpRequest("GET", "https://www.example.org/")
95+
<HttpRequest [GET], url: 'https://www.example.org/'>
96+
>>> response = client._send_request(request)
97+
<HttpResponse: 200 OK>
98+
99+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
100+
101+
:param request: The network request you want to make. Required.
102+
:type request: ~azure.core.rest.HttpRequest
103+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
91104
:return: The response of your network call. Does not do error handling on your response.
92-
:rtype: ~azure.core.pipeline.transport.HttpResponse
105+
:rtype: ~azure.core.rest.HttpResponse
93106
"""
94-
path_format_arguments = {
95-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
96-
}
97-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
98-
stream = kwargs.pop("stream", True)
99-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
100-
return pipeline_response.http_response
107+
108+
request_copy = deepcopy(request)
109+
request_copy.url = self._client.format_url(request_copy.url)
110+
return self._client.send_request(request_copy, **kwargs)
101111

102112
def close(self):
103113
# type: () -> None

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
from azure.core.configuration import Configuration
1212
from azure.core.pipeline import policies
13-
from azure.mgmt.core.policies import ARMHttpLoggingPolicy
13+
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
1414

1515
from ._version import VERSION
1616

@@ -40,15 +40,15 @@ def __init__(
4040
**kwargs # type: Any
4141
):
4242
# type: (...) -> None
43+
super(AzureBotServiceConfiguration, self).__init__(**kwargs)
4344
if credential is None:
4445
raise ValueError("Parameter 'credential' must not be None.")
4546
if subscription_id is None:
4647
raise ValueError("Parameter 'subscription_id' must not be None.")
47-
super(AzureBotServiceConfiguration, self).__init__(**kwargs)
4848

4949
self.credential = credential
5050
self.subscription_id = subscription_id
51-
self.api_version = "2021-03-01"
51+
self.api_version = "2021-05-01-preview"
5252
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
5353
kwargs.setdefault('sdk_moniker', 'mgmt-botservice/{}'.format(VERSION))
5454
self._configure(**kwargs)
@@ -68,4 +68,4 @@ def _configure(
6868
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6969
self.authentication_policy = kwargs.get('authentication_policy')
7070
if self.credential and not self.authentication_policy:
71-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
71+
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

‎sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/_metadata.json‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"chosen_version": "2021-03-01",
3-
"total_api_version_list": ["2021-03-01"],
2+
"chosen_version": "2021-05-01-preview",
3+
"total_api_version_list": ["2021-05-01-preview"],
44
"client": {
55
"name": "AzureBotService",
66
"filename": "_azure_bot_service",
77
"description": "Azure Bot Service is a platform for creating smart conversational agents.",
8-
"base_url": "\u0027https://management.azure.com\u0027",
9-
"custom_base_url": null,
8+
"host_value": "\"https://management.azure.com\"",
9+
"parameterized_host_template": null,
1010
"azure_arm": true,
11-
"has_lro_operations": false,
11+
"has_lro_operations": true,
1212
"client_side_validation": false,
13-
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"AzureBotServiceConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}, \"azurecore\": {\"azure.core.pipeline.transport\": [\"HttpRequest\", \"HttpResponse\"]}}}",
14-
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"AzureBotServiceConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}, \"azurecore\": {\"azure.core.pipeline.transport\": [\"AsyncHttpResponse\", \"HttpRequest\"]}}}"
13+
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"AzureBotServiceConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}",
14+
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"], \"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"AzureBotServiceConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}"
1515
},
1616
"global_parameters": {
1717
"sync": {
@@ -54,7 +54,7 @@
5454
"required": false
5555
},
5656
"base_url": {
57-
"signature": "base_url=None, # type: Optional[str]",
57+
"signature": "base_url=\"https://management.azure.com\", # type: str",
5858
"description": "Service URL",
5959
"docstring_type": "str",
6060
"required": false
@@ -74,7 +74,7 @@
7474
"required": false
7575
},
7676
"base_url": {
77-
"signature": "base_url: Optional[str] = None,",
77+
"signature": "base_url: str = \"https://management.azure.com\",",
7878
"description": "Service URL",
7979
"docstring_type": "str",
8080
"required": false
@@ -91,18 +91,20 @@
9191
"config": {
9292
"credential": true,
9393
"credential_scopes": ["https://management.azure.com/.default"],
94-
"credential_default_policy_type": "BearerTokenCredentialPolicy",
95-
"credential_default_policy_type_has_async_version": true,
96-
"credential_key_header_name": null,
97-
"sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
98-
"async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
94+
"credential_call_sync": "ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
95+
"credential_call_async": "AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
96+
"sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMChallengeAuthenticationPolicy\", \"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
97+
"async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
9998
},
10099
"operation_groups": {
101100
"bots": "BotsOperations",
102101
"channels": "ChannelsOperations",
103102
"direct_line": "DirectLineOperations",
104103
"operations": "Operations",
105104
"bot_connection": "BotConnectionOperations",
106-
"host_settings": "HostSettingsOperations"
105+
"host_settings": "HostSettingsOperations",
106+
"operation_results": "OperationResultsOperations",
107+
"private_endpoint_connections": "PrivateEndpointConnectionsOperations",
108+
"private_link_resources": "PrivateLinkResourcesOperations"
107109
}
108110
}

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
#
4+
# Copyright (c) Microsoft Corporation. All rights reserved.
5+
#
6+
# The MIT License (MIT)
7+
#
8+
# Permission is hereby granted, free of charge, to any person obtaining a copy
9+
# of this software and associated documentation files (the ""Software""), to
10+
# deal in the Software without restriction, including without limitation the
11+
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
12+
# sell copies of the Software, and to permit persons to whom the Software is
13+
# furnished to do so, subject to the following conditions:
14+
#
15+
# The above copyright notice and this permission notice shall be included in
16+
# all copies or substantial portions of the Software.
17+
#
18+
# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
23+
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
24+
# IN THE SOFTWARE.
25+
#
26+
# --------------------------------------------------------------------------
27+
28+
# This file is used for handwritten extensions to the generated code. Example:
29+
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
30+
def patch_sdk():
31+
pass

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# --------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# Code generated by Microsoft (R) AutoRest Code Generator.
5+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
6+
# --------------------------------------------------------------------------
7+
8+
from azure.core.pipeline.transport import HttpRequest
9+
10+
def _convert_request(request, files=None):
11+
data = request.content if not files else None
12+
request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
13+
if files:
14+
request.set_formdata_body(files)
15+
return request
16+
17+
def _format_url_section(template, **kwargs):
18+
components = template.split("/")
19+
while components:
20+
try:
21+
return template.format(**kwargs)
22+
except KeyError as key:
23+
formatted_components = template.split("/")
24+
components = [
25+
c for c in formatted_components if "{}".format(key.args[0]) not in c
26+
]
27+
template = "/".join(components)

0 commit comments

Comments
 (0)