Skip to content

Commit

Permalink
[AutoRelease] t2-botservice-2022-01-10-71178 (#22404)
Browse files Browse the repository at this point in the history
* CodeGen from PR 17294 in Azure/azure-rest-api-specs
config botservice readme python (#17294)

* version,CHANGELOG

Co-authored-by: SDKAuto <sdkautomation@microsoft.com>
Co-authored-by: PythonSdkPipelines <PythonSdkPipelines>
Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>
  • Loading branch information
3 people authored Jan 12, 2022
1 parent 3c7769a commit e9ca031
Show file tree
Hide file tree
Showing 39 changed files with 5,763 additions and 4,088 deletions.
92 changes: 92 additions & 0 deletions sdk/botservice/azure-mgmt-botservice/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,97 @@
# Release History

## 2.0.0b1 (2022-01-10)

**Features**

- Added operation group OperationResultsOperations
- Added operation group PrivateEndpointConnectionsOperations
- Added operation group PrivateLinkResourcesOperations
- Model AlexaChannel has a new parameter etag
- Model AlexaChannel has a new parameter location
- Model AlexaChannel has a new parameter provisioning_state
- Model Bot has a new parameter zones
- Model BotChannel has a new parameter zones
- Model BotProperties has a new parameter all_settings
- Model BotProperties has a new parameter app_password_hint
- Model BotProperties has a new parameter cmek_encryption_status
- Model BotProperties has a new parameter disable_local_auth
- Model BotProperties has a new parameter is_developer_app_insights_api_key_set
- Model BotProperties has a new parameter is_streaming_supported
- Model BotProperties has a new parameter manifest_url
- Model BotProperties has a new parameter migration_token
- Model BotProperties has a new parameter msa_app_msi_resource_id
- Model BotProperties has a new parameter msa_app_tenant_id
- Model BotProperties has a new parameter msa_app_type
- Model BotProperties has a new parameter open_with_hint
- Model BotProperties has a new parameter parameters
- Model BotProperties has a new parameter private_endpoint_connections
- Model BotProperties has a new parameter provisioning_state
- Model BotProperties has a new parameter public_network_access
- Model BotProperties has a new parameter publishing_credentials
- Model BotProperties has a new parameter storage_resource_id
- Model Channel has a new parameter etag
- Model Channel has a new parameter location
- Model Channel has a new parameter provisioning_state
- Model ConnectionSetting has a new parameter zones
- Model ConnectionSettingProperties has a new parameter id
- Model ConnectionSettingProperties has a new parameter name
- Model ConnectionSettingProperties has a new parameter provisioning_state
- Model DirectLineChannel has a new parameter etag
- Model DirectLineChannel has a new parameter location
- Model DirectLineChannel has a new parameter provisioning_state
- Model DirectLineChannelProperties has a new parameter direct_line_embed_code
- Model DirectLineSite has a new parameter is_block_user_upload_enabled
- Model DirectLineSpeechChannel has a new parameter etag
- Model DirectLineSpeechChannel has a new parameter location
- Model DirectLineSpeechChannel has a new parameter provisioning_state
- Model EmailChannel has a new parameter etag
- Model EmailChannel has a new parameter location
- Model EmailChannel has a new parameter provisioning_state
- Model FacebookChannel has a new parameter etag
- Model FacebookChannel has a new parameter location
- Model FacebookChannel has a new parameter provisioning_state
- Model KikChannel has a new parameter etag
- Model KikChannel has a new parameter location
- Model KikChannel has a new parameter provisioning_state
- Model LineChannel has a new parameter etag
- Model LineChannel has a new parameter location
- Model LineChannel has a new parameter provisioning_state
- Model MsTeamsChannel has a new parameter etag
- Model MsTeamsChannel has a new parameter location
- Model MsTeamsChannel has a new parameter provisioning_state
- Model MsTeamsChannelProperties has a new parameter accepted_terms
- Model MsTeamsChannelProperties has a new parameter deployment_environment
- Model MsTeamsChannelProperties has a new parameter incoming_call_route
- Model Resource has a new parameter zones
- Model ServiceProviderParameter has a new parameter metadata
- Model SkypeChannel has a new parameter etag
- Model SkypeChannel has a new parameter location
- Model SkypeChannel has a new parameter provisioning_state
- Model SkypeChannelProperties has a new parameter incoming_call_route
- Model SlackChannel has a new parameter etag
- Model SlackChannel has a new parameter location
- Model SlackChannel has a new parameter provisioning_state
- Model SlackChannelProperties has a new parameter scopes
- Model SmsChannel has a new parameter etag
- Model SmsChannel has a new parameter location
- Model SmsChannel has a new parameter provisioning_state
- Model TelegramChannel has a new parameter etag
- Model TelegramChannel has a new parameter location
- Model TelegramChannel has a new parameter provisioning_state
- Model WebChatChannel has a new parameter etag
- Model WebChatChannel has a new parameter location
- Model WebChatChannel has a new parameter provisioning_state

**Breaking changes**

- Model BotProperties no longer has parameter is_isolated
- Model DirectLineSpeechChannelProperties has a new required parameter cognitive_service_region
- Model DirectLineSpeechChannelProperties has a new required parameter cognitive_service_subscription_key
- Model DirectLineSpeechChannelProperties no longer has parameter cognitive_services_subscription_id
- Model WebChatSite has a new required parameter is_webchat_preview_enabled
- Model WebChatSite no longer has parameter enable_preview

## 1.0.0 (2021-05-20)

**Features**
Expand Down
10 changes: 5 additions & 5 deletions sdk/botservice/azure-mgmt-botservice/_meta.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"autorest": "3.4.2",
"autorest": "3.7.2",
"use": [
"@autorest/python@5.8.0",
"@autorest/modelerfour@4.19.1"
"@autorest/python@5.12.0",
"@autorest/modelerfour@4.19.3"
],
"commit": "e23a53d64f46db42df2886989a3436f7431168f4",
"commit": "d8242e83bad59e45d5bb1dad769a185504f5fde3",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"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",
"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 --python3-only --track2 --use=@autorest/python@5.12.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2",
"readme": "specification/botservice/resource-manager/readme.md"
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
__version__ = VERSION
__all__ = ['AzureBotService']

try:
from ._patch import patch_sdk # type: ignore
patch_sdk()
except ImportError:
pass
# `._patch.py` is used for handwritten extensions to the generated code
# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
from ._patch import patch_sdk
patch_sdk()
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,22 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

from typing import TYPE_CHECKING
from copy import deepcopy
from typing import Any, Optional, TYPE_CHECKING

from azure.core.rest import HttpRequest, HttpResponse
from azure.mgmt.core import ARMPipelineClient
from msrest import Deserializer, Serializer

from . import models
from ._configuration import AzureBotServiceConfiguration
from .operations import BotConnectionOperations, BotsOperations, ChannelsOperations, DirectLineOperations, HostSettingsOperations, OperationResultsOperations, Operations, PrivateEndpointConnectionsOperations, PrivateLinkResourcesOperations

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
from typing import Any, Optional

from azure.core.credentials import TokenCredential
from azure.core.pipeline.transport import HttpRequest, HttpResponse

from ._configuration import AzureBotServiceConfiguration
from .operations import BotsOperations
from .operations import ChannelsOperations
from .operations import DirectLineOperations
from .operations import Operations
from .operations import BotConnectionOperations
from .operations import HostSettingsOperations
from . import models


class AzureBotService(object):
class AzureBotService:
"""Azure Bot Service is a platform for creating smart conversational agents.
:ivar bots: BotsOperations operations
Expand All @@ -43,61 +36,74 @@ class AzureBotService(object):
:vartype bot_connection: azure.mgmt.botservice.operations.BotConnectionOperations
:ivar host_settings: HostSettingsOperations operations
:vartype host_settings: azure.mgmt.botservice.operations.HostSettingsOperations
:ivar operation_results: OperationResultsOperations operations
:vartype operation_results: azure.mgmt.botservice.operations.OperationResultsOperations
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
:vartype private_endpoint_connections:
azure.mgmt.botservice.operations.PrivateEndpointConnectionsOperations
:ivar private_link_resources: PrivateLinkResourcesOperations operations
:vartype private_link_resources:
azure.mgmt.botservice.operations.PrivateLinkResourcesOperations
:param credential: Credential needed for the client to connect to Azure.
:type credential: ~azure.core.credentials.TokenCredential
:param subscription_id: Azure Subscription ID.
:type subscription_id: str
:param str base_url: Service URL
:param base_url: Service URL. Default value is 'https://management.azure.com'.
:type base_url: str
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
Retry-After header is present.
"""

def __init__(
self,
credential, # type: "TokenCredential"
subscription_id, # type: str
base_url=None, # type: Optional[str]
**kwargs # type: Any
):
# type: (...) -> None
if not base_url:
base_url = 'https://management.azure.com'
self._config = AzureBotServiceConfiguration(credential, subscription_id, **kwargs)
credential: "TokenCredential",
subscription_id: str,
base_url: str = "https://management.azure.com",
**kwargs: Any
) -> None:
self._config = AzureBotServiceConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)

client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
self._serialize = Serializer(client_models)
self._serialize.client_side_validation = False
self._deserialize = Deserializer(client_models)

self.bots = BotsOperations(
self._client, self._config, self._serialize, self._deserialize)
self.channels = ChannelsOperations(
self._client, self._config, self._serialize, self._deserialize)
self.direct_line = DirectLineOperations(
self._client, self._config, self._serialize, self._deserialize)
self.operations = Operations(
self._client, self._config, self._serialize, self._deserialize)
self.bot_connection = BotConnectionOperations(
self._client, self._config, self._serialize, self._deserialize)
self.host_settings = HostSettingsOperations(
self._client, self._config, self._serialize, self._deserialize)

def _send_request(self, http_request, **kwargs):
# type: (HttpRequest, Any) -> HttpResponse
self._serialize.client_side_validation = False
self.bots = BotsOperations(self._client, self._config, self._serialize, self._deserialize)
self.channels = ChannelsOperations(self._client, self._config, self._serialize, self._deserialize)
self.direct_line = DirectLineOperations(self._client, self._config, self._serialize, self._deserialize)
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
self.bot_connection = BotConnectionOperations(self._client, self._config, self._serialize, self._deserialize)
self.host_settings = HostSettingsOperations(self._client, self._config, self._serialize, self._deserialize)
self.operation_results = OperationResultsOperations(self._client, self._config, self._serialize, self._deserialize)
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(self._client, self._config, self._serialize, self._deserialize)
self.private_link_resources = PrivateLinkResourcesOperations(self._client, self._config, self._serialize, self._deserialize)


def _send_request(
self,
request, # type: HttpRequest
**kwargs: Any
) -> HttpResponse:
"""Runs the network request through the client's chained policies.
:param http_request: The network request you want to make. Required.
:type http_request: ~azure.core.pipeline.transport.HttpRequest
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
>>> from azure.core.rest import HttpRequest
>>> request = HttpRequest("GET", "https://www.example.org/")
<HttpRequest [GET], url: 'https://www.example.org/'>
>>> response = client._send_request(request)
<HttpResponse: 200 OK>
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
:param request: The network request you want to make. Required.
:type request: ~azure.core.rest.HttpRequest
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
:return: The response of your network call. Does not do error handling on your response.
:rtype: ~azure.core.pipeline.transport.HttpResponse
:rtype: ~azure.core.rest.HttpResponse
"""
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
}
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
stream = kwargs.pop("stream", True)
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
return pipeline_response.http_response

request_copy = deepcopy(request)
request_copy.url = self._client.format_url(request_copy.url)
return self._client.send_request(request_copy, **kwargs)

def close(self):
# type: () -> None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,16 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

from typing import TYPE_CHECKING
from typing import Any, TYPE_CHECKING

from azure.core.configuration import Configuration
from azure.core.pipeline import policies
from azure.mgmt.core.policies import ARMHttpLoggingPolicy
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy

from ._version import VERSION

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
from typing import Any

from azure.core.credentials import TokenCredential


Expand All @@ -35,20 +33,19 @@ class AzureBotServiceConfiguration(Configuration):

def __init__(
self,
credential, # type: "TokenCredential"
subscription_id, # type: str
**kwargs # type: Any
):
# type: (...) -> None
credential: "TokenCredential",
subscription_id: str,
**kwargs: Any
) -> None:
super(AzureBotServiceConfiguration, self).__init__(**kwargs)
if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
if subscription_id is None:
raise ValueError("Parameter 'subscription_id' must not be None.")
super(AzureBotServiceConfiguration, self).__init__(**kwargs)

self.credential = credential
self.subscription_id = subscription_id
self.api_version = "2021-03-01"
self.api_version = "2021-05-01-preview"
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
kwargs.setdefault('sdk_moniker', 'mgmt-botservice/{}'.format(VERSION))
self._configure(**kwargs)
Expand All @@ -68,4 +65,4 @@ def _configure(
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
self.authentication_policy = kwargs.get('authentication_policy')
if self.credential and not self.authentication_policy:
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)
Loading

0 comments on commit e9ca031

Please sign in to comment.