Skip to content

Commit 69891f6

Browse files
author
SDKAuto
committed
CodeGen from PR 30843 in Azure/azure-rest-api-specs
Merge dfdae0071789ca3bf8b0a1e76f00ad13c63031f6 into 987a8f38ab2a8359d085e149be042267a9ecc66f
1 parent 78d83e0 commit 69891f6

27 files changed

+647
-479
lines changed

sdk/graphservices/azure-mgmt-graphservices/README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Microsoft Azure SDK for Python
22

33
This is the Microsoft Azure Graphservices Management Client Library.
4-
This package has been tested with Python 3.7+.
4+
This package has been tested with Python 3.8+.
55
For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
66

77
## _Disclaimer_
@@ -12,7 +12,7 @@ _Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For
1212

1313
### Prerequisites
1414

15-
- Python 3.7+ is required to use this package.
15+
- Python 3.8+ is required to use this package.
1616
- [Azure subscription](https://azure.microsoft.com/free/)
1717

1818
### Install the package
@@ -59,6 +59,3 @@ Code samples for this package can be found at:
5959
If you encounter any bugs or have suggestions, please file an issue in the
6060
[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
6161
section of the project.
62-
63-
64-
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-graphservices%2FREADME.png)
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "de54b003aee3524343bef30852213db29f55cccd",
2+
"commit": "5a2cc811fed2ecf3cd272ce5704df4ec9fe59872",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
4-
"autorest": "3.9.2",
4+
"autorest": "3.10.2",
55
"use": [
6-
"@autorest/python@6.4.12",
7-
"@autorest/modelerfour@4.24.3"
6+
"@autorest/python@6.19.0",
7+
"@autorest/modelerfour@4.27.0"
88
],
9-
"autorest_command": "autorest specification/graphservicesprod/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.4.12 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
9+
"autorest_command": "autorest specification/graphservicesprod/resource-manager/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.19.0 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
1010
"readme": "specification/graphservicesprod/resource-manager/readme.md"
1111
}

sdk/graphservices/azure-mgmt-graphservices/azure/mgmt/graphservices/_configuration.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
from typing import Any, TYPE_CHECKING
1010

11-
from azure.core.configuration import Configuration
1211
from azure.core.pipeline import policies
1312
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
1413

@@ -19,7 +18,7 @@
1918
from azure.core.credentials import TokenCredential
2019

2120

22-
class GraphServicesMgmtClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
21+
class GraphServicesMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
2322
"""Configuration for GraphServicesMgmtClient.
2423
2524
Note that all parameters used to create this instance are saved as instance
@@ -35,7 +34,6 @@ class GraphServicesMgmtClientConfiguration(Configuration): # pylint: disable=to
3534
"""
3635

3736
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
38-
super(GraphServicesMgmtClientConfiguration, self).__init__(**kwargs)
3937
api_version: str = kwargs.pop("api_version", "2023-04-13")
4038

4139
if credential is None:
@@ -48,6 +46,7 @@ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs
4846
self.api_version = api_version
4947
self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
5048
kwargs.setdefault("sdk_moniker", "mgmt-graphservices/{}".format(VERSION))
49+
self.polling_interval = kwargs.get("polling_interval", 30)
5150
self._configure(**kwargs)
5251

5352
def _configure(self, **kwargs: Any) -> None:
@@ -56,9 +55,9 @@ def _configure(self, **kwargs: Any) -> None:
5655
self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
5756
self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
5857
self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
59-
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
6058
self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
6159
self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
60+
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
6261
self.authentication_policy = kwargs.get("authentication_policy")
6362
if self.credential and not self.authentication_policy:
6463
self.authentication_policy = ARMChallengeAuthenticationPolicy(

sdk/graphservices/azure-mgmt-graphservices/azure/mgmt/graphservices/_graph_services_mgmt_client.py

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@
88

99
from copy import deepcopy
1010
from typing import Any, TYPE_CHECKING
11+
from typing_extensions import Self
1112

13+
from azure.core.pipeline import policies
1214
from azure.core.rest import HttpRequest, HttpResponse
1315
from azure.mgmt.core import ARMPipelineClient
16+
from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
1417

1518
from . import models as _models
1619
from ._configuration import GraphServicesMgmtClientConfiguration
@@ -52,7 +55,25 @@ def __init__(
5255
self._config = GraphServicesMgmtClientConfiguration(
5356
credential=credential, subscription_id=subscription_id, **kwargs
5457
)
55-
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
58+
_policies = kwargs.pop("policies", None)
59+
if _policies is None:
60+
_policies = [
61+
policies.RequestIdPolicy(**kwargs),
62+
self._config.headers_policy,
63+
self._config.user_agent_policy,
64+
self._config.proxy_policy,
65+
policies.ContentDecodePolicy(**kwargs),
66+
ARMAutoResourceProviderRegistrationPolicy(),
67+
self._config.redirect_policy,
68+
self._config.retry_policy,
69+
self._config.authentication_policy,
70+
self._config.custom_hook_policy,
71+
self._config.logging_policy,
72+
policies.DistributedTracingPolicy(**kwargs),
73+
policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
74+
self._config.http_logging_policy,
75+
]
76+
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
5677

5778
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
5879
self._serialize = Serializer(client_models)
@@ -61,7 +82,7 @@ def __init__(
6182
self.accounts = AccountsOperations(self._client, self._config, self._serialize, self._deserialize)
6283
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
6384

64-
def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
85+
def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
6586
"""Runs the network request through the client's chained policies.
6687
6788
>>> from azure.core.rest import HttpRequest
@@ -81,12 +102,12 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
81102

82103
request_copy = deepcopy(request)
83104
request_copy.url = self._client.format_url(request_copy.url)
84-
return self._client.send_request(request_copy, **kwargs)
105+
return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore
85106

86107
def close(self) -> None:
87108
self._client.close()
88109

89-
def __enter__(self) -> "GraphServicesMgmtClient":
110+
def __enter__(self) -> Self:
90111
self._client.__enter__()
91112
return self
92113

0 commit comments

Comments
 (0)