From f9b84248da227cbd7915f3e7cc333feb67e61ada Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 6 Mar 2025 15:11:24 -0500 Subject: [PATCH 1/4] don't require black on samples --- .../azure/multiapi/sample/__init__.py | 4 +- .../azure/multiapi/sample/_configuration.py | 38 ++++---- .../sample/_multiapi_service_client.py | 90 ++++++++----------- .../multiapi/sample/_operations_mixin.py | 44 +++++---- .../azure/multiapi/sample/aio/__init__.py | 3 +- .../multiapi/sample/aio/_configuration.py | 38 ++++---- .../sample/aio/_multiapi_service_client.py | 86 +++++++----------- .../multiapi/sample/aio/_operations_mixin.py | 46 ++++++---- 8 files changed, 166 insertions(+), 183 deletions(-) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/__init__.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/__init__.py index 09a500e6f5c..b54d40dbd2f 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/__init__.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/__init__.py @@ -7,12 +7,10 @@ # -------------------------------------------------------------------------- from ._multiapi_service_client import MultiapiServiceClient - -__all__ = ["MultiapiServiceClient"] +__all__ = ['MultiapiServiceClient'] try: from ._patch import patch_sdk # type: ignore - patch_sdk() except ImportError: pass diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/_configuration.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/_configuration.py index 88bc35f69e9..01c1c4907c2 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/_configuration.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/_configuration.py @@ -19,7 +19,6 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials import TokenCredential - class MultiapiServiceClientConfiguration: """Configuration for MultiapiServiceClient. @@ -30,27 +29,32 @@ class MultiapiServiceClientConfiguration: :type credential: ~azure.core.credentials.TokenCredential """ - def __init__(self, credential: "TokenCredential", **kwargs: Any): + def __init__( + self, + credential: "TokenCredential", + **kwargs: Any + ): if credential is None: raise ValueError("Parameter 'credential' must not be None.") self.credential = credential - self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"]) - kwargs.setdefault("sdk_moniker", "azure-multiapi-sample/{}".format(VERSION)) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) + kwargs.setdefault('sdk_moniker', 'azure-multiapi-sample/{}'.format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) - def _configure(self, **kwargs: Any): - self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) - self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) - self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) - self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) - self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs) - self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs) - self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) - self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs) - self.authentication_policy = kwargs.get("authentication_policy") + def _configure( + self, + **kwargs: Any + ): + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get('http_logging_policy') or ARMHttpLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get('retry_policy') or policies.RetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) + 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 = ARMChallengeAuthenticationPolicy( - self.credential, *self.credential_scopes, **kwargs - ) + self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/_multiapi_service_client.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/_multiapi_service_client.py index cc268ec01a7..1d046f74831 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/_multiapi_service_client.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/_multiapi_service_client.py @@ -26,7 +26,6 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials import TokenCredential - class _SDKClient(object): def __init__(self, *args, **kwargs): """This is a fake class to support current implementation of MultiApiClientMixin." @@ -34,7 +33,6 @@ def __init__(self, *args, **kwargs): """ pass - class MultiapiServiceClient(MultiapiServiceClientOperationsMixin, MultiApiClientMixin, _SDKClient): """Service client for multiapi client testing. @@ -57,30 +55,28 @@ class MultiapiServiceClient(MultiapiServiceClientOperationsMixin, MultiApiClient :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. """ - DEFAULT_API_VERSION = "3.0.0" + DEFAULT_API_VERSION = '3.0.0' _PROFILE_TAG = "azure.multiapi.sample.MultiapiServiceClient" - LATEST_PROFILE = ProfileDefinition( - { - _PROFILE_TAG: { - None: DEFAULT_API_VERSION, - "begin_test_lro": "1.0.0", - "begin_test_lro_and_paging": "1.0.0", - "test_one": "2.0.0", - } - }, - _PROFILE_TAG + " latest", + LATEST_PROFILE = ProfileDefinition({ + _PROFILE_TAG: { + None: DEFAULT_API_VERSION, + 'begin_test_lro': '1.0.0', + 'begin_test_lro_and_paging': '1.0.0', + 'test_one': '2.0.0', + }}, + _PROFILE_TAG + " latest" ) def __init__( self, credential: "TokenCredential", - api_version: Optional[str] = None, + api_version: Optional[str]=None, base_url: str = "http://localhost:3000", - profile: KnownProfiles = KnownProfiles.default, + profile: KnownProfiles=KnownProfiles.default, **kwargs: Any ): if api_version: - kwargs.setdefault("api_version", api_version) + kwargs.setdefault('api_version', api_version) self._config = MultiapiServiceClientConfiguration(credential, **kwargs) _policies = kwargs.pop("policies", None) if _policies is None: @@ -101,7 +97,10 @@ def __init__( self._config.http_logging_policy, ] self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs) - super(MultiapiServiceClient, self).__init__(api_version=api_version, profile=profile) + super(MultiapiServiceClient, self).__init__( + api_version=api_version, + profile=profile + ) @classmethod def _models_dict(cls, api_version): @@ -111,21 +110,18 @@ def _models_dict(cls, api_version): def models(cls, api_version=DEFAULT_API_VERSION): """Module depends on the API version: - * 1.0.0: :mod:`v1.models` - * 2.0.0: :mod:`v2.models` - * 3.0.0: :mod:`v3.models` + * 1.0.0: :mod:`v1.models` + * 2.0.0: :mod:`v2.models` + * 3.0.0: :mod:`v3.models` """ - if api_version == "1.0.0": + if api_version == '1.0.0': from .v1 import models - return models - elif api_version == "2.0.0": + elif api_version == '2.0.0': from .v2 import models - return models - elif api_version == "3.0.0": + elif api_version == '3.0.0': from .v3 import models - return models raise ValueError("API version {} is not available".format(api_version)) @@ -133,57 +129,43 @@ def models(cls, api_version=DEFAULT_API_VERSION): def operation_group_one(self): """Instance depends on the API version: - * 1.0.0: :class:`OperationGroupOneOperations` - * 2.0.0: :class:`OperationGroupOneOperations` - * 3.0.0: :class:`OperationGroupOneOperations` + * 1.0.0: :class:`OperationGroupOneOperations` + * 2.0.0: :class:`OperationGroupOneOperations` + * 3.0.0: :class:`OperationGroupOneOperations` """ - api_version = self._get_api_version("operation_group_one") - if api_version == "1.0.0": + api_version = self._get_api_version('operation_group_one') + if api_version == '1.0.0': from .v1.operations import OperationGroupOneOperations as OperationClass - elif api_version == "2.0.0": + elif api_version == '2.0.0': from .v2.operations import OperationGroupOneOperations as OperationClass - elif api_version == "3.0.0": + elif api_version == '3.0.0': from .v3.operations import OperationGroupOneOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'operation_group_one'".format(api_version)) self._config.api_version = api_version - return OperationClass( - self._client, - self._config, - Serializer(self._models_dict(api_version)), - Deserializer(self._models_dict(api_version)), - api_version, - ) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) @property def operation_group_two(self): """Instance depends on the API version: - * 2.0.0: :class:`OperationGroupTwoOperations` - * 3.0.0: :class:`OperationGroupTwoOperations` + * 2.0.0: :class:`OperationGroupTwoOperations` + * 3.0.0: :class:`OperationGroupTwoOperations` """ - api_version = self._get_api_version("operation_group_two") - if api_version == "2.0.0": + api_version = self._get_api_version('operation_group_two') + if api_version == '2.0.0': from .v2.operations import OperationGroupTwoOperations as OperationClass - elif api_version == "3.0.0": + elif api_version == '3.0.0': from .v3.operations import OperationGroupTwoOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'operation_group_two'".format(api_version)) self._config.api_version = api_version - return OperationClass( - self._client, - self._config, - Serializer(self._models_dict(api_version)), - Deserializer(self._models_dict(api_version)), - api_version, - ) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) def close(self): self._client.close() - def __enter__(self): self._client.__enter__() return self - def __exit__(self, *exc_details): self._client.__exit__(*exc_details) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/_operations_mixin.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/_operations_mixin.py index 5af54a9ee1d..d55b41d3a3b 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/_operations_mixin.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/_operations_mixin.py @@ -21,7 +21,9 @@ class MultiapiServiceClientOperationsMixin(object): def begin_test_lro( - self, product: Optional[Union[_models.Product, IO[bytes]]] = None, **kwargs: Any + self, + product: Optional[Union[_models.Product, IO[bytes]]] = None, + **kwargs: Any ) -> LROPoller[_models.Product]: """Put in whatever shape of Product you want, will return a Product with id equal to 100. @@ -32,8 +34,8 @@ def begin_test_lro( :rtype: ~azure.core.polling.LROPoller[~azure.multiapi.sample.v1.models.Product] :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = self._get_api_version("begin_test_lro") - if api_version == "1.0.0": + api_version = self._get_api_version('begin_test_lro') + if api_version == '1.0.0': from .v1.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise ValueError("API version {} does not have operation 'begin_test_lro'".format(api_version)) @@ -64,8 +66,8 @@ def begin_test_lro_and_paging( ~azure.core.polling.LROPoller[~azure.core.paging.ItemPaged[~azure.multiapi.sample.v1.models.Product]] :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = self._get_api_version("begin_test_lro_and_paging") - if api_version == "1.0.0": + api_version = self._get_api_version('begin_test_lro_and_paging') + if api_version == '1.0.0': from .v1.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise ValueError("API version {} does not have operation 'begin_test_lro_and_paging'".format(api_version)) @@ -97,12 +99,12 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = self._get_api_version("test_different_calls") - if api_version == "1.0.0": + api_version = self._get_api_version('test_different_calls') + if api_version == '1.0.0': from .v1.operations import MultiapiServiceClientOperationsMixin as OperationClass - elif api_version == "2.0.0": + elif api_version == '2.0.0': from .v2.operations import MultiapiServiceClientOperationsMixin as OperationClass - elif api_version == "3.0.0": + elif api_version == '3.0.0': from .v3.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise ValueError("API version {} does not have operation 'test_different_calls'".format(api_version)) @@ -113,12 +115,13 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements mixin_instance._serialize = Serializer(self._models_dict(api_version)) mixin_instance._serialize.client_side_validation = False mixin_instance._deserialize = Deserializer(self._models_dict(api_version)) - return mixin_instance.test_different_calls( - greeting_in_english, greeting_in_chinese, greeting_in_french, **kwargs - ) + return mixin_instance.test_different_calls(greeting_in_english, greeting_in_chinese, greeting_in_french, **kwargs) def test_one( # pylint: disable=inconsistent-return-statements - self, id: int, message: Optional[str] = None, **kwargs: Any + self, + id: int, + message: Optional[str] = None, + **kwargs: Any ) -> None: """TestOne should be in an FirstVersionOperationsMixin. @@ -130,10 +133,10 @@ def test_one( # pylint: disable=inconsistent-return-statements :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = self._get_api_version("test_one") - if api_version == "1.0.0": + api_version = self._get_api_version('test_one') + if api_version == '1.0.0': from .v1.operations import MultiapiServiceClientOperationsMixin as OperationClass - elif api_version == "2.0.0": + elif api_version == '2.0.0': from .v2.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise ValueError("API version {} does not have operation 'test_one'".format(api_version)) @@ -146,15 +149,18 @@ def test_one( # pylint: disable=inconsistent-return-statements mixin_instance._deserialize = Deserializer(self._models_dict(api_version)) return mixin_instance.test_one(id, message, **kwargs) - def test_paging(self, **kwargs: Any) -> Iterable["_models.ModelThree"]: + def test_paging( + self, + **kwargs: Any + ) -> Iterable["_models.ModelThree"]: """Returns ModelThree with optionalProperty 'paged'. :return: An iterator like instance of either ModelThree or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.multiapi.sample.v3.models.ModelThree] :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = self._get_api_version("test_paging") - if api_version == "3.0.0": + api_version = self._get_api_version('test_paging') + if api_version == '3.0.0': from .v3.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise ValueError("API version {} does not have operation 'test_paging'".format(api_version)) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/aio/__init__.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/aio/__init__.py index 5dc86527950..c5088f7a288 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/aio/__init__.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/aio/__init__.py @@ -7,5 +7,4 @@ # -------------------------------------------------------------------------- from ._multiapi_service_client import MultiapiServiceClient - -__all__ = ["MultiapiServiceClient"] +__all__ = ['MultiapiServiceClient'] diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/aio/_configuration.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/aio/_configuration.py index ce9df4f2a2b..09ba5dda158 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/aio/_configuration.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/aio/_configuration.py @@ -19,7 +19,6 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential - class MultiapiServiceClientConfiguration: """Configuration for MultiapiServiceClient. @@ -30,27 +29,32 @@ class MultiapiServiceClientConfiguration: :type credential: ~azure.core.credentials_async.AsyncTokenCredential """ - def __init__(self, credential: "AsyncTokenCredential", **kwargs: Any) -> None: + def __init__( + self, + credential: "AsyncTokenCredential", + **kwargs: Any + ) -> None: if credential is None: raise ValueError("Parameter 'credential' must not be None.") self.credential = credential - self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"]) - kwargs.setdefault("sdk_moniker", "azure-multiapi-sample/{}".format(VERSION)) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) + kwargs.setdefault('sdk_moniker', 'azure-multiapi-sample/{}'.format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) - def _configure(self, **kwargs: Any) -> None: - self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) - self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) - self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) - self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) - self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs) - self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs) - self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) - self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs) - self.authentication_policy = kwargs.get("authentication_policy") + def _configure( + self, + **kwargs: Any + ) -> None: + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get('http_logging_policy') or ARMHttpLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get('retry_policy') or policies.AsyncRetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get('redirect_policy') or policies.AsyncRedirectPolicy(**kwargs) + self.authentication_policy = kwargs.get('authentication_policy') if self.credential and not self.authentication_policy: - self.authentication_policy = AsyncARMChallengeAuthenticationPolicy( - self.credential, *self.credential_scopes, **kwargs - ) + self.authentication_policy = AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/aio/_multiapi_service_client.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/aio/_multiapi_service_client.py index b451fdf5b63..20bbd65e7bf 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/aio/_multiapi_service_client.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/aio/_multiapi_service_client.py @@ -26,7 +26,6 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential - class _SDKClient(object): def __init__(self, *args, **kwargs): """This is a fake class to support current implementation of MultiApiClientMixin." @@ -34,7 +33,6 @@ def __init__(self, *args, **kwargs): """ pass - class MultiapiServiceClient(MultiapiServiceClientOperationsMixin, MultiApiClientMixin, _SDKClient): """Service client for multiapi client testing. @@ -57,18 +55,16 @@ class MultiapiServiceClient(MultiapiServiceClientOperationsMixin, MultiApiClient :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. """ - DEFAULT_API_VERSION = "3.0.0" + DEFAULT_API_VERSION = '3.0.0' _PROFILE_TAG = "azure.multiapi.sample.MultiapiServiceClient" - LATEST_PROFILE = ProfileDefinition( - { - _PROFILE_TAG: { - None: DEFAULT_API_VERSION, - "begin_test_lro": "1.0.0", - "begin_test_lro_and_paging": "1.0.0", - "test_one": "2.0.0", - } - }, - _PROFILE_TAG + " latest", + LATEST_PROFILE = ProfileDefinition({ + _PROFILE_TAG: { + None: DEFAULT_API_VERSION, + 'begin_test_lro': '1.0.0', + 'begin_test_lro_and_paging': '1.0.0', + 'test_one': '2.0.0', + }}, + _PROFILE_TAG + " latest" ) def __init__( @@ -80,7 +76,7 @@ def __init__( **kwargs: Any ) -> None: if api_version: - kwargs.setdefault("api_version", api_version) + kwargs.setdefault('api_version', api_version) self._config = MultiapiServiceClientConfiguration(credential, **kwargs) _policies = kwargs.pop("policies", None) if _policies is None: @@ -101,7 +97,10 @@ def __init__( self._config.http_logging_policy, ] self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, policies=_policies, **kwargs) - super(MultiapiServiceClient, self).__init__(api_version=api_version, profile=profile) + super(MultiapiServiceClient, self).__init__( + api_version=api_version, + profile=profile + ) @classmethod def _models_dict(cls, api_version): @@ -111,21 +110,18 @@ def _models_dict(cls, api_version): def models(cls, api_version=DEFAULT_API_VERSION): """Module depends on the API version: - * 1.0.0: :mod:`v1.models` - * 2.0.0: :mod:`v2.models` - * 3.0.0: :mod:`v3.models` + * 1.0.0: :mod:`v1.models` + * 2.0.0: :mod:`v2.models` + * 3.0.0: :mod:`v3.models` """ - if api_version == "1.0.0": + if api_version == '1.0.0': from ..v1 import models - return models - elif api_version == "2.0.0": + elif api_version == '2.0.0': from ..v2 import models - return models - elif api_version == "3.0.0": + elif api_version == '3.0.0': from ..v3 import models - return models raise ValueError("API version {} is not available".format(api_version)) @@ -133,57 +129,43 @@ def models(cls, api_version=DEFAULT_API_VERSION): def operation_group_one(self): """Instance depends on the API version: - * 1.0.0: :class:`OperationGroupOneOperations` - * 2.0.0: :class:`OperationGroupOneOperations` - * 3.0.0: :class:`OperationGroupOneOperations` + * 1.0.0: :class:`OperationGroupOneOperations` + * 2.0.0: :class:`OperationGroupOneOperations` + * 3.0.0: :class:`OperationGroupOneOperations` """ - api_version = self._get_api_version("operation_group_one") - if api_version == "1.0.0": + api_version = self._get_api_version('operation_group_one') + if api_version == '1.0.0': from ..v1.aio.operations import OperationGroupOneOperations as OperationClass - elif api_version == "2.0.0": + elif api_version == '2.0.0': from ..v2.aio.operations import OperationGroupOneOperations as OperationClass - elif api_version == "3.0.0": + elif api_version == '3.0.0': from ..v3.aio.operations import OperationGroupOneOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'operation_group_one'".format(api_version)) self._config.api_version = api_version - return OperationClass( - self._client, - self._config, - Serializer(self._models_dict(api_version)), - Deserializer(self._models_dict(api_version)), - api_version, - ) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) @property def operation_group_two(self): """Instance depends on the API version: - * 2.0.0: :class:`OperationGroupTwoOperations` - * 3.0.0: :class:`OperationGroupTwoOperations` + * 2.0.0: :class:`OperationGroupTwoOperations` + * 3.0.0: :class:`OperationGroupTwoOperations` """ - api_version = self._get_api_version("operation_group_two") - if api_version == "2.0.0": + api_version = self._get_api_version('operation_group_two') + if api_version == '2.0.0': from ..v2.aio.operations import OperationGroupTwoOperations as OperationClass - elif api_version == "3.0.0": + elif api_version == '3.0.0': from ..v3.aio.operations import OperationGroupTwoOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'operation_group_two'".format(api_version)) self._config.api_version = api_version - return OperationClass( - self._client, - self._config, - Serializer(self._models_dict(api_version)), - Deserializer(self._models_dict(api_version)), - api_version, - ) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) async def close(self): await self._client.close() - async def __aenter__(self): await self._client.__aenter__() return self - async def __aexit__(self, *exc_details): await self._client.__aexit__(*exc_details) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/aio/_operations_mixin.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/aio/_operations_mixin.py index 1e78a1b03f9..6c75275be96 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/aio/_operations_mixin.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/aio/_operations_mixin.py @@ -21,7 +21,9 @@ class MultiapiServiceClientOperationsMixin(object): async def begin_test_lro( - self, product: Optional[Union[_models.Product, IO[bytes]]] = None, **kwargs: Any + self, + product: Optional[Union[_models.Product, IO[bytes]]] = None, + **kwargs: Any ) -> AsyncLROPoller[_models.Product]: """Put in whatever shape of Product you want, will return a Product with id equal to 100. @@ -33,8 +35,8 @@ async def begin_test_lro( :rtype: ~azure.core.polling.AsyncLROPoller[~azure.multiapi.sample.v1.models.Product] :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = self._get_api_version("begin_test_lro") - if api_version == "1.0.0": + api_version = self._get_api_version('begin_test_lro') + if api_version == '1.0.0': from ..v1.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise ValueError("API version {} does not have operation 'begin_test_lro'".format(api_version)) @@ -65,8 +67,8 @@ async def begin_test_lro_and_paging( ~azure.core.polling.AsyncLROPoller[~azure.core.async_paging.AsyncItemPaged[~azure.multiapi.sample.v1.models.Product]] :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = self._get_api_version("begin_test_lro_and_paging") - if api_version == "1.0.0": + api_version = self._get_api_version('begin_test_lro_and_paging') + if api_version == '1.0.0': from ..v1.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise ValueError("API version {} does not have operation 'begin_test_lro_and_paging'".format(api_version)) @@ -98,12 +100,12 @@ async def test_different_calls( :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = self._get_api_version("test_different_calls") - if api_version == "1.0.0": + api_version = self._get_api_version('test_different_calls') + if api_version == '1.0.0': from ..v1.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass - elif api_version == "2.0.0": + elif api_version == '2.0.0': from ..v2.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass - elif api_version == "3.0.0": + elif api_version == '3.0.0': from ..v3.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise ValueError("API version {} does not have operation 'test_different_calls'".format(api_version)) @@ -114,11 +116,14 @@ async def test_different_calls( mixin_instance._serialize = Serializer(self._models_dict(api_version)) mixin_instance._serialize.client_side_validation = False mixin_instance._deserialize = Deserializer(self._models_dict(api_version)) - return await mixin_instance.test_different_calls( - greeting_in_english, greeting_in_chinese, greeting_in_french, **kwargs - ) + return await mixin_instance.test_different_calls(greeting_in_english, greeting_in_chinese, greeting_in_french, **kwargs) - async def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) -> None: + async def test_one( + self, + id: int, + message: Optional[str] = None, + **kwargs: Any + ) -> None: """TestOne should be in an FirstVersionOperationsMixin. :param id: An int parameter. Required. @@ -129,10 +134,10 @@ async def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = self._get_api_version("test_one") - if api_version == "1.0.0": + api_version = self._get_api_version('test_one') + if api_version == '1.0.0': from ..v1.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass - elif api_version == "2.0.0": + elif api_version == '2.0.0': from ..v2.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise ValueError("API version {} does not have operation 'test_one'".format(api_version)) @@ -145,15 +150,18 @@ async def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) mixin_instance._deserialize = Deserializer(self._models_dict(api_version)) return await mixin_instance.test_one(id, message, **kwargs) - def test_paging(self, **kwargs: Any) -> AsyncIterable["_models.ModelThree"]: + def test_paging( + self, + **kwargs: Any + ) -> AsyncIterable["_models.ModelThree"]: """Returns ModelThree with optionalProperty 'paged'. :return: An iterator like instance of either ModelThree or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.multiapi.sample.v3.models.ModelThree] :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = self._get_api_version("test_paging") - if api_version == "3.0.0": + api_version = self._get_api_version('test_paging') + if api_version == '3.0.0': from ..v3.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise ValueError("API version {} does not have operation 'test_paging'".format(api_version)) From cf68a1fa90b6eeda7320926017e19126415d6f2d Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 6 Mar 2025 15:12:13 -0500 Subject: [PATCH 2/4] add changeset --- .../changes/fixBlackForSamplesMultiapi-2025-2-6-15-12-6.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .chronus/changes/fixBlackForSamplesMultiapi-2025-2-6-15-12-6.md diff --git a/.chronus/changes/fixBlackForSamplesMultiapi-2025-2-6-15-12-6.md b/.chronus/changes/fixBlackForSamplesMultiapi-2025-2-6-15-12-6.md new file mode 100644 index 00000000000..38c93b9ef25 --- /dev/null +++ b/.chronus/changes/fixBlackForSamplesMultiapi-2025-2-6-15-12-6.md @@ -0,0 +1,7 @@ +--- +changeKind: internal +packages: + - "@autorest/python" +--- + +don't require black on multiapi sample \ No newline at end of file From ee671a714f580b11e4f13776bfef5e59f3f2a57b Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 21 Apr 2025 14:06:53 -0400 Subject: [PATCH 3/4] ignore samples folder --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index e135e49b5f2..71e64320aa5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,6 +13,7 @@ exclude = ''' | node_modules | Expected/AcceptanceTests | generated/ + | samples/ )/ ''' line-length = 120 From 2658b9bc428add28126a840151e223497a46e82b Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 21 Apr 2025 14:10:08 -0400 Subject: [PATCH 4/4] ignore samples black --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 71e64320aa5..db71f851ba6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,10 +10,10 @@ exclude = ''' | buck-out | build | dist - | node_modules - | Expected/AcceptanceTests - | generated/ - | samples/ + | .*/node_modules/* + | .*/Expected/AcceptanceTests/* + | .*/generated/* + | .*/samples/* )/ ''' line-length = 120