From 2c9701e92ce826a42623487bbd0396abec009a9e Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Wed, 6 Aug 2025 15:59:44 -0400 Subject: [PATCH 01/10] move to generation subdir test with more robust services --- .../typespec-python/scripts/eng/regenerate.ts | 23 +- .../authentication-api-key-subdir/MANIFEST.in | 8 - .../authentication/api/key/__init__.py | 1 - .../authentication/api/key/subdir/_client.py | 39 --- .../_generated/_operations/_operations.py | 152 ------------ .../_generated/aio/_operations/_operations.py | 128 ---------- .../subdir/_generated/apiview-properties.json | 10 - .../key/subdir/_generated/models/_models.py | 40 --- .../api/key/subdir/aio/_client.py | 39 --- .../CHANGELOG.md | 0 .../LICENSE | 0 .../generated/generation-subdir/MANIFEST.in | 6 + .../README.md | 6 +- .../dev_requirements.txt | 0 .../generated_tests/conftest.py | 16 +- .../generated_tests/test_recursive.py} | 22 +- .../generated_tests/test_recursive_async.py} | 24 +- .../generated_tests/testpreparer.py | 12 +- .../generated_tests/testpreparer_async.py | 8 +- .../generation}/__init__.py | 0 .../generation}/subdir/__init__.py | 8 +- .../generation/subdir/_client.py | 29 +++ .../generation}/subdir/_generated/__init__.py | 4 +- .../generation}/subdir/_generated/_client.py | 17 +- .../subdir/_generated/_configuration.py | 16 +- .../_generated}/_operations/__init__.py | 2 +- .../_generated/_operations/_operations.py | 229 ++++++++++++++++++ .../subdir/_generated/_operations/_patch.py | 0 .../generation}/subdir/_generated/_patch.py | 0 .../subdir/_generated/_utils/__init__.py | 0 .../subdir/_generated/_utils/model_base.py | 0 .../subdir/_generated/_utils/serialization.py | 0 .../subdir/_generated/_utils/utils.py | 0 .../generation}/subdir/_generated/_version.py | 0 .../subdir/_generated/aio/__init__.py | 4 +- .../subdir/_generated/aio/_client.py | 17 +- .../subdir/_generated/aio/_configuration.py | 16 +- .../_generated/aio}/_operations/__init__.py | 2 +- .../_generated/aio/_operations/_operations.py | 197 +++++++++++++++ .../_generated/aio/_operations/_patch.py | 0 .../subdir/_generated/aio/_patch.py | 0 .../subdir/_generated/apiview-properties.json | 11 + .../subdir/_generated/models/__init__.py | 6 +- .../subdir/_generated/models/_models.py | 75 ++++++ .../subdir/_generated/models/_patch.py | 0 .../generation}/subdir/_version.py | 0 .../generation}/subdir/aio/__init__.py | 4 +- .../generation/subdir/aio/_client.py | 30 +++ .../generation}/subdir/py.typed | 0 .../pyproject.toml | 10 +- .../test/azure/requirements.txt | 2 +- .../test_generation_subdir.py | 2 +- .../authentication-api-key-subdir/MANIFEST.in | 8 - .../authentication/__init__.py | 1 - .../authentication/api/__init__.py | 1 - .../authentication/api/key/__init__.py | 1 - .../authentication/api/key/subdir/_client.py | 39 --- .../_generated/_operations/_operations.py | 139 ----------- .../_generated/aio/_operations/_operations.py | 118 --------- .../key/subdir/_generated/models/_models.py | 34 --- .../api/key/subdir/aio/_client.py | 39 --- .../CHANGELOG.md | 0 .../generated/generation-subdir/MANIFEST.in | 6 + .../README.md | 4 +- .../generation-subdir/generation}/__init__.py | 0 .../generation}/subdir/__init__.py | 8 +- .../generation/subdir/_client.py | 29 +++ .../generation}/subdir/_generated/__init__.py | 4 +- .../generation}/subdir/_generated/_client.py | 17 +- .../subdir/_generated/_configuration.py | 18 +- .../_generated}/_operations/__init__.py | 2 +- .../_generated/_operations/_operations.py | 216 +++++++++++++++++ .../subdir/_generated/_operations/_patch.py | 0 .../generation}/subdir/_generated/_patch.py | 0 .../subdir/_generated/_utils/__init__.py | 0 .../subdir/_generated/_utils/model_base.py | 0 .../subdir/_generated/_utils/serialization.py | 0 .../subdir/_generated/_utils/utils.py | 0 .../generation}/subdir/_generated/_version.py | 0 .../subdir/_generated/aio/__init__.py | 4 +- .../subdir/_generated/aio/_client.py | 17 +- .../subdir/_generated/aio/_configuration.py | 18 +- .../_generated/aio}/_operations/__init__.py | 2 +- .../_generated/aio/_operations/_operations.py | 187 ++++++++++++++ .../_generated/aio/_operations/_patch.py | 0 .../subdir/_generated/aio/_patch.py | 0 .../subdir/_generated/models/__init__.py | 6 +- .../subdir/_generated/models/_models.py | 69 ++++++ .../subdir/_generated/models/_patch.py | 0 .../generation}/subdir/_version.py | 0 .../generation}/subdir/aio/__init__.py | 4 +- .../generation/subdir/aio/_client.py | 30 +++ .../generation}/subdir/py.typed | 0 .../pyproject.toml | 10 +- .../mock_api_tests/test_unbranded.py | 1 - .../test/unbranded/requirements.txt | 2 +- 96 files changed, 1261 insertions(+), 988 deletions(-) delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/MANIFEST.in delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/__init__.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_operations.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/apiview-properties.json delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_models.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/_client.py rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir => generation-subdir}/CHANGELOG.md (100%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir => generation-subdir}/LICENSE (100%) create mode 100644 packages/typespec-python/test/azure/generated/generation-subdir/MANIFEST.in rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir => generation-subdir}/README.md (91%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir => generation-subdir}/dev_requirements.txt (100%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir => generation-subdir}/generated_tests/conftest.py (54%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/generated_tests/test_api_key.py => generation-subdir/generated_tests/test_recursive.py} (61%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/generated_tests/test_api_key_async.py => generation-subdir/generated_tests/test_recursive_async.py} (58%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir => generation-subdir}/generated_tests/testpreparer.py (69%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir => generation-subdir}/generated_tests/testpreparer_async.py (76%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication => generation-subdir/generation}/__init__.py (100%) rename packages/typespec-python/test/{unbranded/generated/authentication-api-key-subdir/authentication/api/key => azure/generated/generation-subdir/generation}/subdir/__init__.py (70%) create mode 100644 packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_client.py rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/__init__.py (92%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_client.py (83%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_configuration.py (67%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio => generation-subdir/generation/subdir/_generated}/_operations/__init__.py (88%) create mode 100644 packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_operations/_operations.py rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_operations/_patch.py (100%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_patch.py (100%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_utils/__init__.py (100%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_utils/model_base.py (100%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_utils/serialization.py (100%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_utils/utils.py (100%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_version.py (100%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/aio/__init__.py (92%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/aio/_client.py (83%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/aio/_configuration.py (68%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key/subdir/_generated => generation-subdir/generation/subdir/_generated/aio}/_operations/__init__.py (88%) create mode 100644 packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_operations/_operations.py rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/aio/_operations/_patch.py (100%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/aio/_patch.py (100%) create mode 100644 packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/apiview-properties.json rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/models/__init__.py (93%) create mode 100644 packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/models/_models.py rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/models/_patch.py (100%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_version.py (100%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/aio/__init__.py (81%) create mode 100644 packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/aio/_client.py rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/py.typed (100%) rename packages/typespec-python/test/azure/generated/{authentication-api-key-subdir => generation-subdir}/pyproject.toml (85%) delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/MANIFEST.in delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/__init__.py delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/__init__.py delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/__init__.py delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_operations.py delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_models.py delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/_client.py rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir => generation-subdir}/CHANGELOG.md (100%) create mode 100644 packages/typespec-python/test/unbranded/generated/generation-subdir/MANIFEST.in rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir => generation-subdir}/README.md (82%) rename packages/typespec-python/test/{azure/generated/authentication-api-key-subdir/authentication/api => unbranded/generated/generation-subdir/generation}/__init__.py (100%) rename packages/typespec-python/test/{azure/generated/authentication-api-key-subdir/authentication/api/key => unbranded/generated/generation-subdir/generation}/subdir/__init__.py (70%) create mode 100644 packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_client.py rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/__init__.py (86%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_client.py (79%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_configuration.py (55%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio => generation-subdir/generation/subdir/_generated}/_operations/__init__.py (78%) create mode 100644 packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_operations/_operations.py rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_operations/_patch.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_patch.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_utils/__init__.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_utils/model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_utils/serialization.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_utils/utils.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/_version.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/aio/__init__.py (85%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/aio/_client.py (79%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/aio/_configuration.py (56%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key/subdir/_generated => generation-subdir/generation/subdir/_generated/aio}/_operations/__init__.py (78%) create mode 100644 packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_operations/_operations.py rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/aio/_operations/_patch.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/aio/_patch.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/models/__init__.py (87%) create mode 100644 packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/models/_models.py rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_generated/models/_patch.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/_version.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/aio/__init__.py (81%) create mode 100644 packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/_client.py rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir/authentication/api/key => generation-subdir/generation}/subdir/py.typed (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-subdir => generation-subdir}/pyproject.toml (80%) diff --git a/packages/typespec-python/scripts/eng/regenerate.ts b/packages/typespec-python/scripts/eng/regenerate.ts index c356238257b..5b1a776ba44 100644 --- a/packages/typespec-python/scripts/eng/regenerate.ts +++ b/packages/typespec-python/scripts/eng/regenerate.ts @@ -131,14 +131,6 @@ const EMITTER_OPTIONS: Record | Record | Record None: - self._client = GeneratedClient(credential=credential, endpoint=endpoint, api_version=api_version, **kwargs) - - def custom_method(self) -> bool: - """An example of a custom method that could be added. - - :return: True if the client is valid, False otherwise. - :rtype: bool - """ - self._client.valid() - return True diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py deleted file mode 100644 index 104d8af49e3..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py +++ /dev/null @@ -1,152 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar - -from azure.core import PipelineClient -from azure.core.exceptions import ( - ClientAuthenticationError, - HttpResponseError, - ResourceExistsError, - ResourceNotFoundError, - ResourceNotModifiedError, - map_error, -) -from azure.core.pipeline import PipelineResponse -from azure.core.rest import HttpRequest, HttpResponse -from azure.core.tracing.decorator import distributed_trace -from azure.core.utils import case_insensitive_dict - -from .. import models as _models -from .._configuration import ApiKeyClientConfiguration -from .._utils.model_base import _failsafe_deserialize -from .._utils.serialization import Serializer -from .._utils.utils import ClientMixinABC - -T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] - -_SERIALIZER = Serializer() -_SERIALIZER.client_side_validation = False - - -def build_api_key_valid_request(**kwargs: Any) -> HttpRequest: - # Construct URL - _url = "/authentication/api-key/valid" - - return HttpRequest(method="GET", url=_url, **kwargs) - - -def build_api_key_invalid_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - - # Construct URL - _url = "/authentication/api-key/invalid" - - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) - - -class _ApiKeyClientOperationsMixin( - ClientMixinABC[PipelineClient[HttpRequest, HttpResponse], ApiKeyClientConfiguration] -): - - @distributed_trace - def valid(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements - """Check whether client is authenticated. - - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_api_key_valid_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @distributed_trace - def invalid(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements - """Check whether client is authenticated. - - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_api_key_invalid_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - error = None - if response.status_code == 403: - error = _failsafe_deserialize(_models.InvalidAuth, response.json()) - raise HttpResponseError(response=response, model=error) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_operations.py deleted file mode 100644 index 52a900f805b..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_operations.py +++ /dev/null @@ -1,128 +0,0 @@ -# pylint: disable=line-too-long,useless-suppression -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar - -from azure.core import AsyncPipelineClient -from azure.core.exceptions import ( - ClientAuthenticationError, - HttpResponseError, - ResourceExistsError, - ResourceNotFoundError, - ResourceNotModifiedError, - map_error, -) -from azure.core.pipeline import PipelineResponse -from azure.core.rest import AsyncHttpResponse, HttpRequest -from azure.core.tracing.decorator_async import distributed_trace_async - -from ... import models as _models -from ..._operations._operations import build_api_key_invalid_request, build_api_key_valid_request -from ..._utils.model_base import _failsafe_deserialize -from ..._utils.utils import ClientMixinABC -from .._configuration import ApiKeyClientConfiguration - -T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] - - -class _ApiKeyClientOperationsMixin( - ClientMixinABC[AsyncPipelineClient[HttpRequest, AsyncHttpResponse], ApiKeyClientConfiguration] -): - - @distributed_trace_async - async def valid(self, **kwargs: Any) -> None: - """Check whether client is authenticated. - - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_api_key_valid_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @distributed_trace_async - async def invalid(self, **kwargs: Any) -> None: - """Check whether client is authenticated. - - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_api_key_invalid_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - error = None - if response.status_code == 403: - error = _failsafe_deserialize(_models.InvalidAuth, response.json()) - raise HttpResponseError(response=response, model=error) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/apiview-properties.json b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/apiview-properties.json deleted file mode 100644 index 6735c06e991..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/apiview-properties.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "CrossLanguagePackageId": "Authentication.ApiKey", - "CrossLanguageDefinitionId": { - "authentication.api.key.subdir.models.InvalidAuth": "Authentication.ApiKey.InvalidAuth", - "authentication.api.key.subdir.ApiKeyClient.valid": "Authentication.ApiKey.valid", - "authentication.api.key.subdir.aio.ApiKeyClient.valid": "Authentication.ApiKey.valid", - "authentication.api.key.subdir.ApiKeyClient.invalid": "Authentication.ApiKey.invalid", - "authentication.api.key.subdir.aio.ApiKeyClient.invalid": "Authentication.ApiKey.invalid" - } -} \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_models.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_models.py deleted file mode 100644 index b695706d2dd..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_models.py +++ /dev/null @@ -1,40 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -# pylint: disable=useless-super-delegation - -from typing import Any, Mapping, overload - -from .._utils.model_base import Model as _Model, rest_field - - -class InvalidAuth(_Model): - """InvalidAuth. - - :ivar error: Required. - :vartype error: str - """ - - error: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """Required.""" - - @overload - def __init__( - self, - *, - error: str, - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/_client.py deleted file mode 100644 index ab105fc8e89..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/_client.py +++ /dev/null @@ -1,39 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -from typing import Any, Optional -from azure.core.credentials import AzureKeyCredential -from .._generated.aio import ApiKeyClient as GeneratedClient - - -class CustomizedApiKeyClient: - """Tests customization of a client that is fully wrapped - - :param credential: Credential used to authenticate requests to the service. Required. - :type credential: ~azure.core.credentials.AzureKeyCredential - :keyword endpoint: Service host. Default value is "http://localhost:3000". - :paramtype endpoint: str - :keyword api_version: API version to use for requests. Default value is None. - :paramtype api_version: str or None - """ - - def __init__( - self, - credential: AzureKeyCredential, - *, - endpoint: str = "http://localhost:3000", - api_version: Optional[str] = None, - **kwargs: Any - ) -> None: - self._client = GeneratedClient(credential=credential, endpoint=endpoint, api_version=api_version, **kwargs) - - async def custom_method(self) -> bool: - """An example of a custom method that could be added. - - :return: True if the client is valid, False otherwise. - :rtype: bool - """ - await self._client.valid() - return True diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/CHANGELOG.md b/packages/typespec-python/test/azure/generated/generation-subdir/CHANGELOG.md similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/CHANGELOG.md rename to packages/typespec-python/test/azure/generated/generation-subdir/CHANGELOG.md diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/LICENSE b/packages/typespec-python/test/azure/generated/generation-subdir/LICENSE similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/LICENSE rename to packages/typespec-python/test/azure/generated/generation-subdir/LICENSE diff --git a/packages/typespec-python/test/azure/generated/generation-subdir/MANIFEST.in b/packages/typespec-python/test/azure/generated/generation-subdir/MANIFEST.in new file mode 100644 index 00000000000..a20b28d3a37 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/generation-subdir/MANIFEST.in @@ -0,0 +1,6 @@ +include *.md +include LICENSE +include generation/subdir/py.typed +recursive-include tests *.py +recursive-include samples *.py *.md +include generation/__init__.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/README.md b/packages/typespec-python/test/azure/generated/generation-subdir/README.md similarity index 91% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/README.md rename to packages/typespec-python/test/azure/generated/generation-subdir/README.md index 0fbd208564f..14435622fcc 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/README.md +++ b/packages/typespec-python/test/azure/generated/generation-subdir/README.md @@ -1,4 +1,4 @@ -# Authentication Api Key Subdir client library for Python +# Generation Subdir client library for Python ## Getting started @@ -6,14 +6,14 @@ ### Install the package ```bash -python -m pip install authentication-api-key-subdir +python -m pip install generation-subdir ``` #### Prequisites - Python 3.9 or later is required to use this package. - You need an [Azure subscription][azure_sub] to use this package. -- An existing Authentication Api Key Subdir instance. +- An existing Generation Subdir instance. ## Contributing diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/dev_requirements.txt b/packages/typespec-python/test/azure/generated/generation-subdir/dev_requirements.txt similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/dev_requirements.txt rename to packages/typespec-python/test/azure/generated/generation-subdir/dev_requirements.txt diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/conftest.py b/packages/typespec-python/test/azure/generated/generation-subdir/generated_tests/conftest.py similarity index 54% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/conftest.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generated_tests/conftest.py index 8082748a92a..338abb9869a 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/conftest.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generated_tests/conftest.py @@ -21,14 +21,14 @@ # For security, please avoid record sensitive identity information in recordings @pytest.fixture(scope="session", autouse=True) def add_sanitizers(test_proxy): - apikey_subscription_id = os.environ.get("APIKEY_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") - apikey_tenant_id = os.environ.get("APIKEY_TENANT_ID", "00000000-0000-0000-0000-000000000000") - apikey_client_id = os.environ.get("APIKEY_CLIENT_ID", "00000000-0000-0000-0000-000000000000") - apikey_client_secret = os.environ.get("APIKEY_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") - add_general_regex_sanitizer(regex=apikey_subscription_id, value="00000000-0000-0000-0000-000000000000") - add_general_regex_sanitizer(regex=apikey_tenant_id, value="00000000-0000-0000-0000-000000000000") - add_general_regex_sanitizer(regex=apikey_client_id, value="00000000-0000-0000-0000-000000000000") - add_general_regex_sanitizer(regex=apikey_client_secret, value="00000000-0000-0000-0000-000000000000") + recursive_subscription_id = os.environ.get("RECURSIVE_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") + recursive_tenant_id = os.environ.get("RECURSIVE_TENANT_ID", "00000000-0000-0000-0000-000000000000") + recursive_client_id = os.environ.get("RECURSIVE_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + recursive_client_secret = os.environ.get("RECURSIVE_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=recursive_subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=recursive_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=recursive_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=recursive_client_secret, value="00000000-0000-0000-0000-000000000000") add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]") add_header_regex_sanitizer(key="Cookie", value="cookie;") diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/test_api_key.py b/packages/typespec-python/test/azure/generated/generation-subdir/generated_tests/test_recursive.py similarity index 61% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/test_api_key.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generated_tests/test_recursive.py index 2916e7b9498..11b06922531 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/test_api_key.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generated_tests/test_recursive.py @@ -7,25 +7,27 @@ # -------------------------------------------------------------------------- import pytest from devtools_testutils import recorded_by_proxy -from testpreparer import ApiKeyClientTestBase, ApiKeyPreparer +from testpreparer import RecursiveClientTestBase, RecursivePreparer @pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestApiKey(ApiKeyClientTestBase): - @ApiKeyPreparer() +class TestRecursive(RecursiveClientTestBase): + @RecursivePreparer() @recorded_by_proxy - def test_valid(self, apikey_endpoint): - client = self.create_client(endpoint=apikey_endpoint) - response = client.valid() + def test_put(self, recursive_endpoint): + client = self.create_client(endpoint=recursive_endpoint) + response = client.put( + input={"level": 0, "extension": [...]}, + ) # please add some check logic here by yourself # ... - @ApiKeyPreparer() + @RecursivePreparer() @recorded_by_proxy - def test_invalid(self, apikey_endpoint): - client = self.create_client(endpoint=apikey_endpoint) - response = client.invalid() + def test_get(self, recursive_endpoint): + client = self.create_client(endpoint=recursive_endpoint) + response = client.get() # please add some check logic here by yourself # ... diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/test_api_key_async.py b/packages/typespec-python/test/azure/generated/generation-subdir/generated_tests/test_recursive_async.py similarity index 58% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/test_api_key_async.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generated_tests/test_recursive_async.py index 214be1ee608..a09a896c425 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/test_api_key_async.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generated_tests/test_recursive_async.py @@ -7,26 +7,28 @@ # -------------------------------------------------------------------------- import pytest from devtools_testutils.aio import recorded_by_proxy_async -from testpreparer import ApiKeyPreparer -from testpreparer_async import ApiKeyClientTestBaseAsync +from testpreparer import RecursivePreparer +from testpreparer_async import RecursiveClientTestBaseAsync @pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestApiKeyAsync(ApiKeyClientTestBaseAsync): - @ApiKeyPreparer() +class TestRecursiveAsync(RecursiveClientTestBaseAsync): + @RecursivePreparer() @recorded_by_proxy_async - async def test_valid(self, apikey_endpoint): - client = self.create_async_client(endpoint=apikey_endpoint) - response = await client.valid() + async def test_put(self, recursive_endpoint): + client = self.create_async_client(endpoint=recursive_endpoint) + response = await client.put( + input={"level": 0, "extension": [...]}, + ) # please add some check logic here by yourself # ... - @ApiKeyPreparer() + @RecursivePreparer() @recorded_by_proxy_async - async def test_invalid(self, apikey_endpoint): - client = self.create_async_client(endpoint=apikey_endpoint) - response = await client.invalid() + async def test_get(self, recursive_endpoint): + client = self.create_async_client(endpoint=recursive_endpoint) + response = await client.get() # please add some check logic here by yourself # ... diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/generation-subdir/generated_tests/testpreparer.py similarity index 69% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/testpreparer.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generated_tests/testpreparer.py index 1b3696072cd..afd4634d21c 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/testpreparer.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generated_tests/testpreparer.py @@ -5,20 +5,22 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from authentication.api.key.subdir import ApiKeyClient from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer import functools +from generation.subdir import RecursiveClient -class ApiKeyClientTestBase(AzureRecordedTestCase): +class RecursiveClientTestBase(AzureRecordedTestCase): def create_client(self, endpoint): - credential = self.get_credential(ApiKeyClient) + credential = self.get_credential(RecursiveClient) return self.create_client_from_credential( - ApiKeyClient, + RecursiveClient, credential=credential, endpoint=endpoint, ) -ApiKeyPreparer = functools.partial(PowerShellPreparer, "apikey", apikey_endpoint="https://fake_apikey_endpoint.com") +RecursivePreparer = functools.partial( + PowerShellPreparer, "recursive", recursive_endpoint="https://fake_recursive_endpoint.com" +) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/generation-subdir/generated_tests/testpreparer_async.py similarity index 76% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/testpreparer_async.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generated_tests/testpreparer_async.py index 98e4f0a0b12..7994716baf1 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/testpreparer_async.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generated_tests/testpreparer_async.py @@ -5,16 +5,16 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from authentication.api.key.subdir.aio import ApiKeyClient from devtools_testutils import AzureRecordedTestCase +from generation.subdir.aio import RecursiveClient -class ApiKeyClientTestBaseAsync(AzureRecordedTestCase): +class RecursiveClientTestBaseAsync(AzureRecordedTestCase): def create_async_client(self, endpoint): - credential = self.get_credential(ApiKeyClient, is_async=True) + credential = self.get_credential(RecursiveClient, is_async=True) return self.create_client_from_credential( - ApiKeyClient, + RecursiveClient, credential=credential, endpoint=endpoint, ) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/__init__.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/__init__.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/__init__.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/__init__.py similarity index 70% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/__init__.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/__init__.py index df73d052afd..2368247d3c1 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/__init__.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/__init__.py @@ -3,10 +3,10 @@ # Licensed under the MIT License. See License.txt in the project root for # license information. # -------------------------------------------------------------------------- -from ._client import CustomizedApiKeyClient -from ._generated.models import InvalidAuth +from ._client import CustomizedClient +from ._generated.models import Extension __all__ = [ - "CustomizedApiKeyClient", - "InvalidAuth", + "CustomizedClient", + "Extension", ] diff --git a/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_client.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_client.py new file mode 100644 index 00000000000..6fbc82dbfbd --- /dev/null +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_client.py @@ -0,0 +1,29 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +from typing import Any +from ._generated import RecursiveClient as GeneratedClient, models as _models + + +class CustomizedClient: # pylint: disable=client-accepts-api-version-keyword + """Tests customization of a client that is fully wrapped. + + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + self._client = GeneratedClient(endpoint=endpoint, **kwargs) + + def customized_get(self, **kwargs: Any) -> _models.Extension: + """get. + + :return: Extension. The Extension is compatible with MutableMapping + :rtype: ~generation.subdir._generated.models.Extension + :raises ~corehttp.exceptions.HttpResponseError: + """ + return self._client.get(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/__init__.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/__init__.py similarity index 92% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/__init__.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/__init__.py index fb55d8ab1df..b3df8683abc 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/__init__.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/__init__.py @@ -12,7 +12,7 @@ if TYPE_CHECKING: from ._patch import * # pylint: disable=unused-wildcard-import -from ._client import ApiKeyClient # type: ignore +from ._client import RecursiveClient # type: ignore from ._version import VERSION __version__ = VERSION @@ -25,7 +25,7 @@ from ._patch import patch_sdk as _patch_sdk __all__ = [ - "ApiKeyClient", + "RecursiveClient", ] __all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_client.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_client.py similarity index 83% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_client.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_client.py index b41d3a47701..a22a131850b 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_client.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_client.py @@ -11,29 +11,26 @@ from typing_extensions import Self from azure.core import PipelineClient -from azure.core.credentials import AzureKeyCredential from azure.core.pipeline import policies from azure.core.rest import HttpRequest, HttpResponse -from ._configuration import ApiKeyClientConfiguration -from ._operations import _ApiKeyClientOperationsMixin +from ._configuration import RecursiveClientConfiguration +from ._operations import _RecursiveClientOperationsMixin from ._utils.serialization import Deserializer, Serializer -class ApiKeyClient(_ApiKeyClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword - """Illustrates clients generated with ApiKey authentication. +class RecursiveClient(_RecursiveClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Illustrates inheritance recursion. - :param credential: Credential used to authenticate requests to the service. Required. - :type credential: ~azure.core.credentials.AzureKeyCredential :keyword endpoint: Service host. Default value is "http://localhost:3000". :paramtype endpoint: str """ - def __init__( - self, credential: AzureKeyCredential, *, endpoint: str = "http://localhost:3000", **kwargs: Any + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, *, endpoint: str = "http://localhost:3000", **kwargs: Any ) -> None: _endpoint = "{endpoint}" - self._config = ApiKeyClientConfiguration(credential=credential, endpoint=endpoint, **kwargs) + self._config = RecursiveClientConfiguration(endpoint=endpoint, **kwargs) _policies = kwargs.pop("policies", None) if _policies is None: diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_configuration.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_configuration.py similarity index 67% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_configuration.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_configuration.py index c94cbf4cd58..e37a1c3c45b 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_configuration.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_configuration.py @@ -8,31 +8,25 @@ from typing import Any -from azure.core.credentials import AzureKeyCredential from azure.core.pipeline import policies from ._version import VERSION -class ApiKeyClientConfiguration: # pylint: disable=too-many-instance-attributes - """Configuration for ApiKeyClient. +class RecursiveClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for RecursiveClient. Note that all parameters used to create this instance are saved as instance attributes. - :param credential: Credential used to authenticate requests to the service. Required. - :type credential: ~azure.core.credentials.AzureKeyCredential :param endpoint: Service host. Default value is "http://localhost:3000". :type endpoint: str """ - def __init__(self, credential: AzureKeyCredential, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: - if credential is None: - raise ValueError("Parameter 'credential' must not be None.") + def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: - self.credential = credential self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "authentication-api-key-subdir/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "generation-subdir/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) @@ -46,5 +40,3 @@ def _configure(self, **kwargs: Any) -> None: self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs) self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs) self.authentication_policy = kwargs.get("authentication_policy") - if self.credential and not self.authentication_policy: - self.authentication_policy = policies.AzureKeyCredentialPolicy(self.credential, "x-ms-api-key", **kwargs) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_operations/__init__.py similarity index 88% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_operations/__init__.py index 90f96a75199..317b1922bc1 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/__init__.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_operations/__init__.py @@ -12,7 +12,7 @@ if TYPE_CHECKING: from ._patch import * # pylint: disable=unused-wildcard-import -from ._operations import _ApiKeyClientOperationsMixin # type: ignore # pylint: disable=unused-import +from ._operations import _RecursiveClientOperationsMixin # type: ignore # pylint: disable=unused-import from ._patch import __all__ as _patch_all from ._patch import * diff --git a/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_operations/_operations.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_operations/_operations.py new file mode 100644 index 00000000000..45988d348b0 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_operations/_operations.py @@ -0,0 +1,229 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from collections.abc import MutableMapping +from io import IOBase +import json +from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload + +from azure.core import PipelineClient +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + StreamClosedError, + StreamConsumedError, + map_error, +) +from azure.core.pipeline import PipelineResponse +from azure.core.rest import HttpRequest, HttpResponse +from azure.core.tracing.decorator import distributed_trace +from azure.core.utils import case_insensitive_dict + +from .. import models as _models +from .._configuration import RecursiveClientConfiguration +from .._utils.model_base import SdkJSONEncoder, _deserialize +from .._utils.serialization import Serializer +from .._utils.utils import ClientMixinABC + +JSON = MutableMapping[str, Any] +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +_SERIALIZER = Serializer() +_SERIALIZER.client_side_validation = False + + +def build_recursive_put_request(**kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + # Construct URL + _url = "/type/model/inheritance/recursive" + + # Construct headers + if content_type is not None: + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + + return HttpRequest(method="PUT", url=_url, headers=_headers, **kwargs) + + +def build_recursive_get_request(**kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + accept = _headers.pop("Accept", "application/json") + + # Construct URL + _url = "/type/model/inheritance/recursive" + + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) + + +class _RecursiveClientOperationsMixin( + ClientMixinABC[PipelineClient[HttpRequest, HttpResponse], RecursiveClientConfiguration] +): + + @overload + def put(self, input: _models.Extension, *, content_type: str = "application/json", **kwargs: Any) -> None: + """put. + + :param input: Required. + :type input: ~generation.subdir._generated.models.Extension + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def put(self, input: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: + """put. + + :param input: Required. + :type input: JSON + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def put(self, input: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + """put. + + :param input: Required. + :type input: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace + def put( # pylint: disable=inconsistent-return-statements + self, input: Union[_models.Extension, JSON, IO[bytes]], **kwargs: Any + ) -> None: + """put. + + :param input: Is one of the following types: Extension, JSON, IO[bytes] Required. + :type input: ~generation.subdir._generated.models.Extension or JSON or IO[bytes] + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = kwargs.pop("params", {}) or {} + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[None] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(input, (IOBase, bytes)): + _content = input + else: + _content = json.dumps(input, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_recursive_put_request( + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + @distributed_trace + def get(self, **kwargs: Any) -> _models.Extension: + """get. + + :return: Extension. The Extension is compatible with MutableMapping + :rtype: ~generation.subdir._generated.models.Extension + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[_models.Extension] = kwargs.pop("cls", None) + + _request = build_recursive_get_request( + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = kwargs.pop("stream", False) + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + if _stream: + try: + response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if _stream: + deserialized = response.iter_bytes() + else: + deserialized = _deserialize(_models.Extension, response.json()) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_patch.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_patch.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_patch.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_patch.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/__init__.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_utils/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/__init__.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_utils/__init__.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/model_base.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_utils/model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/model_base.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_utils/model_base.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/serialization.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_utils/serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/serialization.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_utils/serialization.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/utils.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_utils/utils.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/utils.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_utils/utils.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_version.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_version.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/_version.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/__init__.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/__init__.py similarity index 92% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/__init__.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/__init__.py index a2bfcc451fb..0ce312643e2 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/__init__.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/__init__.py @@ -12,7 +12,7 @@ if TYPE_CHECKING: from ._patch import * # pylint: disable=unused-wildcard-import -from ._client import ApiKeyClient # type: ignore +from ._client import RecursiveClient # type: ignore try: from ._patch import __all__ as _patch_all @@ -22,7 +22,7 @@ from ._patch import patch_sdk as _patch_sdk __all__ = [ - "ApiKeyClient", + "RecursiveClient", ] __all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_client.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_client.py similarity index 83% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_client.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_client.py index 496661c0e01..87d2e92a383 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_client.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_client.py @@ -11,29 +11,26 @@ from typing_extensions import Self from azure.core import AsyncPipelineClient -from azure.core.credentials import AzureKeyCredential from azure.core.pipeline import policies from azure.core.rest import AsyncHttpResponse, HttpRequest from .._utils.serialization import Deserializer, Serializer -from ._configuration import ApiKeyClientConfiguration -from ._operations import _ApiKeyClientOperationsMixin +from ._configuration import RecursiveClientConfiguration +from ._operations import _RecursiveClientOperationsMixin -class ApiKeyClient(_ApiKeyClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword - """Illustrates clients generated with ApiKey authentication. +class RecursiveClient(_RecursiveClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Illustrates inheritance recursion. - :param credential: Credential used to authenticate requests to the service. Required. - :type credential: ~azure.core.credentials.AzureKeyCredential :keyword endpoint: Service host. Default value is "http://localhost:3000". :paramtype endpoint: str """ - def __init__( - self, credential: AzureKeyCredential, *, endpoint: str = "http://localhost:3000", **kwargs: Any + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, *, endpoint: str = "http://localhost:3000", **kwargs: Any ) -> None: _endpoint = "{endpoint}" - self._config = ApiKeyClientConfiguration(credential=credential, endpoint=endpoint, **kwargs) + self._config = RecursiveClientConfiguration(endpoint=endpoint, **kwargs) _policies = kwargs.pop("policies", None) if _policies is None: diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_configuration.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_configuration.py similarity index 68% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_configuration.py index 931c3267987..22d8a8734e8 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_configuration.py @@ -8,31 +8,25 @@ from typing import Any -from azure.core.credentials import AzureKeyCredential from azure.core.pipeline import policies from .._version import VERSION -class ApiKeyClientConfiguration: # pylint: disable=too-many-instance-attributes - """Configuration for ApiKeyClient. +class RecursiveClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for RecursiveClient. Note that all parameters used to create this instance are saved as instance attributes. - :param credential: Credential used to authenticate requests to the service. Required. - :type credential: ~azure.core.credentials.AzureKeyCredential :param endpoint: Service host. Default value is "http://localhost:3000". :type endpoint: str """ - def __init__(self, credential: AzureKeyCredential, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: - if credential is None: - raise ValueError("Parameter 'credential' must not be None.") + def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: - self.credential = credential self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "authentication-api-key-subdir/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "generation-subdir/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) @@ -46,5 +40,3 @@ def _configure(self, **kwargs: Any) -> None: self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs) self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs) self.authentication_policy = kwargs.get("authentication_policy") - if self.credential and not self.authentication_policy: - self.authentication_policy = policies.AzureKeyCredentialPolicy(self.credential, "x-ms-api-key", **kwargs) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/__init__.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_operations/__init__.py similarity index 88% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_operations/__init__.py index 90f96a75199..317b1922bc1 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/__init__.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_operations/__init__.py @@ -12,7 +12,7 @@ if TYPE_CHECKING: from ._patch import * # pylint: disable=unused-wildcard-import -from ._operations import _ApiKeyClientOperationsMixin # type: ignore # pylint: disable=unused-import +from ._operations import _RecursiveClientOperationsMixin # type: ignore # pylint: disable=unused-import from ._patch import __all__ as _patch_all from ._patch import * diff --git a/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_operations/_operations.py new file mode 100644 index 00000000000..b00e1233eb2 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_operations/_operations.py @@ -0,0 +1,197 @@ +# pylint: disable=line-too-long,useless-suppression +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from collections.abc import MutableMapping +from io import IOBase +import json +from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload + +from azure.core import AsyncPipelineClient +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + StreamClosedError, + StreamConsumedError, + map_error, +) +from azure.core.pipeline import PipelineResponse +from azure.core.rest import AsyncHttpResponse, HttpRequest +from azure.core.tracing.decorator_async import distributed_trace_async +from azure.core.utils import case_insensitive_dict + +from ... import models as _models +from ..._operations._operations import build_recursive_get_request, build_recursive_put_request +from ..._utils.model_base import SdkJSONEncoder, _deserialize +from ..._utils.utils import ClientMixinABC +from .._configuration import RecursiveClientConfiguration + +JSON = MutableMapping[str, Any] +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + + +class _RecursiveClientOperationsMixin( + ClientMixinABC[AsyncPipelineClient[HttpRequest, AsyncHttpResponse], RecursiveClientConfiguration] +): + + @overload + async def put(self, input: _models.Extension, *, content_type: str = "application/json", **kwargs: Any) -> None: + """put. + + :param input: Required. + :type input: ~generation.subdir._generated.models.Extension + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def put(self, input: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: + """put. + + :param input: Required. + :type input: JSON + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def put(self, input: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + """put. + + :param input: Required. + :type input: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace_async + async def put(self, input: Union[_models.Extension, JSON, IO[bytes]], **kwargs: Any) -> None: + """put. + + :param input: Is one of the following types: Extension, JSON, IO[bytes] Required. + :type input: ~generation.subdir._generated.models.Extension or JSON or IO[bytes] + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = kwargs.pop("params", {}) or {} + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[None] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(input, (IOBase, bytes)): + _content = input + else: + _content = json.dumps(input, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_recursive_put_request( + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + @distributed_trace_async + async def get(self, **kwargs: Any) -> _models.Extension: + """get. + + :return: Extension. The Extension is compatible with MutableMapping + :rtype: ~generation.subdir._generated.models.Extension + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[_models.Extension] = kwargs.pop("cls", None) + + _request = build_recursive_get_request( + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = kwargs.pop("stream", False) + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + if _stream: + try: + await response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if _stream: + deserialized = response.iter_bytes() + else: + deserialized = _deserialize(_models.Extension, response.json()) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_patch.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_patch.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/apiview-properties.json b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/apiview-properties.json new file mode 100644 index 00000000000..46a422c625a --- /dev/null +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/apiview-properties.json @@ -0,0 +1,11 @@ +{ + "CrossLanguagePackageId": "Type.Model.Inheritance.Recursive", + "CrossLanguageDefinitionId": { + "generation.subdir.models.Element": "Type.Model.Inheritance.Recursive.Element", + "generation.subdir.models.Extension": "Type.Model.Inheritance.Recursive.Extension", + "generation.subdir.RecursiveClient.put": "Type.Model.Inheritance.Recursive.put", + "generation.subdir.aio.RecursiveClient.put": "Type.Model.Inheritance.Recursive.put", + "generation.subdir.RecursiveClient.get": "Type.Model.Inheritance.Recursive.get", + "generation.subdir.aio.RecursiveClient.get": "Type.Model.Inheritance.Recursive.get" + } +} \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/__init__.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/models/__init__.py similarity index 93% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/__init__.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/models/__init__.py index afdf5ab4e36..ee21d83d171 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/__init__.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/models/__init__.py @@ -14,14 +14,16 @@ from ._models import ( # type: ignore - InvalidAuth, + Element, + Extension, ) from ._patch import __all__ as _patch_all from ._patch import * from ._patch import patch_sdk as _patch_sdk __all__ = [ - "InvalidAuth", + "Element", + "Extension", ] __all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore _patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/models/_models.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/models/_models.py new file mode 100644 index 00000000000..92a359538cd --- /dev/null +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/models/_models.py @@ -0,0 +1,75 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +# pylint: disable=useless-super-delegation + +from typing import Any, List, Mapping, Optional, TYPE_CHECKING, overload + +from .._utils.model_base import Model as _Model, rest_field + +if TYPE_CHECKING: + from .. import models as _models + + +class Element(_Model): + """element. + + :ivar extension: + :vartype extension: list[~generation.subdir._generated.models.Extension] + """ + + extension: Optional[List["_models.Extension"]] = rest_field( + visibility=["read", "create", "update", "delete", "query"] + ) + + @overload + def __init__( + self, + *, + extension: Optional[List["_models.Extension"]] = None, + ) -> None: ... + + @overload + def __init__(self, mapping: Mapping[str, Any]) -> None: + """ + :param mapping: raw JSON to initialize the model. + :type mapping: Mapping[str, Any] + """ + + def __init__(self, *args: Any, **kwargs: Any) -> None: + super().__init__(*args, **kwargs) + + +class Extension(Element): + """extension. + + :ivar extension: + :vartype extension: list[~generation.subdir._generated.models.Extension] + :ivar level: Required. + :vartype level: int + """ + + level: int = rest_field(visibility=["read", "create", "update", "delete", "query"]) + """Required.""" + + @overload + def __init__( + self, + *, + level: int, + extension: Optional[List["_models.Extension"]] = None, + ) -> None: ... + + @overload + def __init__(self, mapping: Mapping[str, Any]) -> None: + """ + :param mapping: raw JSON to initialize the model. + :type mapping: Mapping[str, Any] + """ + + def __init__(self, *args: Any, **kwargs: Any) -> None: + super().__init__(*args, **kwargs) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_patch.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/models/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_patch.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_generated/models/_patch.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_version.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_version.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_version.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/__init__.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/aio/__init__.py similarity index 81% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/__init__.py rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/aio/__init__.py index 46b2bd5759d..e00f0911dad 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/__init__.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/aio/__init__.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- -from ._client import CustomizedApiKeyClient +from ._client import CustomizedClient __all__ = [ - "CustomizedApiKeyClient", + "CustomizedClient", ] diff --git a/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/aio/_client.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/aio/_client.py new file mode 100644 index 00000000000..357275d8213 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/aio/_client.py @@ -0,0 +1,30 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +from typing import Any +from .._generated.aio import RecursiveClient as GeneratedClient +from .._generated import models as _models + + +class CustomizedClient: # pylint: disable=client-accepts-api-version-keyword + """Tests customization of a client that is fully wrapped. + + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + self._client = GeneratedClient(endpoint=endpoint, **kwargs) + + async def customized_get(self, **kwargs: Any) -> _models.Extension: + """get. + + :return: Extension. The Extension is compatible with MutableMapping + :rtype: ~generation.subdir._generated.models.Extension + :raises ~corehttp.exceptions.HttpResponseError: + """ + return await self._client.get(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/py.typed b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/py.typed rename to packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/py.typed diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/pyproject.toml b/packages/typespec-python/test/azure/generated/generation-subdir/pyproject.toml similarity index 85% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/pyproject.toml rename to packages/typespec-python/test/azure/generated/generation-subdir/pyproject.toml index 82fbf2781b0..8f33e135dac 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/pyproject.toml +++ b/packages/typespec-python/test/azure/generated/generation-subdir/pyproject.toml @@ -10,11 +10,11 @@ requires = ["setuptools>=61.0.0", "wheel"] # Requires 61.0.0 for dynamic versio build-backend = "setuptools.build_meta" [project] -name = "authentication-api-key-subdir" +name = "generation-subdir" authors = [ { name = "Microsoft Corporation", email = "azpysdkhelp@microsoft.com" }, ] -description = "Microsoft Corporation Azure Authentication Api Key Subdir Client Library for Python" +description = "Microsoft Corporation Azure Generation Subdir Client Library for Python" license = {text = "MIT License"} classifiers = [ "Development Status :: 4 - Beta", @@ -44,16 +44,14 @@ dynamic = [ repository = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk" [tool.setuptools.dynamic] -version = {attr = "authentication.api.key.subdir._version.VERSION"} +version = {attr = "generation.subdir._version.VERSION"} readme = {file = ["README.md"], content-type = "text/markdown"} [tool.setuptools.packages.find] exclude = [ "tests*", "samples*", - "authentication", - "authentication.api", - "authentication.api.key", + "generation", ] [tool.setuptools.package-data] diff --git a/packages/typespec-python/test/azure/requirements.txt b/packages/typespec-python/test/azure/requirements.txt index 561ef1a732b..126d6cb66d2 100644 --- a/packages/typespec-python/test/azure/requirements.txt +++ b/packages/typespec-python/test/azure/requirements.txt @@ -38,12 +38,12 @@ azure-mgmt-core==1.6.0 # common test case -e ./generated/authentication-api-key --e ./generated/authentication-api-key-subdir -e ./generated/authentication-http-custom -e ./generated/authentication-oauth2 -e ./generated/authentication-union -e ./generated/encode-duration -e ./generated/encode-numeric +-e ./generated/generation-subdir -e ./generated/parameters-basic -e ./generated/parameters-collection-format -e ./generated/parameters-path diff --git a/packages/typespec-python/test/generic_mock_api_tests/test_generation_subdir.py b/packages/typespec-python/test/generic_mock_api_tests/test_generation_subdir.py index 324b201c55a..0f94e2a0dab 100644 --- a/packages/typespec-python/test/generic_mock_api_tests/test_generation_subdir.py +++ b/packages/typespec-python/test/generic_mock_api_tests/test_generation_subdir.py @@ -4,7 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest -from authentication.api.key.subdir import CustomizedApiKeyClient +from generation.subdir import CustomizedApiKeyClient def test_custom_method(key_credential): diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/MANIFEST.in b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/MANIFEST.in deleted file mode 100644 index 33e79e092a0..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/MANIFEST.in +++ /dev/null @@ -1,8 +0,0 @@ -include *.md -include LICENSE -include authentication/api/key/subdir/py.typed -recursive-include tests *.py -recursive-include samples *.py *.md -include authentication/__init__.py -include authentication/api/__init__.py -include authentication/api/key/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/__init__.py deleted file mode 100644 index d55ccad1f57..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/__init__.py deleted file mode 100644 index d55ccad1f57..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/__init__.py deleted file mode 100644 index d55ccad1f57..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py deleted file mode 100644 index 35edabef5af..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py +++ /dev/null @@ -1,39 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -from typing import Any, Optional -from corehttp.credentials import ServiceKeyCredential -from ._generated import ApiKeyClient as GeneratedClient - - -class CustomizedApiKeyClient: - """Tests customization of a client that is fully wrapped - - :param credential: Credential used to authenticate requests to the service. Required. - :type credential: ~corehttp.credentials.ServiceKeyCredential - :keyword endpoint: Service host. Default value is "http://localhost:3000". - :paramtype endpoint: str - :keyword api_version: API version to use for requests. Default value is None. - :paramtype api_version: str or None - """ - - def __init__( - self, - credential: ServiceKeyCredential, - *, - endpoint: str = "http://localhost:3000", - api_version: Optional[str] = None, - **kwargs: Any - ) -> None: - self._client = GeneratedClient(credential=credential, endpoint=endpoint, api_version=api_version, **kwargs) - - def custom_method(self) -> bool: - """An example of a custom method that could be added. - - :return: True if the client is valid, False otherwise. - :rtype: bool - """ - self._client.valid() - return True diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py deleted file mode 100644 index c2c0f07f7da..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py +++ /dev/null @@ -1,139 +0,0 @@ -# coding=utf-8 -from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar - -from corehttp.exceptions import ( - ClientAuthenticationError, - HttpResponseError, - ResourceExistsError, - ResourceNotFoundError, - ResourceNotModifiedError, - map_error, -) -from corehttp.rest import HttpRequest, HttpResponse -from corehttp.runtime import PipelineClient -from corehttp.runtime.pipeline import PipelineResponse -from corehttp.utils import case_insensitive_dict - -from .. import models as _models -from .._configuration import ApiKeyClientConfiguration -from .._utils.model_base import _failsafe_deserialize -from .._utils.serialization import Serializer -from .._utils.utils import ClientMixinABC - -T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] - -_SERIALIZER = Serializer() -_SERIALIZER.client_side_validation = False - - -def build_api_key_valid_request(**kwargs: Any) -> HttpRequest: - # Construct URL - _url = "/authentication/api-key/valid" - - return HttpRequest(method="GET", url=_url, **kwargs) - - -def build_api_key_invalid_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - - # Construct URL - _url = "/authentication/api-key/invalid" - - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) - - -class _ApiKeyClientOperationsMixin( - ClientMixinABC[PipelineClient[HttpRequest, HttpResponse], ApiKeyClientConfiguration] -): - - def valid(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements - """Check whether client is authenticated. - - :return: None - :rtype: None - :raises ~corehttp.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_api_key_valid_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client.pipeline.run(_request, stream=_stream, **kwargs) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - def invalid(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements - """Check whether client is authenticated. - - :return: None - :rtype: None - :raises ~corehttp.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_api_key_invalid_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client.pipeline.run(_request, stream=_stream, **kwargs) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - error = None - if response.status_code == 403: - error = _failsafe_deserialize(_models.InvalidAuth, response.json()) - raise HttpResponseError(response=response, model=error) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_operations.py deleted file mode 100644 index bdc739e3998..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_operations.py +++ /dev/null @@ -1,118 +0,0 @@ -# coding=utf-8 -from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar - -from corehttp.exceptions import ( - ClientAuthenticationError, - HttpResponseError, - ResourceExistsError, - ResourceNotFoundError, - ResourceNotModifiedError, - map_error, -) -from corehttp.rest import AsyncHttpResponse, HttpRequest -from corehttp.runtime import AsyncPipelineClient -from corehttp.runtime.pipeline import PipelineResponse - -from ... import models as _models -from ..._operations._operations import build_api_key_invalid_request, build_api_key_valid_request -from ..._utils.model_base import _failsafe_deserialize -from ..._utils.utils import ClientMixinABC -from .._configuration import ApiKeyClientConfiguration - -T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] - - -class _ApiKeyClientOperationsMixin( - ClientMixinABC[AsyncPipelineClient[HttpRequest, AsyncHttpResponse], ApiKeyClientConfiguration] -): - - async def valid(self, **kwargs: Any) -> None: - """Check whether client is authenticated. - - :return: None - :rtype: None - :raises ~corehttp.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_api_key_valid_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client.pipeline.run( # type: ignore - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - async def invalid(self, **kwargs: Any) -> None: - """Check whether client is authenticated. - - :return: None - :rtype: None - :raises ~corehttp.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_api_key_invalid_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client.pipeline.run( # type: ignore - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - error = None - if response.status_code == 403: - error = _failsafe_deserialize(_models.InvalidAuth, response.json()) - raise HttpResponseError(response=response, model=error) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_models.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_models.py deleted file mode 100644 index 74139dbef58..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_models.py +++ /dev/null @@ -1,34 +0,0 @@ -# coding=utf-8 -# pylint: disable=useless-super-delegation - -from typing import Any, Mapping, overload - -from .._utils.model_base import Model as _Model, rest_field - - -class InvalidAuth(_Model): - """InvalidAuth. - - :ivar error: Required. - :vartype error: str - """ - - error: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """Required.""" - - @overload - def __init__( - self, - *, - error: str, - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/_client.py deleted file mode 100644 index 03a11bfbcea..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/_client.py +++ /dev/null @@ -1,39 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -from typing import Any, Optional -from corehttp.credentials import ServiceKeyCredential -from .._generated.aio import ApiKeyClient as GeneratedClient - - -class CustomizedApiKeyClient: - """Tests customization of a client that is fully wrapped - - :param credential: Credential used to authenticate requests to the service. Required. - :type credential: ~corehttp.credentials.ServiceKeyCredential - :keyword endpoint: Service host. Default value is "http://localhost:3000". - :paramtype endpoint: str - :keyword api_version: API version to use for requests. Default value is None. - :paramtype api_version: str or None - """ - - def __init__( - self, - credential: ServiceKeyCredential, - *, - endpoint: str = "http://localhost:3000", - api_version: Optional[str] = None, - **kwargs: Any - ) -> None: - self._client = GeneratedClient(credential=credential, endpoint=endpoint, api_version=api_version, **kwargs) - - async def custom_method(self) -> bool: - """An example of a custom method that could be added. - - :return: True if the client is valid, False otherwise. - :rtype: bool - """ - await self._client.valid() - return True diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/CHANGELOG.md b/packages/typespec-python/test/unbranded/generated/generation-subdir/CHANGELOG.md similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/CHANGELOG.md rename to packages/typespec-python/test/unbranded/generated/generation-subdir/CHANGELOG.md diff --git a/packages/typespec-python/test/unbranded/generated/generation-subdir/MANIFEST.in b/packages/typespec-python/test/unbranded/generated/generation-subdir/MANIFEST.in new file mode 100644 index 00000000000..a20b28d3a37 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/MANIFEST.in @@ -0,0 +1,6 @@ +include *.md +include LICENSE +include generation/subdir/py.typed +recursive-include tests *.py +recursive-include samples *.py *.md +include generation/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/README.md b/packages/typespec-python/test/unbranded/generated/generation-subdir/README.md similarity index 82% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/README.md rename to packages/typespec-python/test/unbranded/generated/generation-subdir/README.md index aade5862c12..d0da8c2cfa4 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/README.md +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/README.md @@ -19,10 +19,10 @@ pip install -e . ### Examples ```python ->>> from authentication.api.key.subdir import ApiKeyClient +>>> from generation.subdir import RecursiveClient >>> from corehttp.exceptions import HttpResponseError ->>> client = ApiKeyClient(endpoint='') +>>> client = RecursiveClient(endpoint='') >>> try: except HttpResponseError as e: diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/__init__.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/__init__.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/__init__.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/__init__.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/__init__.py similarity index 70% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/__init__.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/__init__.py index df73d052afd..2368247d3c1 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/__init__.py +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/__init__.py @@ -3,10 +3,10 @@ # Licensed under the MIT License. See License.txt in the project root for # license information. # -------------------------------------------------------------------------- -from ._client import CustomizedApiKeyClient -from ._generated.models import InvalidAuth +from ._client import CustomizedClient +from ._generated.models import Extension __all__ = [ - "CustomizedApiKeyClient", - "InvalidAuth", + "CustomizedClient", + "Extension", ] diff --git a/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_client.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_client.py new file mode 100644 index 00000000000..6fbc82dbfbd --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_client.py @@ -0,0 +1,29 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +from typing import Any +from ._generated import RecursiveClient as GeneratedClient, models as _models + + +class CustomizedClient: # pylint: disable=client-accepts-api-version-keyword + """Tests customization of a client that is fully wrapped. + + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + self._client = GeneratedClient(endpoint=endpoint, **kwargs) + + def customized_get(self, **kwargs: Any) -> _models.Extension: + """get. + + :return: Extension. The Extension is compatible with MutableMapping + :rtype: ~generation.subdir._generated.models.Extension + :raises ~corehttp.exceptions.HttpResponseError: + """ + return self._client.get(**kwargs) diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/__init__.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/__init__.py similarity index 86% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/__init__.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/__init__.py index 4fe58ce5af2..fa720696e55 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/__init__.py +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/__init__.py @@ -6,7 +6,7 @@ if TYPE_CHECKING: from ._patch import * # pylint: disable=unused-wildcard-import -from ._client import ApiKeyClient # type: ignore +from ._client import RecursiveClient # type: ignore from ._version import VERSION __version__ = VERSION @@ -19,7 +19,7 @@ from ._patch import patch_sdk as _patch_sdk __all__ = [ - "ApiKeyClient", + "RecursiveClient", ] __all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_client.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_client.py similarity index 79% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_client.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_client.py index 39c3789576b..d75669f2e33 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_client.py +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_client.py @@ -4,29 +4,26 @@ from typing import Any from typing_extensions import Self -from corehttp.credentials import ServiceKeyCredential from corehttp.rest import HttpRequest, HttpResponse from corehttp.runtime import PipelineClient, policies -from ._configuration import ApiKeyClientConfiguration -from ._operations import _ApiKeyClientOperationsMixin +from ._configuration import RecursiveClientConfiguration +from ._operations import _RecursiveClientOperationsMixin from ._utils.serialization import Deserializer, Serializer -class ApiKeyClient(_ApiKeyClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword - """Illustrates clients generated with ApiKey authentication. +class RecursiveClient(_RecursiveClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Illustrates inheritance recursion. - :param credential: Credential used to authenticate requests to the service. Required. - :type credential: ~corehttp.credentials.ServiceKeyCredential :keyword endpoint: Service host. Default value is "http://localhost:3000". :paramtype endpoint: str """ - def __init__( - self, credential: ServiceKeyCredential, *, endpoint: str = "http://localhost:3000", **kwargs: Any + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, *, endpoint: str = "http://localhost:3000", **kwargs: Any ) -> None: _endpoint = "{endpoint}" - self._config = ApiKeyClientConfiguration(credential=credential, endpoint=endpoint, **kwargs) + self._config = RecursiveClientConfiguration(endpoint=endpoint, **kwargs) _policies = kwargs.pop("policies", None) if _policies is None: diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_configuration.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_configuration.py similarity index 55% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_configuration.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_configuration.py index 137fcbf6419..808f6790956 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_configuration.py +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_configuration.py @@ -2,33 +2,25 @@ from typing import Any -from corehttp.credentials import ServiceKeyCredential from corehttp.runtime import policies from ._version import VERSION -class ApiKeyClientConfiguration: - """Configuration for ApiKeyClient. +class RecursiveClientConfiguration: + """Configuration for RecursiveClient. Note that all parameters used to create this instance are saved as instance attributes. - :param credential: Credential used to authenticate requests to the service. Required. - :type credential: ~corehttp.credentials.ServiceKeyCredential :param endpoint: Service host. Default value is "http://localhost:3000". :type endpoint: str """ - def __init__( - self, credential: ServiceKeyCredential, endpoint: str = "http://localhost:3000", **kwargs: Any - ) -> None: - if credential is None: - raise ValueError("Parameter 'credential' must not be None.") + def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: - self.credential = credential self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "authentication-api-key-subdir/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "generation-subdir/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) @@ -39,5 +31,3 @@ def _configure(self, **kwargs: Any) -> None: self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs) self.authentication_policy = kwargs.get("authentication_policy") - if self.credential and not self.authentication_policy: - self.authentication_policy = policies.ServiceKeyCredentialPolicy(self.credential, "x-ms-api-key", **kwargs) diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/__init__.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_operations/__init__.py similarity index 78% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/__init__.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_operations/__init__.py index ec7cfa89f78..25f03f2c716 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/__init__.py +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_operations/__init__.py @@ -6,7 +6,7 @@ if TYPE_CHECKING: from ._patch import * # pylint: disable=unused-wildcard-import -from ._operations import _ApiKeyClientOperationsMixin # type: ignore # pylint: disable=unused-import +from ._operations import _RecursiveClientOperationsMixin # type: ignore # pylint: disable=unused-import from ._patch import __all__ as _patch_all from ._patch import * diff --git a/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_operations/_operations.py new file mode 100644 index 00000000000..c7a489d4279 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_operations/_operations.py @@ -0,0 +1,216 @@ +# coding=utf-8 +from collections.abc import MutableMapping +from io import IOBase +import json +from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload + +from corehttp.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + StreamClosedError, + StreamConsumedError, + map_error, +) +from corehttp.rest import HttpRequest, HttpResponse +from corehttp.runtime import PipelineClient +from corehttp.runtime.pipeline import PipelineResponse +from corehttp.utils import case_insensitive_dict + +from .. import models as _models +from .._configuration import RecursiveClientConfiguration +from .._utils.model_base import SdkJSONEncoder, _deserialize +from .._utils.serialization import Serializer +from .._utils.utils import ClientMixinABC + +JSON = MutableMapping[str, Any] +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +_SERIALIZER = Serializer() +_SERIALIZER.client_side_validation = False + + +def build_recursive_put_request(**kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + # Construct URL + _url = "/type/model/inheritance/recursive" + + # Construct headers + if content_type is not None: + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + + return HttpRequest(method="PUT", url=_url, headers=_headers, **kwargs) + + +def build_recursive_get_request(**kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + accept = _headers.pop("Accept", "application/json") + + # Construct URL + _url = "/type/model/inheritance/recursive" + + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) + + +class _RecursiveClientOperationsMixin( + ClientMixinABC[PipelineClient[HttpRequest, HttpResponse], RecursiveClientConfiguration] +): + + @overload + def put(self, input: _models.Extension, *, content_type: str = "application/json", **kwargs: Any) -> None: + """put. + + :param input: Required. + :type input: ~generation.subdir._generated.models.Extension + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~corehttp.exceptions.HttpResponseError: + """ + + @overload + def put(self, input: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: + """put. + + :param input: Required. + :type input: JSON + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~corehttp.exceptions.HttpResponseError: + """ + + @overload + def put(self, input: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + """put. + + :param input: Required. + :type input: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~corehttp.exceptions.HttpResponseError: + """ + + def put( # pylint: disable=inconsistent-return-statements + self, input: Union[_models.Extension, JSON, IO[bytes]], **kwargs: Any + ) -> None: + """put. + + :param input: Is one of the following types: Extension, JSON, IO[bytes] Required. + :type input: ~generation.subdir._generated.models.Extension or JSON or IO[bytes] + :return: None + :rtype: None + :raises ~corehttp.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = kwargs.pop("params", {}) or {} + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[None] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(input, (IOBase, bytes)): + _content = input + else: + _content = json.dumps(input, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_recursive_put_request( + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client.pipeline.run(_request, stream=_stream, **kwargs) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + def get(self, **kwargs: Any) -> _models.Extension: + """get. + + :return: Extension. The Extension is compatible with MutableMapping + :rtype: ~generation.subdir._generated.models.Extension + :raises ~corehttp.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[_models.Extension] = kwargs.pop("cls", None) + + _request = build_recursive_get_request( + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = kwargs.pop("stream", False) + pipeline_response: PipelineResponse = self._client.pipeline.run(_request, stream=_stream, **kwargs) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + if _stream: + try: + response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if _stream: + deserialized = response.iter_bytes() + else: + deserialized = _deserialize(_models.Extension, response.json()) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_patch.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_patch.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_operations/_patch.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_patch.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_patch.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_patch.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_patch.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/__init__.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_utils/__init__.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/__init__.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_utils/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/model_base.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_utils/model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/model_base.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_utils/model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/serialization.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_utils/serialization.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/serialization.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_utils/serialization.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/utils.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_utils/utils.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/utils.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_utils/utils.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_version.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_version.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_version.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/_version.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/__init__.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/__init__.py similarity index 85% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/__init__.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/__init__.py index a5665d821b2..f26abfa39a7 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/__init__.py +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/__init__.py @@ -6,7 +6,7 @@ if TYPE_CHECKING: from ._patch import * # pylint: disable=unused-wildcard-import -from ._client import ApiKeyClient # type: ignore +from ._client import RecursiveClient # type: ignore try: from ._patch import __all__ as _patch_all @@ -16,7 +16,7 @@ from ._patch import patch_sdk as _patch_sdk __all__ = [ - "ApiKeyClient", + "RecursiveClient", ] __all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_client.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_client.py similarity index 79% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_client.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_client.py index 77cc728a366..67a5ba7469c 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_client.py +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_client.py @@ -4,29 +4,26 @@ from typing import Any, Awaitable from typing_extensions import Self -from corehttp.credentials import ServiceKeyCredential from corehttp.rest import AsyncHttpResponse, HttpRequest from corehttp.runtime import AsyncPipelineClient, policies from .._utils.serialization import Deserializer, Serializer -from ._configuration import ApiKeyClientConfiguration -from ._operations import _ApiKeyClientOperationsMixin +from ._configuration import RecursiveClientConfiguration +from ._operations import _RecursiveClientOperationsMixin -class ApiKeyClient(_ApiKeyClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword - """Illustrates clients generated with ApiKey authentication. +class RecursiveClient(_RecursiveClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Illustrates inheritance recursion. - :param credential: Credential used to authenticate requests to the service. Required. - :type credential: ~corehttp.credentials.ServiceKeyCredential :keyword endpoint: Service host. Default value is "http://localhost:3000". :paramtype endpoint: str """ - def __init__( - self, credential: ServiceKeyCredential, *, endpoint: str = "http://localhost:3000", **kwargs: Any + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, *, endpoint: str = "http://localhost:3000", **kwargs: Any ) -> None: _endpoint = "{endpoint}" - self._config = ApiKeyClientConfiguration(credential=credential, endpoint=endpoint, **kwargs) + self._config = RecursiveClientConfiguration(endpoint=endpoint, **kwargs) _policies = kwargs.pop("policies", None) if _policies is None: diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_configuration.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_configuration.py similarity index 56% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_configuration.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_configuration.py index 6515d844fb4..13936abc875 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_configuration.py +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_configuration.py @@ -2,33 +2,25 @@ from typing import Any -from corehttp.credentials import ServiceKeyCredential from corehttp.runtime import policies from .._version import VERSION -class ApiKeyClientConfiguration: - """Configuration for ApiKeyClient. +class RecursiveClientConfiguration: + """Configuration for RecursiveClient. Note that all parameters used to create this instance are saved as instance attributes. - :param credential: Credential used to authenticate requests to the service. Required. - :type credential: ~corehttp.credentials.ServiceKeyCredential :param endpoint: Service host. Default value is "http://localhost:3000". :type endpoint: str """ - def __init__( - self, credential: ServiceKeyCredential, endpoint: str = "http://localhost:3000", **kwargs: Any - ) -> None: - if credential is None: - raise ValueError("Parameter 'credential' must not be None.") + def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: - self.credential = credential self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "authentication-api-key-subdir/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "generation-subdir/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) @@ -39,5 +31,3 @@ def _configure(self, **kwargs: Any) -> None: self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs) self.authentication_policy = kwargs.get("authentication_policy") - if self.credential and not self.authentication_policy: - self.authentication_policy = policies.ServiceKeyCredentialPolicy(self.credential, "x-ms-api-key", **kwargs) diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/__init__.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_operations/__init__.py similarity index 78% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/__init__.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_operations/__init__.py index ec7cfa89f78..25f03f2c716 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/__init__.py +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_operations/__init__.py @@ -6,7 +6,7 @@ if TYPE_CHECKING: from ._patch import * # pylint: disable=unused-wildcard-import -from ._operations import _ApiKeyClientOperationsMixin # type: ignore # pylint: disable=unused-import +from ._operations import _RecursiveClientOperationsMixin # type: ignore # pylint: disable=unused-import from ._patch import __all__ as _patch_all from ._patch import * diff --git a/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_operations/_operations.py new file mode 100644 index 00000000000..a069aa74e5e --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_operations/_operations.py @@ -0,0 +1,187 @@ +# coding=utf-8 +from collections.abc import MutableMapping +from io import IOBase +import json +from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload + +from corehttp.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + StreamClosedError, + StreamConsumedError, + map_error, +) +from corehttp.rest import AsyncHttpResponse, HttpRequest +from corehttp.runtime import AsyncPipelineClient +from corehttp.runtime.pipeline import PipelineResponse +from corehttp.utils import case_insensitive_dict + +from ... import models as _models +from ..._operations._operations import build_recursive_get_request, build_recursive_put_request +from ..._utils.model_base import SdkJSONEncoder, _deserialize +from ..._utils.utils import ClientMixinABC +from .._configuration import RecursiveClientConfiguration + +JSON = MutableMapping[str, Any] +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + + +class _RecursiveClientOperationsMixin( + ClientMixinABC[AsyncPipelineClient[HttpRequest, AsyncHttpResponse], RecursiveClientConfiguration] +): + + @overload + async def put(self, input: _models.Extension, *, content_type: str = "application/json", **kwargs: Any) -> None: + """put. + + :param input: Required. + :type input: ~generation.subdir._generated.models.Extension + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~corehttp.exceptions.HttpResponseError: + """ + + @overload + async def put(self, input: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: + """put. + + :param input: Required. + :type input: JSON + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~corehttp.exceptions.HttpResponseError: + """ + + @overload + async def put(self, input: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + """put. + + :param input: Required. + :type input: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~corehttp.exceptions.HttpResponseError: + """ + + async def put(self, input: Union[_models.Extension, JSON, IO[bytes]], **kwargs: Any) -> None: + """put. + + :param input: Is one of the following types: Extension, JSON, IO[bytes] Required. + :type input: ~generation.subdir._generated.models.Extension or JSON or IO[bytes] + :return: None + :rtype: None + :raises ~corehttp.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = kwargs.pop("params", {}) or {} + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[None] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(input, (IOBase, bytes)): + _content = input + else: + _content = json.dumps(input, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_recursive_put_request( + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client.pipeline.run( # type: ignore + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + async def get(self, **kwargs: Any) -> _models.Extension: + """get. + + :return: Extension. The Extension is compatible with MutableMapping + :rtype: ~generation.subdir._generated.models.Extension + :raises ~corehttp.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[_models.Extension] = kwargs.pop("cls", None) + + _request = build_recursive_get_request( + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = kwargs.pop("stream", False) + pipeline_response: PipelineResponse = await self._client.pipeline.run( # type: ignore + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + if _stream: + try: + await response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if _stream: + deserialized = response.iter_bytes() + else: + deserialized = _deserialize(_models.Extension, response.json()) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_patch.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_patch.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_operations/_patch.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_patch.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_patch.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/aio/_patch.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/__init__.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/models/__init__.py similarity index 87% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/__init__.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/models/__init__.py index 8187b432556..c72412ad27f 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/__init__.py +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/models/__init__.py @@ -8,14 +8,16 @@ from ._models import ( # type: ignore - InvalidAuth, + Element, + Extension, ) from ._patch import __all__ as _patch_all from ._patch import * from ._patch import patch_sdk as _patch_sdk __all__ = [ - "InvalidAuth", + "Element", + "Extension", ] __all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore _patch_sdk() diff --git a/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/models/_models.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/models/_models.py new file mode 100644 index 00000000000..1159b391e96 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/models/_models.py @@ -0,0 +1,69 @@ +# coding=utf-8 +# pylint: disable=useless-super-delegation + +from typing import Any, List, Mapping, Optional, TYPE_CHECKING, overload + +from .._utils.model_base import Model as _Model, rest_field + +if TYPE_CHECKING: + from .. import models as _models + + +class Element(_Model): + """element. + + :ivar extension: + :vartype extension: list[~generation.subdir._generated.models.Extension] + """ + + extension: Optional[List["_models.Extension"]] = rest_field( + visibility=["read", "create", "update", "delete", "query"] + ) + + @overload + def __init__( + self, + *, + extension: Optional[List["_models.Extension"]] = None, + ) -> None: ... + + @overload + def __init__(self, mapping: Mapping[str, Any]) -> None: + """ + :param mapping: raw JSON to initialize the model. + :type mapping: Mapping[str, Any] + """ + + def __init__(self, *args: Any, **kwargs: Any) -> None: + super().__init__(*args, **kwargs) + + +class Extension(Element): + """extension. + + :ivar extension: + :vartype extension: list[~generation.subdir._generated.models.Extension] + :ivar level: Required. + :vartype level: int + """ + + level: int = rest_field(visibility=["read", "create", "update", "delete", "query"]) + """Required.""" + + @overload + def __init__( + self, + *, + level: int, + extension: Optional[List["_models.Extension"]] = None, + ) -> None: ... + + @overload + def __init__(self, mapping: Mapping[str, Any]) -> None: + """ + :param mapping: raw JSON to initialize the model. + :type mapping: Mapping[str, Any] + """ + + def __init__(self, *args: Any, **kwargs: Any) -> None: + super().__init__(*args, **kwargs) diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_patch.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/models/_patch.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_patch.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_generated/models/_patch.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_version.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_version.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_version.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_version.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/__init__.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/__init__.py similarity index 81% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/__init__.py rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/__init__.py index 46b2bd5759d..e00f0911dad 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/__init__.py +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/__init__.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- -from ._client import CustomizedApiKeyClient +from ._client import CustomizedClient __all__ = [ - "CustomizedApiKeyClient", + "CustomizedClient", ] diff --git a/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/_client.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/_client.py new file mode 100644 index 00000000000..357275d8213 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/_client.py @@ -0,0 +1,30 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +from typing import Any +from .._generated.aio import RecursiveClient as GeneratedClient +from .._generated import models as _models + + +class CustomizedClient: # pylint: disable=client-accepts-api-version-keyword + """Tests customization of a client that is fully wrapped. + + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + self._client = GeneratedClient(endpoint=endpoint, **kwargs) + + async def customized_get(self, **kwargs: Any) -> _models.Extension: + """get. + + :return: Extension. The Extension is compatible with MutableMapping + :rtype: ~generation.subdir._generated.models.Extension + :raises ~corehttp.exceptions.HttpResponseError: + """ + return await self._client.get(**kwargs) diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/py.typed b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/py.typed similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/py.typed rename to packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/py.typed diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/pyproject.toml b/packages/typespec-python/test/unbranded/generated/generation-subdir/pyproject.toml similarity index 80% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/pyproject.toml rename to packages/typespec-python/test/unbranded/generated/generation-subdir/pyproject.toml index 4c75610cdcd..3c8cf5d04ad 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/pyproject.toml +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/pyproject.toml @@ -4,11 +4,11 @@ requires = ["setuptools>=61.0.0", "wheel"] # Requires 61.0.0 for dynamic versio build-backend = "setuptools.build_meta" [project] -name = "authentication-api-key-subdir" +name = "generation-subdir" authors = [ { name = "" }, ] -description = " Authentication Api Key Subdir Client Library for Python" +description = " Generation Subdir Client Library for Python" license = {text = "MIT License"} classifiers = [ "Development Status :: 4 - Beta", @@ -34,16 +34,14 @@ dynamic = [ ] [tool.setuptools.dynamic] -version = {attr = "authentication.api.key.subdir._version.VERSION"} +version = {attr = "generation.subdir._version.VERSION"} readme = {file = ["README.md"], content-type = "text/markdown"} [tool.setuptools.packages.find] exclude = [ "tests*", "samples*", - "authentication", - "authentication.api", - "authentication.api.key", + "generation", ] [tool.setuptools.package-data] diff --git a/packages/typespec-python/test/unbranded/mock_api_tests/test_unbranded.py b/packages/typespec-python/test/unbranded/mock_api_tests/test_unbranded.py index bfb276ca54f..04e32d658f9 100644 --- a/packages/typespec-python/test/unbranded/mock_api_tests/test_unbranded.py +++ b/packages/typespec-python/test/unbranded/mock_api_tests/test_unbranded.py @@ -55,7 +55,6 @@ def test_sensitive_word(): assert [] == check_sensitive_word(check_folder, "azure") # after update cadl-ranch, it shall also equal to [] assert [ - "authentication-api-key-subdir", "authentication-oauth2", "authentication-union", "setuppy-authentication-union", diff --git a/packages/typespec-python/test/unbranded/requirements.txt b/packages/typespec-python/test/unbranded/requirements.txt index 52c0792485c..7f083be081d 100644 --- a/packages/typespec-python/test/unbranded/requirements.txt +++ b/packages/typespec-python/test/unbranded/requirements.txt @@ -5,12 +5,12 @@ pytest-asyncio==0.14.0;python_full_version>="3.5.2" # common test case -e ./generated/authentication-api-key --e ./generated/authentication-api-key-subdir -e ./generated/authentication-http-custom -e ./generated/authentication-oauth2 -e ./generated/authentication-union -e ./generated/encode-duration -e ./generated/encode-numeric +-e ./generated/generation-subdir -e ./generated/parameters-basic -e ./generated/parameters-collection-format -e ./generated/parameters-path From 4a5fd2ec7aa2b1de72809dad3f3f16505bad554d Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Wed, 6 Aug 2025 16:03:13 -0400 Subject: [PATCH 02/10] update mockapi tests --- .../test_generation_subdir_async.py | 13 +++++++---- .../test_generation_subdir.py | 23 ++++++++----------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_generation_subdir_async.py b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_generation_subdir_async.py index 44d37c30794..1175fdfaa19 100644 --- a/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_generation_subdir_async.py +++ b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_generation_subdir_async.py @@ -4,10 +4,15 @@ # license information. # -------------------------------------------------------------------------- import pytest -from authentication.api.key.subdir.aio import CustomizedApiKeyClient +from generation.subdir import CustomizedClient, Extension @pytest.mark.asyncio -async def test_custom_method(key_credential): - client = CustomizedApiKeyClient(key_credential("valid-key")) - assert await client.custom_method() +async def test_custom_method(): + client = CustomizedClient() + assert (await client.custom_method()) == Extension( + { + "level": 0, + "extension": [{"level": 1, "extension": [{"level": 2}]}, {"level": 1}], + } + ) diff --git a/packages/typespec-python/test/generic_mock_api_tests/test_generation_subdir.py b/packages/typespec-python/test/generic_mock_api_tests/test_generation_subdir.py index 0f94e2a0dab..3f369cee62c 100644 --- a/packages/typespec-python/test/generic_mock_api_tests/test_generation_subdir.py +++ b/packages/typespec-python/test/generic_mock_api_tests/test_generation_subdir.py @@ -3,19 +3,14 @@ # Licensed under the MIT License. See License.txt in the project root for # license information. # -------------------------------------------------------------------------- -import pytest -from generation.subdir import CustomizedApiKeyClient +from generation.subdir import CustomizedClient, Extension -def test_custom_method(key_credential): - client = CustomizedApiKeyClient(key_credential("valid-key")) - assert client.custom_method() - - -def test_custom_model(): - try: - from authentication.api.key.subdir import InvalidAuth - - assert InvalidAuth is not None - except ImportError: - pytest.fail("InvalidAuth could not be imported") +def test_custom_method(): + client = CustomizedClient() + assert client.custom_method() == Extension( + { + "level": 0, + "extension": [{"level": 1, "extension": [{"level": 2}]}, {"level": 1}], + } + ) From d366d6ff894a48b3b03699cff1f4885e8e3acbaa Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Wed, 6 Aug 2025 16:49:36 -0400 Subject: [PATCH 03/10] update ref to method --- .chronus/changes/update_subdir_test-2025-7-6-16-49-1.md | 7 +++++++ .../asynctests/test_generation_subdir_async.py | 2 +- .../test/generic_mock_api_tests/test_generation_subdir.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 .chronus/changes/update_subdir_test-2025-7-6-16-49-1.md diff --git a/.chronus/changes/update_subdir_test-2025-7-6-16-49-1.md b/.chronus/changes/update_subdir_test-2025-7-6-16-49-1.md new file mode 100644 index 00000000000..b96c99c34bb --- /dev/null +++ b/.chronus/changes/update_subdir_test-2025-7-6-16-49-1.md @@ -0,0 +1,7 @@ +--- +changeKind: internal +packages: + - "@azure-tools/typespec-python" +--- + +Update tests \ No newline at end of file diff --git a/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_generation_subdir_async.py b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_generation_subdir_async.py index 1175fdfaa19..cd62c92c875 100644 --- a/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_generation_subdir_async.py +++ b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_generation_subdir_async.py @@ -10,7 +10,7 @@ @pytest.mark.asyncio async def test_custom_method(): client = CustomizedClient() - assert (await client.custom_method()) == Extension( + assert (await client.customized_get()) == Extension( { "level": 0, "extension": [{"level": 1, "extension": [{"level": 2}]}, {"level": 1}], diff --git a/packages/typespec-python/test/generic_mock_api_tests/test_generation_subdir.py b/packages/typespec-python/test/generic_mock_api_tests/test_generation_subdir.py index 3f369cee62c..d2b74608188 100644 --- a/packages/typespec-python/test/generic_mock_api_tests/test_generation_subdir.py +++ b/packages/typespec-python/test/generic_mock_api_tests/test_generation_subdir.py @@ -8,7 +8,7 @@ def test_custom_method(): client = CustomizedClient() - assert client.custom_method() == Extension( + assert client.customized_get() == Extension( { "level": 0, "extension": [{"level": 1, "extension": [{"level": 2}]}, {"level": 1}], From 8e7fad8cca22fba43d00d7db0c28f8cde4b27671 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 7 Aug 2025 11:50:22 -0400 Subject: [PATCH 04/10] format --- packages/typespec-python/scripts/eng/regenerate.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/typespec-python/scripts/eng/regenerate.ts b/packages/typespec-python/scripts/eng/regenerate.ts index 5b1a776ba44..c3427710142 100644 --- a/packages/typespec-python/scripts/eng/regenerate.ts +++ b/packages/typespec-python/scripts/eng/regenerate.ts @@ -192,7 +192,7 @@ const EMITTER_OPTIONS: Record | Record Date: Thu, 7 Aug 2025 11:51:38 -0400 Subject: [PATCH 05/10] fix async test --- .../asynctests/test_generation_subdir_async.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_generation_subdir_async.py b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_generation_subdir_async.py index cd62c92c875..f992bd973dc 100644 --- a/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_generation_subdir_async.py +++ b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_generation_subdir_async.py @@ -4,7 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from generation.subdir import CustomizedClient, Extension +from generation.subdir import Extension +from generation.subdir.aio import CustomizedClient @pytest.mark.asyncio From d09b822a136297638419460503fcc0b6b1f96c5a Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 7 Aug 2025 11:55:18 -0400 Subject: [PATCH 06/10] add tracing decorators --- .../generated/generation-subdir/generation/subdir/_client.py | 2 ++ .../generation-subdir/generation/subdir/aio/_client.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_client.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_client.py index 6fbc82dbfbd..352d9a45cca 100644 --- a/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_client.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/_client.py @@ -4,6 +4,7 @@ # license information. # -------------------------------------------------------------------------- from typing import Any +from azure.core.tracing.decorator import distributed_trace from ._generated import RecursiveClient as GeneratedClient, models as _models @@ -19,6 +20,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ) -> None: self._client = GeneratedClient(endpoint=endpoint, **kwargs) + @distributed_trace def customized_get(self, **kwargs: Any) -> _models.Extension: """get. diff --git a/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/aio/_client.py b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/aio/_client.py index 357275d8213..e63bca263cf 100644 --- a/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/aio/_client.py +++ b/packages/typespec-python/test/azure/generated/generation-subdir/generation/subdir/aio/_client.py @@ -4,6 +4,7 @@ # license information. # -------------------------------------------------------------------------- from typing import Any +from azure.core.tracing.decorator_async import distributed_trace_async from .._generated.aio import RecursiveClient as GeneratedClient from .._generated import models as _models @@ -20,6 +21,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ) -> None: self._client = GeneratedClient(endpoint=endpoint, **kwargs) + @distributed_trace_async async def customized_get(self, **kwargs: Any) -> _models.Extension: """get. From dc994e56ec13704fc6e2252bcbeb29051ab308b3 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 7 Aug 2025 13:13:06 -0400 Subject: [PATCH 07/10] fix unbranded test failures --- .../generated/generation-subdir/generation/subdir/_client.py | 2 +- .../generation-subdir/generation/subdir/aio/_client.py | 2 +- .../test/unbranded/mock_api_tests/test_unbranded.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_client.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_client.py index 6fbc82dbfbd..d486413adf6 100644 --- a/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_client.py +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_client.py @@ -19,7 +19,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ) -> None: self._client = GeneratedClient(endpoint=endpoint, **kwargs) - def customized_get(self, **kwargs: Any) -> _models.Extension: + def customized_get(self, **kwargs: Any) -> _models.Extension: # pylint: disable=client-method-missing-tracing-decorator """get. :return: Extension. The Extension is compatible with MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/_client.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/_client.py index 357275d8213..72e9cc8574a 100644 --- a/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/_client.py +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/_client.py @@ -20,7 +20,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ) -> None: self._client = GeneratedClient(endpoint=endpoint, **kwargs) - async def customized_get(self, **kwargs: Any) -> _models.Extension: + async def customized_get(self, **kwargs: Any) -> _models.Extension: # pylint: disable=client-method-missing-tracing-decorator """get. :return: Extension. The Extension is compatible with MutableMapping diff --git a/packages/typespec-python/test/unbranded/mock_api_tests/test_unbranded.py b/packages/typespec-python/test/unbranded/mock_api_tests/test_unbranded.py index 04e32d658f9..ba00da4bf6b 100644 --- a/packages/typespec-python/test/unbranded/mock_api_tests/test_unbranded.py +++ b/packages/typespec-python/test/unbranded/mock_api_tests/test_unbranded.py @@ -57,5 +57,6 @@ def test_sensitive_word(): assert [ "authentication-oauth2", "authentication-union", + "generation-subdir", "setuppy-authentication-union", ] == check_sensitive_word(check_folder, "microsoft") From aa5083bb9a56973359324bc8c2d7a0c65978b8d6 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 7 Aug 2025 14:44:30 -0400 Subject: [PATCH 08/10] fix black diff --- .../generated/generation-subdir/generation/subdir/_client.py | 4 +++- .../generation-subdir/generation/subdir/aio/_client.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_client.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_client.py index d486413adf6..7904e9db034 100644 --- a/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_client.py +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/_client.py @@ -19,7 +19,9 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ) -> None: self._client = GeneratedClient(endpoint=endpoint, **kwargs) - def customized_get(self, **kwargs: Any) -> _models.Extension: # pylint: disable=client-method-missing-tracing-decorator + def customized_get( # pylint: disable=client-method-missing-tracing-decorator + self, **kwargs: Any + ) -> _models.Extension: """get. :return: Extension. The Extension is compatible with MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/_client.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/_client.py index 72e9cc8574a..c94fd4780c4 100644 --- a/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/_client.py +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/_client.py @@ -20,7 +20,9 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ) -> None: self._client = GeneratedClient(endpoint=endpoint, **kwargs) - async def customized_get(self, **kwargs: Any) -> _models.Extension: # pylint: disable=client-method-missing-tracing-decorator + async def customized_get( # pylint: disable=client-method-missing-tracing-decorator + self, **kwargs: Any + ) -> _models.Extension: """get. :return: Extension. The Extension is compatible with MutableMapping From c3d1bad4277ca0801e24c1647c467fa650f22bc0 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Fri, 8 Aug 2025 11:45:02 -0400 Subject: [PATCH 09/10] fix linter disable to async version --- .../generation-subdir/generation/subdir/aio/_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/_client.py b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/_client.py index c94fd4780c4..e27581b5986 100644 --- a/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/_client.py +++ b/packages/typespec-python/test/unbranded/generated/generation-subdir/generation/subdir/aio/_client.py @@ -20,7 +20,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ) -> None: self._client = GeneratedClient(endpoint=endpoint, **kwargs) - async def customized_get( # pylint: disable=client-method-missing-tracing-decorator + async def customized_get( # pylint: disable=client-method-missing-tracing-decorator-async self, **kwargs: Any ) -> _models.Extension: """get. From 2b524397f736a634d5d89fdc2a88628185028a75 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Fri, 8 Aug 2025 11:56:43 -0400 Subject: [PATCH 10/10] format --- packages/typespec-python/scripts/eng/regenerate.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/typespec-python/scripts/eng/regenerate.ts b/packages/typespec-python/scripts/eng/regenerate.ts index d59e9ab172a..f832053bf98 100644 --- a/packages/typespec-python/scripts/eng/regenerate.ts +++ b/packages/typespec-python/scripts/eng/regenerate.ts @@ -21,10 +21,10 @@ interface TspCommand { // Add this near the top with other constants const SKIP_SPECS = [ - "type/union/discriminated", - "client-operation-group", - "azure/client-generator-core/api-version", - "azure/client-generator-core/hierarchy-building", + "type/union/discriminated", + "client-operation-group", + "azure/client-generator-core/api-version", + "azure/client-generator-core/hierarchy-building", ]; const AZURE_EMITTER_OPTIONS: Record | Record[]> = {