Skip to content

Commit 94bef6a

Browse files
author
SDKAuto
committed
CodeGen from PR 17983 in Azure/azure-rest-api-specs
Merge 6c59d76302b471168b23c77415971e97eae27b4e into 9b57fab
1 parent f95ad6a commit 94bef6a

38 files changed

+4989
-5691
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"autorest": "3.4.5",
2+
"autorest": "3.7.2",
33
"use": [
4-
"@autorest/python@5.8.4",
5-
"@autorest/[email protected].2"
4+
"@autorest/python@5.12.0",
5+
"@autorest/[email protected].3"
66
],
7-
"commit": "84d82e9a8f422a930f4e0ffbe037ae9dce5fce3f",
7+
"commit": "7213fa4cf1842491137481385469fa78522b9aec",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/healthcareapis/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.4 --use=@autorest/[email protected].2 --version=3.4.5",
9+
"autorest_command": "autorest specification/healthcareapis/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/[email protected].3 --version=3.7.2",
1010
"readme": "specification/healthcareapis/resource-manager/readme.md"
1111
}

sdk/healthcareapis/azure-mgmt-healthcareapis/azure/mgmt/healthcareapis/__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__ = ['HealthcareApisManagementClient']
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/healthcareapis/azure-mgmt-healthcareapis/azure/mgmt/healthcareapis/_configuration.py

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

9-
from typing import TYPE_CHECKING
9+
from typing import Any, TYPE_CHECKING
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

1717
if TYPE_CHECKING:
1818
# pylint: disable=unused-import,ungrouped-imports
19-
from typing import Any
20-
2119
from azure.core.credentials import TokenCredential
2220

2321

@@ -35,16 +33,15 @@ class HealthcareApisManagementClientConfiguration(Configuration):
3533

3634
def __init__(
3735
self,
38-
credential, # type: "TokenCredential"
39-
subscription_id, # type: str
40-
**kwargs # type: Any
41-
):
42-
# type: (...) -> None
36+
credential: "TokenCredential",
37+
subscription_id: str,
38+
**kwargs: Any
39+
) -> None:
40+
super(HealthcareApisManagementClientConfiguration, self).__init__(**kwargs)
4341
if credential is None:
4442
raise ValueError("Parameter 'credential' must not be None.")
4543
if subscription_id is None:
4644
raise ValueError("Parameter 'subscription_id' must not be None.")
47-
super(HealthcareApisManagementClientConfiguration, self).__init__(**kwargs)
4845

4946
self.credential = credential
5047
self.subscription_id = subscription_id
@@ -68,4 +65,4 @@ def _configure(
6865
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6966
self.authentication_policy = kwargs.get('authentication_policy')
7067
if self.credential and not self.authentication_policy:
71-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
68+
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

sdk/healthcareapis/azure-mgmt-healthcareapis/azure/mgmt/healthcareapis/_healthcare_apis_management_client.py

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

9-
from typing import TYPE_CHECKING
9+
from copy import deepcopy
10+
from typing import Any, Optional, TYPE_CHECKING
1011

12+
from azure.core.rest import HttpRequest, HttpResponse
1113
from azure.mgmt.core import ARMPipelineClient
1214
from msrest import Deserializer, Serializer
1315

16+
from . import models
17+
from ._configuration import HealthcareApisManagementClientConfiguration
18+
from .operations import DicomServicesOperations, FhirDestinationsOperations, FhirServicesOperations, IotConnectorFhirDestinationOperations, IotConnectorsOperations, OperationResultsOperations, Operations, PrivateEndpointConnectionsOperations, PrivateLinkResourcesOperations, ServicesOperations, WorkspacesOperations
19+
1420
if TYPE_CHECKING:
1521
# pylint: disable=unused-import,ungrouped-imports
16-
from typing import Any, Optional
17-
1822
from azure.core.credentials import TokenCredential
19-
from azure.core.pipeline.transport import HttpRequest, HttpResponse
20-
21-
from ._configuration import HealthcareApisManagementClientConfiguration
22-
from .operations import ServicesOperations
23-
from .operations import PrivateEndpointConnectionsOperations
24-
from .operations import PrivateLinkResourcesOperations
25-
from .operations import WorkspacesOperations
26-
from .operations import DicomServicesOperations
27-
from .operations import IotConnectorsOperations
28-
from .operations import FhirDestinationsOperations
29-
from .operations import IotConnectorFhirDestinationOperations
30-
from .operations import FhirServicesOperations
31-
from .operations import Operations
32-
from .operations import OperationResultsOperations
33-
from . import models
34-
3523

36-
class HealthcareApisManagementClient(object):
24+
class HealthcareApisManagementClient:
3725
"""Azure Healthcare APIs Client.
3826
3927
:ivar services: ServicesOperations operations
4028
:vartype services: azure.mgmt.healthcareapis.operations.ServicesOperations
4129
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
42-
:vartype private_endpoint_connections: azure.mgmt.healthcareapis.operations.PrivateEndpointConnectionsOperations
30+
:vartype private_endpoint_connections:
31+
azure.mgmt.healthcareapis.operations.PrivateEndpointConnectionsOperations
4332
:ivar private_link_resources: PrivateLinkResourcesOperations operations
44-
:vartype private_link_resources: azure.mgmt.healthcareapis.operations.PrivateLinkResourcesOperations
33+
:vartype private_link_resources:
34+
azure.mgmt.healthcareapis.operations.PrivateLinkResourcesOperations
4535
:ivar workspaces: WorkspacesOperations operations
4636
:vartype workspaces: azure.mgmt.healthcareapis.operations.WorkspacesOperations
4737
:ivar dicom_services: DicomServicesOperations operations
@@ -51,7 +41,8 @@ class HealthcareApisManagementClient(object):
5141
:ivar fhir_destinations: FhirDestinationsOperations operations
5242
:vartype fhir_destinations: azure.mgmt.healthcareapis.operations.FhirDestinationsOperations
5343
:ivar iot_connector_fhir_destination: IotConnectorFhirDestinationOperations operations
54-
:vartype iot_connector_fhir_destination: azure.mgmt.healthcareapis.operations.IotConnectorFhirDestinationOperations
44+
:vartype iot_connector_fhir_destination:
45+
azure.mgmt.healthcareapis.operations.IotConnectorFhirDestinationOperations
5546
:ivar fhir_services: FhirServicesOperations operations
5647
:vartype fhir_services: azure.mgmt.healthcareapis.operations.FhirServicesOperations
5748
:ivar operations: Operations operations
@@ -62,68 +53,64 @@ class HealthcareApisManagementClient(object):
6253
:type credential: ~azure.core.credentials.TokenCredential
6354
:param subscription_id: The subscription identifier.
6455
:type subscription_id: str
65-
:param str base_url: Service URL
66-
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
56+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
57+
:type base_url: str
58+
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
59+
Retry-After header is present.
6760
"""
6861

6962
def __init__(
7063
self,
71-
credential, # type: "TokenCredential"
72-
subscription_id, # type: str
73-
base_url=None, # type: Optional[str]
74-
**kwargs # type: Any
75-
):
76-
# type: (...) -> None
77-
if not base_url:
78-
base_url = 'https://management.azure.com'
79-
self._config = HealthcareApisManagementClientConfiguration(credential, subscription_id, **kwargs)
64+
credential: "TokenCredential",
65+
subscription_id: str,
66+
base_url: str = "https://management.azure.com",
67+
**kwargs: Any
68+
) -> None:
69+
self._config = HealthcareApisManagementClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
8070
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
8171

8272
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
8373
self._serialize = Serializer(client_models)
84-
self._serialize.client_side_validation = False
8574
self._deserialize = Deserializer(client_models)
86-
87-
self.services = ServicesOperations(
88-
self._client, self._config, self._serialize, self._deserialize)
89-
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
90-
self._client, self._config, self._serialize, self._deserialize)
91-
self.private_link_resources = PrivateLinkResourcesOperations(
92-
self._client, self._config, self._serialize, self._deserialize)
93-
self.workspaces = WorkspacesOperations(
94-
self._client, self._config, self._serialize, self._deserialize)
95-
self.dicom_services = DicomServicesOperations(
96-
self._client, self._config, self._serialize, self._deserialize)
97-
self.iot_connectors = IotConnectorsOperations(
98-
self._client, self._config, self._serialize, self._deserialize)
99-
self.fhir_destinations = FhirDestinationsOperations(
100-
self._client, self._config, self._serialize, self._deserialize)
101-
self.iot_connector_fhir_destination = IotConnectorFhirDestinationOperations(
102-
self._client, self._config, self._serialize, self._deserialize)
103-
self.fhir_services = FhirServicesOperations(
104-
self._client, self._config, self._serialize, self._deserialize)
105-
self.operations = Operations(
106-
self._client, self._config, self._serialize, self._deserialize)
107-
self.operation_results = OperationResultsOperations(
108-
self._client, self._config, self._serialize, self._deserialize)
109-
110-
def _send_request(self, http_request, **kwargs):
111-
# type: (HttpRequest, Any) -> HttpResponse
75+
self._serialize.client_side_validation = False
76+
self.services = ServicesOperations(self._client, self._config, self._serialize, self._deserialize)
77+
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(self._client, self._config, self._serialize, self._deserialize)
78+
self.private_link_resources = PrivateLinkResourcesOperations(self._client, self._config, self._serialize, self._deserialize)
79+
self.workspaces = WorkspacesOperations(self._client, self._config, self._serialize, self._deserialize)
80+
self.dicom_services = DicomServicesOperations(self._client, self._config, self._serialize, self._deserialize)
81+
self.iot_connectors = IotConnectorsOperations(self._client, self._config, self._serialize, self._deserialize)
82+
self.fhir_destinations = FhirDestinationsOperations(self._client, self._config, self._serialize, self._deserialize)
83+
self.iot_connector_fhir_destination = IotConnectorFhirDestinationOperations(self._client, self._config, self._serialize, self._deserialize)
84+
self.fhir_services = FhirServicesOperations(self._client, self._config, self._serialize, self._deserialize)
85+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
86+
self.operation_results = OperationResultsOperations(self._client, self._config, self._serialize, self._deserialize)
87+
88+
89+
def _send_request(
90+
self,
91+
request, # type: HttpRequest
92+
**kwargs: Any
93+
) -> HttpResponse:
11294
"""Runs the network request through the client's chained policies.
11395
114-
:param http_request: The network request you want to make. Required.
115-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
116-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
96+
>>> from azure.core.rest import HttpRequest
97+
>>> request = HttpRequest("GET", "https://www.example.org/")
98+
<HttpRequest [GET], url: 'https://www.example.org/'>
99+
>>> response = client._send_request(request)
100+
<HttpResponse: 200 OK>
101+
102+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
103+
104+
:param request: The network request you want to make. Required.
105+
:type request: ~azure.core.rest.HttpRequest
106+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
117107
:return: The response of your network call. Does not do error handling on your response.
118-
:rtype: ~azure.core.pipeline.transport.HttpResponse
108+
:rtype: ~azure.core.rest.HttpResponse
119109
"""
120-
path_format_arguments = {
121-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
122-
}
123-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
124-
stream = kwargs.pop("stream", True)
125-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
126-
return pipeline_response.http_response
110+
111+
request_copy = deepcopy(request)
112+
request_copy.url = self._client.format_url(request_copy.url)
113+
return self._client.send_request(request_copy, **kwargs)
127114

128115
def close(self):
129116
# type: () -> None

sdk/healthcareapis/azure-mgmt-healthcareapis/azure/mgmt/healthcareapis/_metadata.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"name": "HealthcareApisManagementClient",
66
"filename": "_healthcare_apis_management_client",
77
"description": "Azure Healthcare APIs Client.",
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,
1111
"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\": [\"HealthcareApisManagementClientConfiguration\"]}}, \"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\": [\"HealthcareApisManagementClientConfiguration\"]}}, \"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\": [\"HealthcareApisManagementClientConfiguration\"]}}, \"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\": [\"HealthcareApisManagementClientConfiguration\"]}}, \"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,11 +91,10 @@
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
"services": "ServicesOperations",

0 commit comments

Comments
 (0)