From b481ae3c2180b04d3586b20f8eea9be097e1ae35 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 24 Jul 2025 13:32:19 -0400 Subject: [PATCH 01/34] use local http-client-python --- packages/autorest.python/package.json | 2 +- packages/typespec-python/package.json | 2 +- pnpm-lock.yaml | 15 ++++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/autorest.python/package.json b/packages/autorest.python/package.json index 8d5c2dd15d7..087932dced3 100644 --- a/packages/autorest.python/package.json +++ b/packages/autorest.python/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md", "dependencies": { - "@typespec/http-client-python": "~0.14.0", + "@typespec/http-client-python": "/Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz", "@autorest/system-requirements": "~1.0.2", "fs-extra": "~11.2.0", "tsx": "~4.19.1" diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json index 4f97e72a9a3..5b8fbfee226 100644 --- a/packages/typespec-python/package.json +++ b/packages/typespec-python/package.json @@ -67,7 +67,7 @@ "js-yaml": "~4.1.0", "semver": "~7.6.2", "tsx": "~4.19.1", - "@typespec/http-client-python": "~0.14.0", + "@typespec/http-client-python": "/Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz", "fs-extra": "~11.2.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 70753168fcc..22b4cc45195 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,8 +60,8 @@ importers: specifier: ~1.0.2 version: 1.0.2 '@typespec/http-client-python': - specifier: ~0.14.0 - version: 0.14.0(iurth4uuk4s6znzuuc7ncenk2q) + specifier: /Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz + version: file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz(iurth4uuk4s6znzuuc7ncenk2q) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -82,8 +82,8 @@ importers: packages/typespec-python: dependencies: '@typespec/http-client-python': - specifier: ~0.14.0 - version: 0.14.0(iurth4uuk4s6znzuuc7ncenk2q) + specifier: /Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz + version: file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz(iurth4uuk4s6znzuuc7ncenk2q) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -1668,8 +1668,9 @@ packages: peerDependencies: '@typespec/compiler': ^1.2.1 - '@typespec/http-client-python@0.14.0': - resolution: {integrity: sha512-JJ9dWy64bC7fQvYcxlBixJJ/raaPYWLbjqh5BZ725y/xRjHqHSwscAK2fXZIrNwrEdvF03y9XNlOnf3Zj0V4GA==} + '@typespec/http-client-python@file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz': + resolution: {integrity: sha512-C2Xbi9ao/3l5m/emXIl/Yb7nGWLuoIt3wQmmdOIPFdEKTORdAyOLa0x7PeawzSS7t18GZtIcAB5Qr3uvEMjeDw==, tarball: file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz} + version: 0.14.0 engines: {node: '>=20.0.0'} peerDependencies: '@azure-tools/typespec-autorest': '>=0.58.0 <1.0.0' @@ -6421,7 +6422,7 @@ snapshots: dependencies: '@typespec/compiler': 1.2.1(@types/node@22.13.17) - '@typespec/http-client-python@0.14.0(iurth4uuk4s6znzuuc7ncenk2q)': + '@typespec/http-client-python@file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz(iurth4uuk4s6znzuuc7ncenk2q)': dependencies: '@azure-tools/typespec-autorest': 0.58.0(vddu6w2yloigenmssnpyjivoim) '@azure-tools/typespec-azure-core': 0.58.0(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))(@typespec/rest@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))) From 1069e394ec7f54150b83928ea2e2e14da5f21a62 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 24 Jul 2025 14:20:39 -0400 Subject: [PATCH 02/34] regen with subdir --- .../typespec-python/scripts/eng/regenerate.ts | 29 +- .../subdir/CHANGELOG.md | 5 + .../subdir/MANIFEST.in | 6 + .../subdir/README.md | 30 + .../subdir/authentication/__init__.py | 1 + .../subdir/authentication/apikey/_client.py | 12 + .../apikey/_generated/__init__.py | 26 + .../apikey/_generated/_client.py | 82 + .../apikey/_generated/_configuration.py | 43 + .../apikey/_generated/_operations/__init__.py | 16 + .../_generated/_operations/_operations.py | 139 ++ .../apikey/_generated/_operations/_patch.py | 18 + .../apikey/_generated/_patch.py | 18 + .../apikey/_generated/_utils/__init__.py | 0 .../apikey/_generated/_utils/model_base.py | 1226 ++++++++++ .../apikey/_generated/_utils/serialization.py | 2026 +++++++++++++++++ .../apikey/_generated/_utils/utils.py | 18 + .../apikey/_generated/aio/__init__.py | 23 + .../apikey/_generated/aio/_client.py | 84 + .../apikey/_generated/aio/_configuration.py | 43 + .../_generated/aio/_operations/__init__.py | 16 + .../_generated/aio/_operations/_operations.py | 118 + .../_generated/aio/_operations/_patch.py | 18 + .../apikey/_generated/aio/_patch.py | 18 + .../apikey/_generated/models/__init__.py | 21 + .../apikey/_generated/models/_models.py | 34 + .../apikey/_generated/models/_patch.py | 18 + .../subdir/authentication/apikey/_version.py | 3 + .../authentication/apikey/aio/_client.py | 12 + .../subdir/authentication/apikey/py.typed | 1 + .../subdir/setup.py | 61 + 31 files changed, 4161 insertions(+), 4 deletions(-) create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/CHANGELOG.md create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/MANIFEST.in create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/README.md create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_client.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_client.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_configuration.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_operations.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_patch.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_patch.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/model_base.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/serialization.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/utils.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_client.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_configuration.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_operations.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_patch.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_patch.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_models.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_patch.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_version.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/aio/_client.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/py.typed create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/setup.py diff --git a/packages/typespec-python/scripts/eng/regenerate.ts b/packages/typespec-python/scripts/eng/regenerate.ts index 9131d3a4f1d..f7ee6f912af 100644 --- a/packages/typespec-python/scripts/eng/regenerate.ts +++ b/packages/typespec-python/scripts/eng/regenerate.ts @@ -355,6 +355,10 @@ interface EmitterConfig { outputDir: string; } +function generateSubdir(spec: string): boolean { + return spec.includes("authentication/api-key"); +} + function addOptions(spec: string, generatedFolder: string, flags: RegenerateFlags): EmitterConfig[] { const emitterConfigs: EmitterConfig[] = []; for (const config of getEmitterOption(spec, flags.flavor)) { @@ -371,16 +375,33 @@ function addOptions(spec: string, generatedFolder: string, flags: RegenerateFlag options["debug"] = "true"; } options["examples-dir"] = toPosix(join(dirname(spec), "examples")); - const configs = Object.entries(options).flatMap(([k, v]) => { - return `--option @azure-tools/typespec-python.${k}=${typeof v === "string" && v.indexOf(" ") > -1 ? `"${v}"` : v}`; - }); emitterConfigs.push({ - optionsStr: configs.join(" "), + optionsStr: getConfigsFromOptions(options).join(" "), outputDir: options["emitter-output-dir"], }); + if (generateSubdir(spec)) { + const packageName = `${options["package-name"] || defaultPackageName(spec)}-with-subdir`; + const subdirOptions = { + ...options, + "package-name": packageName, + "generation-subdir": "_generated/", + "emitter-output-dir": toPosix(`${generatedFolder}/test/${flags.flavor}/generated/${packageName}/subdir`) + } + emitterConfigs.push({ + optionsStr: getConfigsFromOptions(subdirOptions).join(" "), + outputDir: subdirOptions["emitter-output-dir"], + }); + } } return emitterConfigs; } + +function getConfigsFromOptions(options: Record): string[] { + return Object.entries(options).flatMap(([k, v]) => { + return `--option @azure-tools/typespec-python.${k}=${typeof v === "string" && v.indexOf(" ") > -1 ? `"${v}"` : v}`; + }); +} + function _getCmdList(spec: string, flags: RegenerateFlags): TspCommand[] { return addOptions(spec, PLUGIN_DIR, flags).map((option) => { return { diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/CHANGELOG.md b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/CHANGELOG.md new file mode 100644 index 00000000000..628743d283a --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/CHANGELOG.md @@ -0,0 +1,5 @@ +# Release History + +## 1.0.0b1 (1970-01-01) + +- Initial version diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/MANIFEST.in b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/MANIFEST.in new file mode 100644 index 00000000000..805328d742a --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/MANIFEST.in @@ -0,0 +1,6 @@ +include *.md +include LICENSE +include authentication/apikey/py.typed +recursive-include tests *.py +recursive-include samples *.py *.md +include authentication/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/README.md b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/README.md new file mode 100644 index 00000000000..37844352395 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/README.md @@ -0,0 +1,30 @@ +# Overview + +This package is generated by `@typespec/http-client-python` with Typespec. + +## Getting started + +### Prequisites + +- Python 3.9 or later is required to use this package. + +### Install the package + +Step into folder where setup.py is then run: + +```bash +pip install -e . +``` + +### Examples + +```python +>>> from authentication.apikey import ApiKeyClient +>>> from corehttp.exceptions import HttpResponseError + +>>> client = ApiKeyClient(endpoint='') +>>> try: + + except HttpResponseError as e: + print('service responds error: {}'.format(e.response.json())) +``` diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/__init__.py new file mode 100644 index 00000000000..d55ccad1f57 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/__init__.py @@ -0,0 +1 @@ +__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_client.py new file mode 100644 index 00000000000..3a48d493e70 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_client.py @@ -0,0 +1,12 @@ +from ._generated import ApiKeyClient + +class CustomizedApiKeyClient(ApiKeyClient): + """Customized ApiKeyClient with additional functionality.""" + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + # Additional initialization or customization can be done here + + def custom_method(self): + """An example of a custom method that extends the functionality.""" + print("This is a custom method in the CustomizedApiKeyClient.") diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/__init__.py new file mode 100644 index 00000000000..4fe58ce5af2 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/__init__.py @@ -0,0 +1,26 @@ +# coding=utf-8 +# pylint: disable=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._client import ApiKeyClient # type: ignore +from ._version import VERSION + +__version__ = VERSION + +try: + from ._patch import __all__ as _patch_all + from ._patch import * +except ImportError: + _patch_all = [] +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "ApiKeyClient", +] +__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/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_client.py new file mode 100644 index 00000000000..b809f321bd0 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_client.py @@ -0,0 +1,82 @@ +# coding=utf-8 + +from copy import deepcopy +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._operations import _ApiKeyClientOperationsMixin +from ._utils.serialization import Deserializer, Serializer + + +class ApiKeyClient(_ApiKeyClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Illustrates clients generated with ApiKey authentication. + + :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 + ) -> None: + _endpoint = "{endpoint}" + self._config = ApiKeyClientConfiguration(credential=credential, endpoint=endpoint, **kwargs) + + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + self._config.retry_policy, + self._config.authentication_policy, + self._config.logging_policy, + ] + self._client: PipelineClient = PipelineClient(endpoint=_endpoint, policies=_policies, **kwargs) + + self._serialize = Serializer() + self._deserialize = Deserializer() + self._serialize.client_side_validation = False + + def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse: + """Runs the network request through the client's chained policies. + + >>> from corehttp.rest import HttpRequest + >>> request = HttpRequest("GET", "https://www.example.org/") + + >>> response = client.send_request(request) + + + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request + + :param request: The network request you want to make. Required. + :type request: ~corehttp.rest.HttpRequest + :keyword bool stream: Whether the response payload will be streamed. Defaults to False. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~corehttp.rest.HttpResponse + """ + + request_copy = deepcopy(request) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + + request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + def close(self) -> None: + self._client.close() + + def __enter__(self) -> Self: + self._client.__enter__() + return self + + def __exit__(self, *exc_details: Any) -> None: + self._client.__exit__(*exc_details) diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_configuration.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_configuration.py new file mode 100644 index 00000000000..7055fb9552d --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_configuration.py @@ -0,0 +1,43 @@ +# coding=utf-8 + +from typing import Any + +from corehttp.credentials import ServiceKeyCredential +from corehttp.runtime import policies + +from ._version import VERSION + + +class ApiKeyClientConfiguration: + """Configuration for ApiKeyClient. + + 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.") + + self.credential = credential + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "authentication-api-key-with-subdir/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) + self._configure(**kwargs) + + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.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-with-subdir/subdir/authentication/apikey/_generated/_operations/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/__init__.py new file mode 100644 index 00000000000..0d033db47cd --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/__init__.py @@ -0,0 +1,16 @@ +# coding=utf-8 +# pylint: disable=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [] +__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/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_operations.py new file mode 100644 index 00000000000..c2c0f07f7da --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_operations.py @@ -0,0 +1,139 @@ +# 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-with-subdir/subdir/authentication/apikey/_generated/_operations/_patch.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_patch.py new file mode 100644 index 00000000000..894b28a174c --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_patch.py @@ -0,0 +1,18 @@ +# coding=utf-8 + +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_patch.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_patch.py new file mode 100644 index 00000000000..894b28a174c --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_patch.py @@ -0,0 +1,18 @@ +# coding=utf-8 + +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/model_base.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/model_base.py new file mode 100644 index 00000000000..e69ff2ca36d --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/model_base.py @@ -0,0 +1,1226 @@ +# pylint: disable=too-many-lines +# coding=utf-8 +# pylint: disable=protected-access, broad-except + +import copy +import calendar +import decimal +import functools +import sys +import logging +import base64 +import re +import typing +import enum +import email.utils +from datetime import datetime, date, time, timedelta, timezone +from json import JSONEncoder +import xml.etree.ElementTree as ET +from collections.abc import MutableMapping +from typing_extensions import Self +import isodate +from corehttp.exceptions import DeserializationError +from corehttp.utils import CaseInsensitiveEnumMeta +from corehttp.runtime.pipeline import PipelineResponse +from corehttp.serialization import _Null + +_LOGGER = logging.getLogger(__name__) + +__all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"] + +TZ_UTC = timezone.utc +_T = typing.TypeVar("_T") + + +def _timedelta_as_isostr(td: timedelta) -> str: + """Converts a datetime.timedelta object into an ISO 8601 formatted string, e.g. 'P4DT12H30M05S' + + Function adapted from the Tin Can Python project: https://github.com/RusticiSoftware/TinCanPython + + :param timedelta td: The timedelta to convert + :rtype: str + :return: ISO8601 version of this timedelta + """ + + # Split seconds to larger units + seconds = td.total_seconds() + minutes, seconds = divmod(seconds, 60) + hours, minutes = divmod(minutes, 60) + days, hours = divmod(hours, 24) + + days, hours, minutes = list(map(int, (days, hours, minutes))) + seconds = round(seconds, 6) + + # Build date + date_str = "" + if days: + date_str = "%sD" % days + + if hours or minutes or seconds: + # Build time + time_str = "T" + + # Hours + bigger_exists = date_str or hours + if bigger_exists: + time_str += "{:02}H".format(hours) + + # Minutes + bigger_exists = bigger_exists or minutes + if bigger_exists: + time_str += "{:02}M".format(minutes) + + # Seconds + try: + if seconds.is_integer(): + seconds_string = "{:02}".format(int(seconds)) + else: + # 9 chars long w/ leading 0, 6 digits after decimal + seconds_string = "%09.6f" % seconds + # Remove trailing zeros + seconds_string = seconds_string.rstrip("0") + except AttributeError: # int.is_integer() raises + seconds_string = "{:02}".format(seconds) + + time_str += "{}S".format(seconds_string) + else: + time_str = "" + + return "P" + date_str + time_str + + +def _serialize_bytes(o, format: typing.Optional[str] = None) -> str: + encoded = base64.b64encode(o).decode() + if format == "base64url": + return encoded.strip("=").replace("+", "-").replace("/", "_") + return encoded + + +def _serialize_datetime(o, format: typing.Optional[str] = None): + if hasattr(o, "year") and hasattr(o, "hour"): + if format == "rfc7231": + return email.utils.format_datetime(o, usegmt=True) + if format == "unix-timestamp": + return int(calendar.timegm(o.utctimetuple())) + + # astimezone() fails for naive times in Python 2.7, so make make sure o is aware (tzinfo is set) + if not o.tzinfo: + iso_formatted = o.replace(tzinfo=TZ_UTC).isoformat() + else: + iso_formatted = o.astimezone(TZ_UTC).isoformat() + # Replace the trailing "+00:00" UTC offset with "Z" (RFC 3339: https://www.ietf.org/rfc/rfc3339.txt) + return iso_formatted.replace("+00:00", "Z") + # Next try datetime.date or datetime.time + return o.isoformat() + + +def _is_readonly(p): + try: + return p._visibility == ["read"] + except AttributeError: + return False + + +class SdkJSONEncoder(JSONEncoder): + """A JSON encoder that's capable of serializing datetime objects and bytes.""" + + def __init__(self, *args, exclude_readonly: bool = False, format: typing.Optional[str] = None, **kwargs): + super().__init__(*args, **kwargs) + self.exclude_readonly = exclude_readonly + self.format = format + + def default(self, o): # pylint: disable=too-many-return-statements + if _is_model(o): + if self.exclude_readonly: + readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)] + return {k: v for k, v in o.items() if k not in readonly_props} + return dict(o.items()) + try: + return super(SdkJSONEncoder, self).default(o) + except TypeError: + if isinstance(o, _Null): + return None + if isinstance(o, decimal.Decimal): + return float(o) + if isinstance(o, (bytes, bytearray)): + return _serialize_bytes(o, self.format) + try: + # First try datetime.datetime + return _serialize_datetime(o, self.format) + except AttributeError: + pass + # Last, try datetime.timedelta + try: + return _timedelta_as_isostr(o) + except AttributeError: + # This will be raised when it hits value.total_seconds in the method above + pass + return super(SdkJSONEncoder, self).default(o) + + +_VALID_DATE = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" + r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") +_VALID_RFC7231 = re.compile( + r"(Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s\d{2}\s" + r"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d{4}\s\d{2}:\d{2}:\d{2}\sGMT" +) + + +def _deserialize_datetime(attr: typing.Union[str, datetime]) -> datetime: + """Deserialize ISO-8601 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :rtype: ~datetime.datetime + :returns: The datetime object from that input + """ + if isinstance(attr, datetime): + # i'm already deserialized + return attr + attr = attr.upper() + match = _VALID_DATE.match(attr) + if not match: + raise ValueError("Invalid datetime string: " + attr) + + check_decimal = attr.split(".") + if len(check_decimal) > 1: + decimal_str = "" + for digit in check_decimal[1]: + if digit.isdigit(): + decimal_str += digit + else: + break + if len(decimal_str) > 6: + attr = attr.replace(decimal_str, decimal_str[0:6]) + + date_obj = isodate.parse_datetime(attr) + test_utc = date_obj.utctimetuple() + if test_utc.tm_year > 9999 or test_utc.tm_year < 1: + raise OverflowError("Hit max or min date") + return date_obj + + +def _deserialize_datetime_rfc7231(attr: typing.Union[str, datetime]) -> datetime: + """Deserialize RFC7231 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :rtype: ~datetime.datetime + :returns: The datetime object from that input + """ + if isinstance(attr, datetime): + # i'm already deserialized + return attr + match = _VALID_RFC7231.match(attr) + if not match: + raise ValueError("Invalid datetime string: " + attr) + + return email.utils.parsedate_to_datetime(attr) + + +def _deserialize_datetime_unix_timestamp(attr: typing.Union[float, datetime]) -> datetime: + """Deserialize unix timestamp into Datetime object. + + :param str attr: response string to be deserialized. + :rtype: ~datetime.datetime + :returns: The datetime object from that input + """ + if isinstance(attr, datetime): + # i'm already deserialized + return attr + return datetime.fromtimestamp(attr, TZ_UTC) + + +def _deserialize_date(attr: typing.Union[str, date]) -> date: + """Deserialize ISO-8601 formatted string into Date object. + :param str attr: response string to be deserialized. + :rtype: date + :returns: The date object from that input + """ + # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. + if isinstance(attr, date): + return attr + return isodate.parse_date(attr, defaultmonth=None, defaultday=None) # type: ignore + + +def _deserialize_time(attr: typing.Union[str, time]) -> time: + """Deserialize ISO-8601 formatted string into time object. + + :param str attr: response string to be deserialized. + :rtype: datetime.time + :returns: The time object from that input + """ + if isinstance(attr, time): + return attr + return isodate.parse_time(attr) + + +def _deserialize_bytes(attr): + if isinstance(attr, (bytes, bytearray)): + return attr + return bytes(base64.b64decode(attr)) + + +def _deserialize_bytes_base64(attr): + if isinstance(attr, (bytes, bytearray)): + return attr + padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore + attr = attr + padding # type: ignore + encoded = attr.replace("-", "+").replace("_", "/") + return bytes(base64.b64decode(encoded)) + + +def _deserialize_duration(attr): + if isinstance(attr, timedelta): + return attr + return isodate.parse_duration(attr) + + +def _deserialize_decimal(attr): + if isinstance(attr, decimal.Decimal): + return attr + return decimal.Decimal(str(attr)) + + +def _deserialize_int_as_str(attr): + if isinstance(attr, int): + return attr + return int(attr) + + +_DESERIALIZE_MAPPING = { + datetime: _deserialize_datetime, + date: _deserialize_date, + time: _deserialize_time, + bytes: _deserialize_bytes, + bytearray: _deserialize_bytes, + timedelta: _deserialize_duration, + typing.Any: lambda x: x, + decimal.Decimal: _deserialize_decimal, +} + +_DESERIALIZE_MAPPING_WITHFORMAT = { + "rfc3339": _deserialize_datetime, + "rfc7231": _deserialize_datetime_rfc7231, + "unix-timestamp": _deserialize_datetime_unix_timestamp, + "base64": _deserialize_bytes, + "base64url": _deserialize_bytes_base64, +} + + +def get_deserializer(annotation: typing.Any, rf: typing.Optional["_RestField"] = None): + if annotation is int and rf and rf._format == "str": + return _deserialize_int_as_str + if rf and rf._format: + return _DESERIALIZE_MAPPING_WITHFORMAT.get(rf._format) + return _DESERIALIZE_MAPPING.get(annotation) # pyright: ignore + + +def _get_type_alias_type(module_name: str, alias_name: str): + types = { + k: v + for k, v in sys.modules[module_name].__dict__.items() + if isinstance(v, typing._GenericAlias) # type: ignore + } + if alias_name not in types: + return alias_name + return types[alias_name] + + +def _get_model(module_name: str, model_name: str): + models = {k: v for k, v in sys.modules[module_name].__dict__.items() if isinstance(v, type)} + module_end = module_name.rsplit(".", 1)[0] + models.update({k: v for k, v in sys.modules[module_end].__dict__.items() if isinstance(v, type)}) + if isinstance(model_name, str): + model_name = model_name.split(".")[-1] + if model_name not in models: + return model_name + return models[model_name] + + +_UNSET = object() + + +class _MyMutableMapping(MutableMapping[str, typing.Any]): + def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + self._data = data + + def __contains__(self, key: typing.Any) -> bool: + return key in self._data + + def __getitem__(self, key: str) -> typing.Any: + return self._data.__getitem__(key) + + def __setitem__(self, key: str, value: typing.Any) -> None: + self._data.__setitem__(key, value) + + def __delitem__(self, key: str) -> None: + self._data.__delitem__(key) + + def __iter__(self) -> typing.Iterator[typing.Any]: + return self._data.__iter__() + + def __len__(self) -> int: + return self._data.__len__() + + def __ne__(self, other: typing.Any) -> bool: + return not self.__eq__(other) + + def keys(self) -> typing.KeysView[str]: + """ + :returns: a set-like object providing a view on D's keys + :rtype: ~typing.KeysView + """ + return self._data.keys() + + def values(self) -> typing.ValuesView[typing.Any]: + """ + :returns: an object providing a view on D's values + :rtype: ~typing.ValuesView + """ + return self._data.values() + + def items(self) -> typing.ItemsView[str, typing.Any]: + """ + :returns: set-like object providing a view on D's items + :rtype: ~typing.ItemsView + """ + return self._data.items() + + def get(self, key: str, default: typing.Any = None) -> typing.Any: + """ + Get the value for key if key is in the dictionary, else default. + :param str key: The key to look up. + :param any default: The value to return if key is not in the dictionary. Defaults to None + :returns: D[k] if k in D, else d. + :rtype: any + """ + try: + return self[key] + except KeyError: + return default + + @typing.overload + def pop(self, key: str) -> typing.Any: ... # pylint: disable=arguments-differ + + @typing.overload + def pop(self, key: str, default: _T) -> _T: ... # pylint: disable=signature-differs + + @typing.overload + def pop(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs + + def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: + """ + Removes specified key and return the corresponding value. + :param str key: The key to pop. + :param any default: The value to return if key is not in the dictionary + :returns: The value corresponding to the key. + :rtype: any + :raises KeyError: If key is not found and default is not given. + """ + if default is _UNSET: + return self._data.pop(key) + return self._data.pop(key, default) + + def popitem(self) -> typing.Tuple[str, typing.Any]: + """ + Removes and returns some (key, value) pair + :returns: The (key, value) pair. + :rtype: tuple + :raises KeyError: if D is empty. + """ + return self._data.popitem() + + def clear(self) -> None: + """ + Remove all items from D. + """ + self._data.clear() + + def update(self, *args: typing.Any, **kwargs: typing.Any) -> None: # pylint: disable=arguments-differ + """ + Updates D from mapping/iterable E and F. + :param any args: Either a mapping object or an iterable of key-value pairs. + """ + self._data.update(*args, **kwargs) + + @typing.overload + def setdefault(self, key: str, default: None = None) -> None: ... + + @typing.overload + def setdefault(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs + + def setdefault(self, key: str, default: typing.Any = _UNSET) -> typing.Any: + """ + Same as calling D.get(k, d), and setting D[k]=d if k not found + :param str key: The key to look up. + :param any default: The value to set if key is not in the dictionary + :returns: D[k] if k in D, else d. + :rtype: any + """ + if default is _UNSET: + return self._data.setdefault(key) + return self._data.setdefault(key, default) + + def __eq__(self, other: typing.Any) -> bool: + try: + other_model = self.__class__(other) + except Exception: + return False + return self._data == other_model._data + + def __repr__(self) -> str: + return str(self._data) + + +def _is_model(obj: typing.Any) -> bool: + return getattr(obj, "_is_model", False) + + +def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-many-return-statements + if isinstance(o, list): + return [_serialize(x, format) for x in o] + if isinstance(o, dict): + return {k: _serialize(v, format) for k, v in o.items()} + if isinstance(o, set): + return {_serialize(x, format) for x in o} + if isinstance(o, tuple): + return tuple(_serialize(x, format) for x in o) + if isinstance(o, (bytes, bytearray)): + return _serialize_bytes(o, format) + if isinstance(o, decimal.Decimal): + return float(o) + if isinstance(o, enum.Enum): + return o.value + if isinstance(o, int): + if format == "str": + return str(o) + return o + try: + # First try datetime.datetime + return _serialize_datetime(o, format) + except AttributeError: + pass + # Last, try datetime.timedelta + try: + return _timedelta_as_isostr(o) + except AttributeError: + # This will be raised when it hits value.total_seconds in the method above + pass + return o + + +def _get_rest_field( + attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str +) -> typing.Optional["_RestField"]: + try: + return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) + except StopIteration: + return None + + +def _create_value(rf: typing.Optional["_RestField"], value: typing.Any) -> typing.Any: + if not rf: + return _serialize(value, None) + if rf._is_multipart_file_input: + return value + if rf._is_model: + return _deserialize(rf._type, value) + if isinstance(value, ET.Element): + value = _deserialize(rf._type, value) + return _serialize(value, rf._format) + + +class Model(_MyMutableMapping): + _is_model = True + # label whether current class's _attr_to_rest_field has been calculated + # could not see _attr_to_rest_field directly because subclass inherits it from parent class + _calculated: typing.Set[str] = set() + + def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: + class_name = self.__class__.__name__ + if len(args) > 1: + raise TypeError(f"{class_name}.__init__() takes 2 positional arguments but {len(args) + 1} were given") + dict_to_pass = { + rest_field._rest_name: rest_field._default + for rest_field in self._attr_to_rest_field.values() + if rest_field._default is not _UNSET + } + if args: # pylint: disable=too-many-nested-blocks + if isinstance(args[0], ET.Element): + existed_attr_keys = [] + model_meta = getattr(self, "_xml", {}) + + for rf in self._attr_to_rest_field.values(): + prop_meta = getattr(rf, "_xml", {}) + xml_name = prop_meta.get("name", rf._rest_name) + xml_ns = prop_meta.get("ns", model_meta.get("ns", None)) + if xml_ns: + xml_name = "{" + xml_ns + "}" + xml_name + + # attribute + if prop_meta.get("attribute", False) and args[0].get(xml_name) is not None: + existed_attr_keys.append(xml_name) + dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].get(xml_name)) + continue + + # unwrapped element is array + if prop_meta.get("unwrapped", False): + # unwrapped array could either use prop items meta/prop meta + if prop_meta.get("itemsName"): + xml_name = prop_meta.get("itemsName") + xml_ns = prop_meta.get("itemNs") + if xml_ns: + xml_name = "{" + xml_ns + "}" + xml_name + items = args[0].findall(xml_name) # pyright: ignore + if len(items) > 0: + existed_attr_keys.append(xml_name) + dict_to_pass[rf._rest_name] = _deserialize(rf._type, items) + continue + + # text element is primitive type + if prop_meta.get("text", False): + if args[0].text is not None: + dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].text) + continue + + # wrapped element could be normal property or array, it should only have one element + item = args[0].find(xml_name) + if item is not None: + existed_attr_keys.append(xml_name) + dict_to_pass[rf._rest_name] = _deserialize(rf._type, item) + + # rest thing is additional properties + for e in args[0]: + if e.tag not in existed_attr_keys: + dict_to_pass[e.tag] = _convert_element(e) + else: + dict_to_pass.update( + {k: _create_value(_get_rest_field(self._attr_to_rest_field, k), v) for k, v in args[0].items()} + ) + else: + non_attr_kwargs = [k for k in kwargs if k not in self._attr_to_rest_field] + if non_attr_kwargs: + # actual type errors only throw the first wrong keyword arg they see, so following that. + raise TypeError(f"{class_name}.__init__() got an unexpected keyword argument '{non_attr_kwargs[0]}'") + dict_to_pass.update( + { + self._attr_to_rest_field[k]._rest_name: _create_value(self._attr_to_rest_field[k], v) + for k, v in kwargs.items() + if v is not None + } + ) + super().__init__(dict_to_pass) + + def copy(self) -> "Model": + return Model(self.__dict__) + + def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: + if f"{cls.__module__}.{cls.__qualname__}" not in cls._calculated: + # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', + # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' + mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order + attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") + } + annotations = { + k: v + for mro_class in mros + if hasattr(mro_class, "__annotations__") + for k, v in mro_class.__annotations__.items() + } + for attr, rf in attr_to_rest_field.items(): + rf._module = cls.__module__ + if not rf._type: + rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) + if not rf._rest_name_input: + rf._rest_name_input = attr + cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") + + return super().__new__(cls) + + def __init_subclass__(cls, discriminator: typing.Optional[str] = None) -> None: + for base in cls.__bases__: + if hasattr(base, "__mapping__"): + base.__mapping__[discriminator or cls.__name__] = cls # type: ignore + + @classmethod + def _get_discriminator(cls, exist_discriminators) -> typing.Optional["_RestField"]: + for v in cls.__dict__.values(): + if isinstance(v, _RestField) and v._is_discriminator and v._rest_name not in exist_discriminators: + return v + return None + + @classmethod + def _deserialize(cls, data, exist_discriminators): + if not hasattr(cls, "__mapping__"): + return cls(data) + discriminator = cls._get_discriminator(exist_discriminators) + if discriminator is None: + return cls(data) + exist_discriminators.append(discriminator._rest_name) + if isinstance(data, ET.Element): + model_meta = getattr(cls, "_xml", {}) + prop_meta = getattr(discriminator, "_xml", {}) + xml_name = prop_meta.get("name", discriminator._rest_name) + xml_ns = prop_meta.get("ns", model_meta.get("ns", None)) + if xml_ns: + xml_name = "{" + xml_ns + "}" + xml_name + + if data.get(xml_name) is not None: + discriminator_value = data.get(xml_name) + else: + discriminator_value = data.find(xml_name).text # pyright: ignore + else: + discriminator_value = data.get(discriminator._rest_name) + mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member + return mapped_cls._deserialize(data, exist_discriminators) + + def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + """Return a dict that can be turned into json using json.dump. + + :keyword bool exclude_readonly: Whether to remove the readonly properties. + :returns: A dict JSON compatible object + :rtype: dict + """ + + result = {} + readonly_props = [] + if exclude_readonly: + readonly_props = [p._rest_name for p in self._attr_to_rest_field.values() if _is_readonly(p)] + for k, v in self.items(): + if exclude_readonly and k in readonly_props: # pyright: ignore + continue + is_multipart_file_input = False + try: + is_multipart_file_input = next( + rf for rf in self._attr_to_rest_field.values() if rf._rest_name == k + )._is_multipart_file_input + except StopIteration: + pass + result[k] = v if is_multipart_file_input else Model._as_dict_value(v, exclude_readonly=exclude_readonly) + return result + + @staticmethod + def _as_dict_value(v: typing.Any, exclude_readonly: bool = False) -> typing.Any: + if v is None or isinstance(v, _Null): + return None + if isinstance(v, (list, tuple, set)): + return type(v)(Model._as_dict_value(x, exclude_readonly=exclude_readonly) for x in v) + if isinstance(v, dict): + return {dk: Model._as_dict_value(dv, exclude_readonly=exclude_readonly) for dk, dv in v.items()} + return v.as_dict(exclude_readonly=exclude_readonly) if hasattr(v, "as_dict") else v + + +def _deserialize_model(model_deserializer: typing.Optional[typing.Callable], obj): + if _is_model(obj): + return obj + return _deserialize(model_deserializer, obj) + + +def _deserialize_with_optional(if_obj_deserializer: typing.Optional[typing.Callable], obj): + if obj is None: + return obj + return _deserialize_with_callable(if_obj_deserializer, obj) + + +def _deserialize_with_union(deserializers, obj): + for deserializer in deserializers: + try: + return _deserialize(deserializer, obj) + except DeserializationError: + pass + raise DeserializationError() + + +def _deserialize_dict( + value_deserializer: typing.Optional[typing.Callable], + module: typing.Optional[str], + obj: typing.Dict[typing.Any, typing.Any], +): + if obj is None: + return obj + if isinstance(obj, ET.Element): + obj = {child.tag: child for child in obj} + return {k: _deserialize(value_deserializer, v, module) for k, v in obj.items()} + + +def _deserialize_multiple_sequence( + entry_deserializers: typing.List[typing.Optional[typing.Callable]], + module: typing.Optional[str], + obj, +): + if obj is None: + return obj + return type(obj)(_deserialize(deserializer, entry, module) for entry, deserializer in zip(obj, entry_deserializers)) + + +def _deserialize_sequence( + deserializer: typing.Optional[typing.Callable], + module: typing.Optional[str], + obj, +): + if obj is None: + return obj + if isinstance(obj, ET.Element): + obj = list(obj) + return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) + + +def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: + return sorted( + types, + key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), + ) + + +def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-return-statements, too-many-branches + annotation: typing.Any, + module: typing.Optional[str], + rf: typing.Optional["_RestField"] = None, +) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]: + if not annotation: + return None + + # is it a type alias? + if isinstance(annotation, str): + if module is not None: + annotation = _get_type_alias_type(module, annotation) + + # is it a forward ref / in quotes? + if isinstance(annotation, (str, typing.ForwardRef)): + try: + model_name = annotation.__forward_arg__ # type: ignore + except AttributeError: + model_name = annotation + if module is not None: + annotation = _get_model(module, model_name) # type: ignore + + try: + if module and _is_model(annotation): + if rf: + rf._is_model = True + + return functools.partial(_deserialize_model, annotation) # pyright: ignore + except Exception: + pass + + # is it a literal? + try: + if annotation.__origin__ is typing.Literal: # pyright: ignore + return None + except AttributeError: + pass + + # is it optional? + try: + if any(a for a in annotation.__args__ if a == type(None)): # pyright: ignore + if len(annotation.__args__) <= 2: # pyright: ignore + if_obj_deserializer = _get_deserialize_callable_from_annotation( + next(a for a in annotation.__args__ if a != type(None)), module, rf # pyright: ignore + ) + + return functools.partial(_deserialize_with_optional, if_obj_deserializer) + # the type is Optional[Union[...]], we need to remove the None type from the Union + annotation_copy = copy.copy(annotation) + annotation_copy.__args__ = [a for a in annotation_copy.__args__ if a != type(None)] # pyright: ignore + return _get_deserialize_callable_from_annotation(annotation_copy, module, rf) + except AttributeError: + pass + + # is it union? + if getattr(annotation, "__origin__", None) is typing.Union: + # initial ordering is we make `string` the last deserialization option, because it is often them most generic + deserializers = [ + _get_deserialize_callable_from_annotation(arg, module, rf) + for arg in _sorted_annotations(annotation.__args__) # pyright: ignore + ] + + return functools.partial(_deserialize_with_union, deserializers) + + try: + if annotation._name == "Dict": # pyright: ignore + value_deserializer = _get_deserialize_callable_from_annotation( + annotation.__args__[1], module, rf # pyright: ignore + ) + + return functools.partial( + _deserialize_dict, + value_deserializer, + module, + ) + except (AttributeError, IndexError): + pass + try: + if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if len(annotation.__args__) > 1: # pyright: ignore + entry_deserializers = [ + _get_deserialize_callable_from_annotation(dt, module, rf) + for dt in annotation.__args__ # pyright: ignore + ] + return functools.partial(_deserialize_multiple_sequence, entry_deserializers, module) + deserializer = _get_deserialize_callable_from_annotation( + annotation.__args__[0], module, rf # pyright: ignore + ) + + return functools.partial(_deserialize_sequence, deserializer, module) + except (TypeError, IndexError, AttributeError, SyntaxError): + pass + + def _deserialize_default( + deserializer, + obj, + ): + if obj is None: + return obj + try: + return _deserialize_with_callable(deserializer, obj) + except Exception: + pass + return obj + + if get_deserializer(annotation, rf): + return functools.partial(_deserialize_default, get_deserializer(annotation, rf)) + + return functools.partial(_deserialize_default, annotation) + + +def _deserialize_with_callable( + deserializer: typing.Optional[typing.Callable[[typing.Any], typing.Any]], + value: typing.Any, +): # pylint: disable=too-many-return-statements + try: + if value is None or isinstance(value, _Null): + return None + if isinstance(value, ET.Element): + if deserializer is str: + return value.text or "" + if deserializer is int: + return int(value.text) if value.text else None + if deserializer is float: + return float(value.text) if value.text else None + if deserializer is bool: + return value.text == "true" if value.text else None + if deserializer is None: + return value + if deserializer in [int, float, bool]: + return deserializer(value) + if isinstance(deserializer, CaseInsensitiveEnumMeta): + try: + return deserializer(value) + except ValueError: + # for unknown value, return raw value + return value + if isinstance(deserializer, type) and issubclass(deserializer, Model): + return deserializer._deserialize(value, []) + return typing.cast(typing.Callable[[typing.Any], typing.Any], deserializer)(value) + except Exception as e: + raise DeserializationError() from e + + +def _deserialize( + deserializer: typing.Any, + value: typing.Any, + module: typing.Optional[str] = None, + rf: typing.Optional["_RestField"] = None, + format: typing.Optional[str] = None, +) -> typing.Any: + if isinstance(value, PipelineResponse): + value = value.http_response.json() + if rf is None and format: + rf = _RestField(format=format) + if not isinstance(deserializer, functools.partial): + deserializer = _get_deserialize_callable_from_annotation(deserializer, module, rf) + return _deserialize_with_callable(deserializer, value) + + +def _failsafe_deserialize( + deserializer: typing.Any, + value: typing.Any, + module: typing.Optional[str] = None, + rf: typing.Optional["_RestField"] = None, + format: typing.Optional[str] = None, +) -> typing.Any: + try: + return _deserialize(deserializer, value, module, rf, format) + except DeserializationError: + _LOGGER.warning( + "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True + ) + return None + + +def _failsafe_deserialize_xml( + deserializer: typing.Any, + value: typing.Any, +) -> typing.Any: + try: + return _deserialize_xml(deserializer, value) + except DeserializationError: + _LOGGER.warning( + "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True + ) + return None + + +class _RestField: + def __init__( + self, + *, + name: typing.Optional[str] = None, + type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin + is_discriminator: bool = False, + visibility: typing.Optional[typing.List[str]] = None, + default: typing.Any = _UNSET, + format: typing.Optional[str] = None, + is_multipart_file_input: bool = False, + xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + ): + self._type = type + self._rest_name_input = name + self._module: typing.Optional[str] = None + self._is_discriminator = is_discriminator + self._visibility = visibility + self._is_model = False + self._default = default + self._format = format + self._is_multipart_file_input = is_multipart_file_input + self._xml = xml if xml is not None else {} + + @property + def _class_type(self) -> typing.Any: + return getattr(self._type, "args", [None])[0] + + @property + def _rest_name(self) -> str: + if self._rest_name_input is None: + raise ValueError("Rest name was never set") + return self._rest_name_input + + def __get__(self, obj: Model, type=None): # pylint: disable=redefined-builtin + # by this point, type and rest_name will have a value bc we default + # them in __new__ of the Model class + item = obj.get(self._rest_name) + if item is None: + return item + if self._is_model: + return item + return _deserialize(self._type, _serialize(item, self._format), rf=self) + + def __set__(self, obj: Model, value) -> None: + if value is None: + # we want to wipe out entries if users set attr to None + try: + obj.__delitem__(self._rest_name) + except KeyError: + pass + return + if self._is_model: + if not _is_model(value): + value = _deserialize(self._type, value) + obj.__setitem__(self._rest_name, value) + return + obj.__setitem__(self._rest_name, _serialize(value, self._format)) + + def _get_deserialize_callable_from_annotation( + self, annotation: typing.Any + ) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]: + return _get_deserialize_callable_from_annotation(annotation, self._module, self) + + +def rest_field( + *, + name: typing.Optional[str] = None, + type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin + visibility: typing.Optional[typing.List[str]] = None, + default: typing.Any = _UNSET, + format: typing.Optional[str] = None, + is_multipart_file_input: bool = False, + xml: typing.Optional[typing.Dict[str, typing.Any]] = None, +) -> typing.Any: + return _RestField( + name=name, + type=type, + visibility=visibility, + default=default, + format=format, + is_multipart_file_input=is_multipart_file_input, + xml=xml, + ) + + +def rest_discriminator( + *, + name: typing.Optional[str] = None, + type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin + visibility: typing.Optional[typing.List[str]] = None, + xml: typing.Optional[typing.Dict[str, typing.Any]] = None, +) -> typing.Any: + return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) + + +def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: + """Serialize a model to XML. + + :param Model model: The model to serialize. + :param bool exclude_readonly: Whether to exclude readonly properties. + :returns: The XML representation of the model. + :rtype: str + """ + return ET.tostring(_get_element(model, exclude_readonly), encoding="unicode") # type: ignore + + +def _get_element( + o: typing.Any, + exclude_readonly: bool = False, + parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + wrapped_element: typing.Optional[ET.Element] = None, +) -> typing.Union[ET.Element, typing.List[ET.Element]]: + if _is_model(o): + model_meta = getattr(o, "_xml", {}) + + # if prop is a model, then use the prop element directly, else generate a wrapper of model + if wrapped_element is None: + wrapped_element = _create_xml_element( + model_meta.get("name", o.__class__.__name__), + model_meta.get("prefix"), + model_meta.get("ns"), + ) + + readonly_props = [] + if exclude_readonly: + readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)] + + for k, v in o.items(): + # do not serialize readonly properties + if exclude_readonly and k in readonly_props: + continue + + prop_rest_field = _get_rest_field(o._attr_to_rest_field, k) + if prop_rest_field: + prop_meta = getattr(prop_rest_field, "_xml").copy() + # use the wire name as xml name if no specific name is set + if prop_meta.get("name") is None: + prop_meta["name"] = k + else: + # additional properties will not have rest field, use the wire name as xml name + prop_meta = {"name": k} + + # if no ns for prop, use model's + if prop_meta.get("ns") is None and model_meta.get("ns"): + prop_meta["ns"] = model_meta.get("ns") + prop_meta["prefix"] = model_meta.get("prefix") + + if prop_meta.get("unwrapped", False): + # unwrapped could only set on array + wrapped_element.extend(_get_element(v, exclude_readonly, prop_meta)) + elif prop_meta.get("text", False): + # text could only set on primitive type + wrapped_element.text = _get_primitive_type_value(v) + elif prop_meta.get("attribute", False): + xml_name = prop_meta.get("name", k) + if prop_meta.get("ns"): + ET.register_namespace(prop_meta.get("prefix"), prop_meta.get("ns")) # pyright: ignore + xml_name = "{" + prop_meta.get("ns") + "}" + xml_name # pyright: ignore + # attribute should be primitive type + wrapped_element.set(xml_name, _get_primitive_type_value(v)) + else: + # other wrapped prop element + wrapped_element.append(_get_wrapped_element(v, exclude_readonly, prop_meta)) + return wrapped_element + if isinstance(o, list): + return [_get_element(x, exclude_readonly, parent_meta) for x in o] # type: ignore + if isinstance(o, dict): + result = [] + for k, v in o.items(): + result.append( + _get_wrapped_element( + v, + exclude_readonly, + { + "name": k, + "ns": parent_meta.get("ns") if parent_meta else None, + "prefix": parent_meta.get("prefix") if parent_meta else None, + }, + ) + ) + return result + + # primitive case need to create element based on parent_meta + if parent_meta: + return _get_wrapped_element( + o, + exclude_readonly, + { + "name": parent_meta.get("itemsName", parent_meta.get("name")), + "prefix": parent_meta.get("itemsPrefix", parent_meta.get("prefix")), + "ns": parent_meta.get("itemsNs", parent_meta.get("ns")), + }, + ) + + raise ValueError("Could not serialize value into xml: " + o) + + +def _get_wrapped_element( + v: typing.Any, + exclude_readonly: bool, + meta: typing.Optional[typing.Dict[str, typing.Any]], +) -> ET.Element: + wrapped_element = _create_xml_element( + meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None + ) + if isinstance(v, (dict, list)): + wrapped_element.extend(_get_element(v, exclude_readonly, meta)) + elif _is_model(v): + _get_element(v, exclude_readonly, meta, wrapped_element) + else: + wrapped_element.text = _get_primitive_type_value(v) + return wrapped_element + + +def _get_primitive_type_value(v) -> str: + if v is True: + return "true" + if v is False: + return "false" + if isinstance(v, _Null): + return "" + return str(v) + + +def _create_xml_element(tag, prefix=None, ns=None): + if prefix and ns: + ET.register_namespace(prefix, ns) + if ns: + return ET.Element("{" + ns + "}" + tag) + return ET.Element(tag) + + +def _deserialize_xml( + deserializer: typing.Any, + value: str, +) -> typing.Any: + element = ET.fromstring(value) # nosec + return _deserialize(deserializer, element) + + +def _convert_element(e: ET.Element): + # dict case + if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: + dict_result: typing.Dict[str, typing.Any] = {} + for child in e: + if dict_result.get(child.tag) is not None: + if isinstance(dict_result[child.tag], list): + dict_result[child.tag].append(_convert_element(child)) + else: + dict_result[child.tag] = [dict_result[child.tag], _convert_element(child)] + else: + dict_result[child.tag] = _convert_element(child) + dict_result.update(e.attrib) + return dict_result + # array case + if len(e) > 0: + array_result: typing.List[typing.Any] = [] + for child in e: + array_result.append(_convert_element(child)) + return array_result + # primitive case + return e.text diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/serialization.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/serialization.py new file mode 100644 index 00000000000..99f537b5eb6 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/serialization.py @@ -0,0 +1,2026 @@ +# pylint: disable=line-too-long,useless-suppression,too-many-lines +# coding=utf-8 + +# pyright: reportUnnecessaryTypeIgnoreComment=false + +from base64 import b64decode, b64encode +import calendar +import datetime +import decimal +import email +from enum import Enum +import json +import logging +import re +import sys +import codecs +from typing import ( + Dict, + Any, + cast, + Optional, + Union, + AnyStr, + IO, + Mapping, + Callable, + MutableMapping, + List, +) + +try: + from urllib import quote # type: ignore +except ImportError: + from urllib.parse import quote +import xml.etree.ElementTree as ET + +import isodate # type: ignore +from typing_extensions import Self + +from corehttp.exceptions import DeserializationError, SerializationError +from corehttp.serialization import NULL as CoreNull + +_BOM = codecs.BOM_UTF8.decode(encoding="utf-8") + +JSON = MutableMapping[str, Any] + + +class RawDeserializer: + + # Accept "text" because we're open minded people... + JSON_REGEXP = re.compile(r"^(application|text)/([a-z+.]+\+)?json$") + + # Name used in context + CONTEXT_NAME = "deserialized_data" + + @classmethod + def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type: Optional[str] = None) -> Any: + """Decode data according to content-type. + + Accept a stream of data as well, but will be load at once in memory for now. + + If no content-type, will return the string version (not bytes, not stream) + + :param data: Input, could be bytes or stream (will be decoded with UTF8) or text + :type data: str or bytes or IO + :param str content_type: The content type. + :return: The deserialized data. + :rtype: object + """ + if hasattr(data, "read"): + # Assume a stream + data = cast(IO, data).read() + + if isinstance(data, bytes): + data_as_str = data.decode(encoding="utf-8-sig") + else: + # Explain to mypy the correct type. + data_as_str = cast(str, data) + + # Remove Byte Order Mark if present in string + data_as_str = data_as_str.lstrip(_BOM) + + if content_type is None: + return data + + if cls.JSON_REGEXP.match(content_type): + try: + return json.loads(data_as_str) + except ValueError as err: + raise DeserializationError("JSON is invalid: {}".format(err), err) from err + elif "xml" in (content_type or []): + try: + + try: + if isinstance(data, unicode): # type: ignore + # If I'm Python 2.7 and unicode XML will scream if I try a "fromstring" on unicode string + data_as_str = data_as_str.encode(encoding="utf-8") # type: ignore + except NameError: + pass + + return ET.fromstring(data_as_str) # nosec + except ET.ParseError as err: + # It might be because the server has an issue, and returned JSON with + # content-type XML.... + # So let's try a JSON load, and if it's still broken + # let's flow the initial exception + def _json_attemp(data): + try: + return True, json.loads(data) + except ValueError: + return False, None # Don't care about this one + + success, json_result = _json_attemp(data) + if success: + return json_result + # If i'm here, it's not JSON, it's not XML, let's scream + # and raise the last context in this block (the XML exception) + # The function hack is because Py2.7 messes up with exception + # context otherwise. + _LOGGER.critical("Wasn't XML not JSON, failing") + raise DeserializationError("XML is invalid") from err + elif content_type.startswith("text/"): + return data_as_str + raise DeserializationError("Cannot deserialize content-type: {}".format(content_type)) + + @classmethod + def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], headers: Mapping) -> Any: + """Deserialize from HTTP response. + + Use bytes and headers to NOT use any requests/aiohttp or whatever + specific implementation. + Headers will tested for "content-type" + + :param bytes body_bytes: The body of the response. + :param dict headers: The headers of the response. + :returns: The deserialized data. + :rtype: object + """ + # Try to use content-type from headers if available + content_type = None + if "content-type" in headers: + content_type = headers["content-type"].split(";")[0].strip().lower() + # Ouch, this server did not declare what it sent... + # Let's guess it's JSON... + # Also, since Autorest was considering that an empty body was a valid JSON, + # need that test as well.... + else: + content_type = "application/json" + + if body_bytes: + return cls.deserialize_from_text(body_bytes, content_type) + return None + + +_LOGGER = logging.getLogger(__name__) + +try: + _long_type = long # type: ignore +except NameError: + _long_type = int + +TZ_UTC = datetime.timezone.utc + +_FLATTEN = re.compile(r"(? None: + self.additional_properties: Optional[Dict[str, Any]] = {} + for k in kwargs: # pylint: disable=consider-using-dict-items + if k not in self._attribute_map: + _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) + elif k in self._validation and self._validation[k].get("readonly", False): + _LOGGER.warning("Readonly attribute %s will be ignored in class %s", k, self.__class__) + else: + setattr(self, k, kwargs[k]) + + def __eq__(self, other: Any) -> bool: + """Compare objects by comparing all attributes. + + :param object other: The object to compare + :returns: True if objects are equal + :rtype: bool + """ + if isinstance(other, self.__class__): + return self.__dict__ == other.__dict__ + return False + + def __ne__(self, other: Any) -> bool: + """Compare objects by comparing all attributes. + + :param object other: The object to compare + :returns: True if objects are not equal + :rtype: bool + """ + return not self.__eq__(other) + + def __str__(self) -> str: + return str(self.__dict__) + + @classmethod + def enable_additional_properties_sending(cls) -> None: + cls._attribute_map["additional_properties"] = {"key": "", "type": "{object}"} + + @classmethod + def is_xml_model(cls) -> bool: + try: + cls._xml_map # type: ignore + except AttributeError: + return False + return True + + @classmethod + def _create_xml_node(cls): + """Create XML node. + + :returns: The XML node + :rtype: xml.etree.ElementTree.Element + """ + try: + xml_map = cls._xml_map # type: ignore + except AttributeError: + xml_map = {} + + return _create_xml_node(xml_map.get("name", cls.__name__), xml_map.get("prefix", None), xml_map.get("ns", None)) + + def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: + """Return the JSON that would be sent to server from this model. + + This is an alias to `as_dict(full_restapi_key_transformer, keep_readonly=False)`. + + If you want XML serialization, you can pass the kwargs is_xml=True. + + :param bool keep_readonly: If you want to serialize the readonly attributes + :returns: A dict JSON compatible object + :rtype: dict + """ + serializer = Serializer(self._infer_class_models()) + return serializer._serialize( # type: ignore # pylint: disable=protected-access + self, keep_readonly=keep_readonly, **kwargs + ) + + def as_dict( + self, + keep_readonly: bool = True, + key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + **kwargs: Any + ) -> JSON: + """Return a dict that can be serialized using json.dump. + + Advanced usage might optionally use a callback as parameter: + + .. code::python + + def my_key_transformer(key, attr_desc, value): + return key + + Key is the attribute name used in Python. Attr_desc + is a dict of metadata. Currently contains 'type' with the + msrest type and 'key' with the RestAPI encoded key. + Value is the current value in this object. + + The string returned will be used to serialize the key. + If the return type is a list, this is considered hierarchical + result dict. + + See the three examples in this file: + + - attribute_transformer + - full_restapi_key_transformer + - last_restapi_key_transformer + + If you want XML serialization, you can pass the kwargs is_xml=True. + + :param bool keep_readonly: If you want to serialize the readonly attributes + :param function key_transformer: A key transformer function. + :returns: A dict JSON compatible object + :rtype: dict + """ + serializer = Serializer(self._infer_class_models()) + return serializer._serialize( # type: ignore # pylint: disable=protected-access + self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs + ) + + @classmethod + def _infer_class_models(cls): + try: + str_models = cls.__module__.rsplit(".", 1)[0] + models = sys.modules[str_models] + client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} + if cls.__name__ not in client_models: + raise ValueError("Not Autorest generated code") + except Exception: # pylint: disable=broad-exception-caught + # Assume it's not Autorest generated (tests?). Add ourselves as dependencies. + client_models = {cls.__name__: cls} + return client_models + + @classmethod + def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: + """Parse a str using the RestAPI syntax and return a model. + + :param str data: A str using RestAPI structure. JSON by default. + :param str content_type: JSON by default, set application/xml if XML. + :returns: An instance of this model + :raises DeserializationError: if something went wrong + :rtype: Self + """ + deserializer = Deserializer(cls._infer_class_models()) + return deserializer(cls.__name__, data, content_type=content_type) # type: ignore + + @classmethod + def from_dict( + cls, + data: Any, + key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + content_type: Optional[str] = None, + ) -> Self: + """Parse a dict using given key extractor return a model. + + By default consider key + extractors (rest_key_case_insensitive_extractor, attribute_key_case_insensitive_extractor + and last_rest_key_case_insensitive_extractor) + + :param dict data: A dict using RestAPI structure + :param function key_extractors: A key extractor function. + :param str content_type: JSON by default, set application/xml if XML. + :returns: An instance of this model + :raises DeserializationError: if something went wrong + :rtype: Self + """ + deserializer = Deserializer(cls._infer_class_models()) + deserializer.key_extractors = ( # type: ignore + [ # type: ignore + attribute_key_case_insensitive_extractor, + rest_key_case_insensitive_extractor, + last_rest_key_case_insensitive_extractor, + ] + if key_extractors is None + else key_extractors + ) + return deserializer(cls.__name__, data, content_type=content_type) # type: ignore + + @classmethod + def _flatten_subtype(cls, key, objects): + if "_subtype_map" not in cls.__dict__: + return {} + result = dict(cls._subtype_map[key]) + for valuetype in cls._subtype_map[key].values(): + result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + return result + + @classmethod + def _classify(cls, response, objects): + """Check the class _subtype_map for any child classes. + We want to ignore any inherited _subtype_maps. + + :param dict response: The initial data + :param dict objects: The class objects + :returns: The class to be used + :rtype: class + """ + for subtype_key in cls.__dict__.get("_subtype_map", {}).keys(): + subtype_value = None + + if not isinstance(response, ET.Element): + rest_api_response_key = cls._get_rest_key_parts(subtype_key)[-1] + subtype_value = response.get(rest_api_response_key, None) or response.get(subtype_key, None) + else: + subtype_value = xml_key_extractor(subtype_key, cls._attribute_map[subtype_key], response) + if subtype_value: + # Try to match base class. Can be class name only + # (bug to fix in Autorest to support x-ms-discriminator-name) + if cls.__name__ == subtype_value: + return cls + flatten_mapping_type = cls._flatten_subtype(subtype_key, objects) + try: + return objects[flatten_mapping_type[subtype_value]] # type: ignore + except KeyError: + _LOGGER.warning( + "Subtype value %s has no mapping, use base class %s.", + subtype_value, + cls.__name__, + ) + break + else: + _LOGGER.warning("Discriminator %s is absent or null, use base class %s.", subtype_key, cls.__name__) + break + return cls + + @classmethod + def _get_rest_key_parts(cls, attr_key): + """Get the RestAPI key of this attr, split it and decode part + :param str attr_key: Attribute key must be in attribute_map. + :returns: A list of RestAPI part + :rtype: list + """ + rest_split_key = _FLATTEN.split(cls._attribute_map[attr_key]["key"]) + return [_decode_attribute_map_key(key_part) for key_part in rest_split_key] + + +def _decode_attribute_map_key(key): + """This decode a key in an _attribute_map to the actual key we want to look at + inside the received data. + + :param str key: A key string from the generated code + :returns: The decoded key + :rtype: str + """ + return key.replace("\\.", ".") + + +class Serializer: # pylint: disable=too-many-public-methods + """Request object model serializer.""" + + basic_types = {str: "str", int: "int", bool: "bool", float: "float"} + + _xml_basic_types_serializers = {"bool": lambda x: str(x).lower()} + days = {0: "Mon", 1: "Tue", 2: "Wed", 3: "Thu", 4: "Fri", 5: "Sat", 6: "Sun"} + months = { + 1: "Jan", + 2: "Feb", + 3: "Mar", + 4: "Apr", + 5: "May", + 6: "Jun", + 7: "Jul", + 8: "Aug", + 9: "Sep", + 10: "Oct", + 11: "Nov", + 12: "Dec", + } + validation = { + "min_length": lambda x, y: len(x) < y, + "max_length": lambda x, y: len(x) > y, + "minimum": lambda x, y: x < y, + "maximum": lambda x, y: x > y, + "minimum_ex": lambda x, y: x <= y, + "maximum_ex": lambda x, y: x >= y, + "min_items": lambda x, y: len(x) < y, + "max_items": lambda x, y: len(x) > y, + "pattern": lambda x, y: not re.match(y, x, re.UNICODE), + "unique": lambda x, y: len(x) != len(set(x)), + "multiple": lambda x, y: x % y != 0, + } + + def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: + self.serialize_type = { + "iso-8601": Serializer.serialize_iso, + "rfc-1123": Serializer.serialize_rfc, + "unix-time": Serializer.serialize_unix, + "duration": Serializer.serialize_duration, + "date": Serializer.serialize_date, + "time": Serializer.serialize_time, + "decimal": Serializer.serialize_decimal, + "long": Serializer.serialize_long, + "bytearray": Serializer.serialize_bytearray, + "base64": Serializer.serialize_base64, + "object": self.serialize_object, + "[]": self.serialize_iter, + "{}": self.serialize_dict, + } + self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.key_transformer = full_restapi_key_transformer + self.client_side_validation = True + + def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, too-many-statements, too-many-locals + self, target_obj, data_type=None, **kwargs + ): + """Serialize data into a string according to type. + + :param object target_obj: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str, dict + :raises SerializationError: if serialization fails. + :returns: The serialized data. + """ + key_transformer = kwargs.get("key_transformer", self.key_transformer) + keep_readonly = kwargs.get("keep_readonly", False) + if target_obj is None: + return None + + attr_name = None + class_name = target_obj.__class__.__name__ + + if data_type: + return self.serialize_data(target_obj, data_type, **kwargs) + + if not hasattr(target_obj, "_attribute_map"): + data_type = type(target_obj).__name__ + if data_type in self.basic_types.values(): + return self.serialize_data(target_obj, data_type, **kwargs) + + # Force "is_xml" kwargs if we detect a XML model + try: + is_xml_model_serialization = kwargs["is_xml"] + except KeyError: + is_xml_model_serialization = kwargs.setdefault("is_xml", target_obj.is_xml_model()) + + serialized = {} + if is_xml_model_serialization: + serialized = target_obj._create_xml_node() # pylint: disable=protected-access + try: + attributes = target_obj._attribute_map # pylint: disable=protected-access + for attr, attr_desc in attributes.items(): + attr_name = attr + if not keep_readonly and target_obj._validation.get( # pylint: disable=protected-access + attr_name, {} + ).get("readonly", False): + continue + + if attr_name == "additional_properties" and attr_desc["key"] == "": + if target_obj.additional_properties is not None: + serialized.update(target_obj.additional_properties) + continue + try: + + orig_attr = getattr(target_obj, attr) + if is_xml_model_serialization: + pass # Don't provide "transformer" for XML for now. Keep "orig_attr" + else: # JSON + keys, orig_attr = key_transformer(attr, attr_desc.copy(), orig_attr) + keys = keys if isinstance(keys, list) else [keys] + + kwargs["serialization_ctxt"] = attr_desc + new_attr = self.serialize_data(orig_attr, attr_desc["type"], **kwargs) + + if is_xml_model_serialization: + xml_desc = attr_desc.get("xml", {}) + xml_name = xml_desc.get("name", attr_desc["key"]) + xml_prefix = xml_desc.get("prefix", None) + xml_ns = xml_desc.get("ns", None) + if xml_desc.get("attr", False): + if xml_ns: + ET.register_namespace(xml_prefix, xml_ns) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) + serialized.set(xml_name, new_attr) # type: ignore + continue + if xml_desc.get("text", False): + serialized.text = new_attr # type: ignore + continue + if isinstance(new_attr, list): + serialized.extend(new_attr) # type: ignore + elif isinstance(new_attr, ET.Element): + # If the down XML has no XML/Name, + # we MUST replace the tag with the local tag. But keeping the namespaces. + if "name" not in getattr(orig_attr, "_xml_map", {}): + splitted_tag = new_attr.tag.split("}") + if len(splitted_tag) == 2: # Namespace + new_attr.tag = "}".join([splitted_tag[0], xml_name]) + else: + new_attr.tag = xml_name + serialized.append(new_attr) # type: ignore + else: # That's a basic type + # Integrate namespace if necessary + local_node = _create_xml_node(xml_name, xml_prefix, xml_ns) + local_node.text = str(new_attr) + serialized.append(local_node) # type: ignore + else: # JSON + for k in reversed(keys): # type: ignore + new_attr = {k: new_attr} + + _new_attr = new_attr + _serialized = serialized + for k in keys: # type: ignore + if k not in _serialized: + _serialized.update(_new_attr) # type: ignore + _new_attr = _new_attr[k] # type: ignore + _serialized = _serialized[k] + except ValueError as err: + if isinstance(err, SerializationError): + raise + + except (AttributeError, KeyError, TypeError) as err: + msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj)) + raise SerializationError(msg) from err + return serialized + + def body(self, data, data_type, **kwargs): + """Serialize data intended for a request body. + + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: dict + :raises SerializationError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized request body + """ + + # Just in case this is a dict + internal_data_type_str = data_type.strip("[]{}") + internal_data_type = self.dependencies.get(internal_data_type_str, None) + try: + is_xml_model_serialization = kwargs["is_xml"] + except KeyError: + if internal_data_type and issubclass(internal_data_type, Model): + is_xml_model_serialization = kwargs.setdefault("is_xml", internal_data_type.is_xml_model()) + else: + is_xml_model_serialization = False + if internal_data_type and not isinstance(internal_data_type, Enum): + try: + deserializer = Deserializer(self.dependencies) + # Since it's on serialization, it's almost sure that format is not JSON REST + # We're not able to deal with additional properties for now. + deserializer.additional_properties_detection = False + if is_xml_model_serialization: + deserializer.key_extractors = [ # type: ignore + attribute_key_case_insensitive_extractor, + ] + else: + deserializer.key_extractors = [ + rest_key_case_insensitive_extractor, + attribute_key_case_insensitive_extractor, + last_rest_key_case_insensitive_extractor, + ] + data = deserializer._deserialize(data_type, data) # pylint: disable=protected-access + except DeserializationError as err: + raise SerializationError("Unable to build a model: " + str(err)) from err + + return self._serialize(data, data_type, **kwargs) + + def url(self, name, data, data_type, **kwargs): + """Serialize data intended for a URL path. + + :param str name: The name of the URL path parameter. + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str + :returns: The serialized URL path + :raises TypeError: if serialization fails. + :raises ValueError: if data is None + """ + try: + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + + if kwargs.get("skip_quote") is True: + output = str(output) + output = output.replace("{", quote("{")).replace("}", quote("}")) + else: + output = quote(str(output), safe="") + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return output + + def query(self, name, data, data_type, **kwargs): + """Serialize data intended for a URL query. + + :param str name: The name of the query parameter. + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str, list + :raises TypeError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized query parameter + """ + try: + # Treat the list aside, since we don't want to encode the div separator + if data_type.startswith("["): + internal_data_type = data_type[1:-1] + do_quote = not kwargs.get("skip_quote", False) + return self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs) + + # Not a list, regular serialization + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + if kwargs.get("skip_quote") is True: + output = str(output) + else: + output = quote(str(output), safe="") + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return str(output) + + def header(self, name, data, data_type, **kwargs): + """Serialize data intended for a request header. + + :param str name: The name of the header. + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str + :raises TypeError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized header + """ + try: + if data_type in ["[str]"]: + data = ["" if d is None else d for d in data] + + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return str(output) + + def serialize_data(self, data, data_type, **kwargs): + """Serialize generic data according to supplied data type. + + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :raises AttributeError: if required data is None. + :raises ValueError: if data is None + :raises SerializationError: if serialization fails. + :returns: The serialized data. + :rtype: str, int, float, bool, dict, list + """ + if data is None: + raise ValueError("No value for given attribute") + + try: + if data is CoreNull: + return None + if data_type in self.basic_types.values(): + return self.serialize_basic(data, data_type, **kwargs) + + if data_type in self.serialize_type: + return self.serialize_type[data_type](data, **kwargs) + + # If dependencies is empty, try with current data class + # It has to be a subclass of Enum anyway + enum_type = self.dependencies.get(data_type, data.__class__) + if issubclass(enum_type, Enum): + return Serializer.serialize_enum(data, enum_obj=enum_type) + + iter_type = data_type[0] + data_type[-1] + if iter_type in self.serialize_type: + return self.serialize_type[iter_type](data, data_type[1:-1], **kwargs) + + except (ValueError, TypeError) as err: + msg = "Unable to serialize value: {!r} as type: {!r}." + raise SerializationError(msg.format(data, data_type)) from err + return self._serialize(data, **kwargs) + + @classmethod + def _get_custom_serializers(cls, data_type, **kwargs): # pylint: disable=inconsistent-return-statements + custom_serializer = kwargs.get("basic_types_serializers", {}).get(data_type) + if custom_serializer: + return custom_serializer + if kwargs.get("is_xml", False): + return cls._xml_basic_types_serializers.get(data_type) + + @classmethod + def serialize_basic(cls, data, data_type, **kwargs): + """Serialize basic builting data type. + Serializes objects to str, int, float or bool. + + Possible kwargs: + - basic_types_serializers dict[str, callable] : If set, use the callable as serializer + - is_xml bool : If set, use xml_basic_types_serializers + + :param obj data: Object to be serialized. + :param str data_type: Type of object in the iterable. + :rtype: str, int, float, bool + :return: serialized object + """ + custom_serializer = cls._get_custom_serializers(data_type, **kwargs) + if custom_serializer: + return custom_serializer(data) + if data_type == "str": + return cls.serialize_unicode(data) + return eval(data_type)(data) # nosec # pylint: disable=eval-used + + @classmethod + def serialize_unicode(cls, data): + """Special handling for serializing unicode strings in Py2. + Encode to UTF-8 if unicode, otherwise handle as a str. + + :param str data: Object to be serialized. + :rtype: str + :return: serialized object + """ + try: # If I received an enum, return its value + return data.value + except AttributeError: + pass + + try: + if isinstance(data, unicode): # type: ignore + # Don't change it, JSON and XML ElementTree are totally able + # to serialize correctly u'' strings + return data + except NameError: + return str(data) + return str(data) + + def serialize_iter(self, data, iter_type, div=None, **kwargs): + """Serialize iterable. + + Supported kwargs: + - serialization_ctxt dict : The current entry of _attribute_map, or same format. + serialization_ctxt['type'] should be same as data_type. + - is_xml bool : If set, serialize as XML + + :param list data: Object to be serialized. + :param str iter_type: Type of object in the iterable. + :param str div: If set, this str will be used to combine the elements + in the iterable into a combined string. Default is 'None'. + Defaults to False. + :rtype: list, str + :return: serialized iterable + """ + if isinstance(data, str): + raise SerializationError("Refuse str type as a valid iter type.") + + serialization_ctxt = kwargs.get("serialization_ctxt", {}) + is_xml = kwargs.get("is_xml", False) + + serialized = [] + for d in data: + try: + serialized.append(self.serialize_data(d, iter_type, **kwargs)) + except ValueError as err: + if isinstance(err, SerializationError): + raise + serialized.append(None) + + if kwargs.get("do_quote", False): + serialized = ["" if s is None else quote(str(s), safe="") for s in serialized] + + if div: + serialized = ["" if s is None else str(s) for s in serialized] + serialized = div.join(serialized) + + if "xml" in serialization_ctxt or is_xml: + # XML serialization is more complicated + xml_desc = serialization_ctxt.get("xml", {}) + xml_name = xml_desc.get("name") + if not xml_name: + xml_name = serialization_ctxt["key"] + + # Create a wrap node if necessary (use the fact that Element and list have "append") + is_wrapped = xml_desc.get("wrapped", False) + node_name = xml_desc.get("itemsName", xml_name) + if is_wrapped: + final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + else: + final_result = [] + # All list elements to "local_node" + for el in serialized: + if isinstance(el, ET.Element): + el_node = el + else: + el_node = _create_xml_node(node_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + if el is not None: # Otherwise it writes "None" :-p + el_node.text = str(el) + final_result.append(el_node) + return final_result + return serialized + + def serialize_dict(self, attr, dict_type, **kwargs): + """Serialize a dictionary of objects. + + :param dict attr: Object to be serialized. + :param str dict_type: Type of object in the dictionary. + :rtype: dict + :return: serialized dictionary + """ + serialization_ctxt = kwargs.get("serialization_ctxt", {}) + serialized = {} + for key, value in attr.items(): + try: + serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs) + except ValueError as err: + if isinstance(err, SerializationError): + raise + serialized[self.serialize_unicode(key)] = None + + if "xml" in serialization_ctxt: + # XML serialization is more complicated + xml_desc = serialization_ctxt["xml"] + xml_name = xml_desc["name"] + + final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + for key, value in serialized.items(): + ET.SubElement(final_result, key).text = value + return final_result + + return serialized + + def serialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements + """Serialize a generic object. + This will be handled as a dictionary. If object passed in is not + a basic type (str, int, float, dict, list) it will simply be + cast to str. + + :param dict attr: Object to be serialized. + :rtype: dict or str + :return: serialized object + """ + if attr is None: + return None + if isinstance(attr, ET.Element): + return attr + obj_type = type(attr) + if obj_type in self.basic_types: + return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs) + if obj_type is _long_type: + return self.serialize_long(attr) + if obj_type is str: + return self.serialize_unicode(attr) + if obj_type is datetime.datetime: + return self.serialize_iso(attr) + if obj_type is datetime.date: + return self.serialize_date(attr) + if obj_type is datetime.time: + return self.serialize_time(attr) + if obj_type is datetime.timedelta: + return self.serialize_duration(attr) + if obj_type is decimal.Decimal: + return self.serialize_decimal(attr) + + # If it's a model or I know this dependency, serialize as a Model + if obj_type in self.dependencies.values() or isinstance(attr, Model): + return self._serialize(attr) + + if obj_type == dict: + serialized = {} + for key, value in attr.items(): + try: + serialized[self.serialize_unicode(key)] = self.serialize_object(value, **kwargs) + except ValueError: + serialized[self.serialize_unicode(key)] = None + return serialized + + if obj_type == list: + serialized = [] + for obj in attr: + try: + serialized.append(self.serialize_object(obj, **kwargs)) + except ValueError: + pass + return serialized + return str(attr) + + @staticmethod + def serialize_enum(attr, enum_obj=None): + try: + result = attr.value + except AttributeError: + result = attr + try: + enum_obj(result) # type: ignore + return result + except ValueError as exc: + for enum_value in enum_obj: # type: ignore + if enum_value.value.lower() == str(attr).lower(): + return enum_value.value + error = "{!r} is not valid value for enum {!r}" + raise SerializationError(error.format(attr, enum_obj)) from exc + + @staticmethod + def serialize_bytearray(attr, **kwargs): # pylint: disable=unused-argument + """Serialize bytearray into base-64 string. + + :param str attr: Object to be serialized. + :rtype: str + :return: serialized base64 + """ + return b64encode(attr).decode() + + @staticmethod + def serialize_base64(attr, **kwargs): # pylint: disable=unused-argument + """Serialize str into base-64 string. + + :param str attr: Object to be serialized. + :rtype: str + :return: serialized base64 + """ + encoded = b64encode(attr).decode("ascii") + return encoded.strip("=").replace("+", "-").replace("/", "_") + + @staticmethod + def serialize_decimal(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Decimal object to float. + + :param decimal attr: Object to be serialized. + :rtype: float + :return: serialized decimal + """ + return float(attr) + + @staticmethod + def serialize_long(attr, **kwargs): # pylint: disable=unused-argument + """Serialize long (Py2) or int (Py3). + + :param int attr: Object to be serialized. + :rtype: int/long + :return: serialized long + """ + return _long_type(attr) + + @staticmethod + def serialize_date(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Date object into ISO-8601 formatted string. + + :param Date attr: Object to be serialized. + :rtype: str + :return: serialized date + """ + if isinstance(attr, str): + attr = isodate.parse_date(attr) + t = "{:04}-{:02}-{:02}".format(attr.year, attr.month, attr.day) + return t + + @staticmethod + def serialize_time(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Time object into ISO-8601 formatted string. + + :param datetime.time attr: Object to be serialized. + :rtype: str + :return: serialized time + """ + if isinstance(attr, str): + attr = isodate.parse_time(attr) + t = "{:02}:{:02}:{:02}".format(attr.hour, attr.minute, attr.second) + if attr.microsecond: + t += ".{:02}".format(attr.microsecond) + return t + + @staticmethod + def serialize_duration(attr, **kwargs): # pylint: disable=unused-argument + """Serialize TimeDelta object into ISO-8601 formatted string. + + :param TimeDelta attr: Object to be serialized. + :rtype: str + :return: serialized duration + """ + if isinstance(attr, str): + attr = isodate.parse_duration(attr) + return isodate.duration_isoformat(attr) + + @staticmethod + def serialize_rfc(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Datetime object into RFC-1123 formatted string. + + :param Datetime attr: Object to be serialized. + :rtype: str + :raises TypeError: if format invalid. + :return: serialized rfc + """ + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + utc = attr.utctimetuple() + except AttributeError as exc: + raise TypeError("RFC1123 object must be valid Datetime object.") from exc + + return "{}, {:02} {} {:04} {:02}:{:02}:{:02} GMT".format( + Serializer.days[utc.tm_wday], + utc.tm_mday, + Serializer.months[utc.tm_mon], + utc.tm_year, + utc.tm_hour, + utc.tm_min, + utc.tm_sec, + ) + + @staticmethod + def serialize_iso(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Datetime object into ISO-8601 formatted string. + + :param Datetime attr: Object to be serialized. + :rtype: str + :raises SerializationError: if format invalid. + :return: serialized iso + """ + if isinstance(attr, str): + attr = isodate.parse_datetime(attr) + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + utc = attr.utctimetuple() + if utc.tm_year > 9999 or utc.tm_year < 1: + raise OverflowError("Hit max or min date") + + microseconds = str(attr.microsecond).rjust(6, "0").rstrip("0").ljust(3, "0") + if microseconds: + microseconds = "." + microseconds + date = "{:04}-{:02}-{:02}T{:02}:{:02}:{:02}".format( + utc.tm_year, utc.tm_mon, utc.tm_mday, utc.tm_hour, utc.tm_min, utc.tm_sec + ) + return date + microseconds + "Z" + except (ValueError, OverflowError) as err: + msg = "Unable to serialize datetime object." + raise SerializationError(msg) from err + except AttributeError as err: + msg = "ISO-8601 object must be valid Datetime object." + raise TypeError(msg) from err + + @staticmethod + def serialize_unix(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Datetime object into IntTime format. + This is represented as seconds. + + :param Datetime attr: Object to be serialized. + :rtype: int + :raises SerializationError: if format invalid + :return: serialied unix + """ + if isinstance(attr, int): + return attr + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + return int(calendar.timegm(attr.utctimetuple())) + except AttributeError as exc: + raise TypeError("Unix time object must be valid Datetime object.") from exc + + +def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument + key = attr_desc["key"] + working_data = data + + while "." in key: + # Need the cast, as for some reasons "split" is typed as list[str | Any] + dict_keys = cast(List[str], _FLATTEN.split(key)) + if len(dict_keys) == 1: + key = _decode_attribute_map_key(dict_keys[0]) + break + working_key = _decode_attribute_map_key(dict_keys[0]) + working_data = working_data.get(working_key, data) + if working_data is None: + # If at any point while following flatten JSON path see None, it means + # that all properties under are None as well + return None + key = ".".join(dict_keys[1:]) + + return working_data.get(key) + + +def rest_key_case_insensitive_extractor( # pylint: disable=unused-argument, inconsistent-return-statements + attr, attr_desc, data +): + key = attr_desc["key"] + working_data = data + + while "." in key: + dict_keys = _FLATTEN.split(key) + if len(dict_keys) == 1: + key = _decode_attribute_map_key(dict_keys[0]) + break + working_key = _decode_attribute_map_key(dict_keys[0]) + working_data = attribute_key_case_insensitive_extractor(working_key, None, working_data) + if working_data is None: + # If at any point while following flatten JSON path see None, it means + # that all properties under are None as well + return None + key = ".".join(dict_keys[1:]) + + if working_data: + return attribute_key_case_insensitive_extractor(key, None, working_data) + + +def last_rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument + """Extract the attribute in "data" based on the last part of the JSON path key. + + :param str attr: The attribute to extract + :param dict attr_desc: The attribute description + :param dict data: The data to extract from + :rtype: object + :returns: The extracted attribute + """ + key = attr_desc["key"] + dict_keys = _FLATTEN.split(key) + return attribute_key_extractor(dict_keys[-1], None, data) + + +def last_rest_key_case_insensitive_extractor(attr, attr_desc, data): # pylint: disable=unused-argument + """Extract the attribute in "data" based on the last part of the JSON path key. + + This is the case insensitive version of "last_rest_key_extractor" + :param str attr: The attribute to extract + :param dict attr_desc: The attribute description + :param dict data: The data to extract from + :rtype: object + :returns: The extracted attribute + """ + key = attr_desc["key"] + dict_keys = _FLATTEN.split(key) + return attribute_key_case_insensitive_extractor(dict_keys[-1], None, data) + + +def attribute_key_extractor(attr, _, data): + return data.get(attr) + + +def attribute_key_case_insensitive_extractor(attr, _, data): + found_key = None + lower_attr = attr.lower() + for key in data: + if lower_attr == key.lower(): + found_key = key + break + + return data.get(found_key) + + +def _extract_name_from_internal_type(internal_type): + """Given an internal type XML description, extract correct XML name with namespace. + + :param dict internal_type: An model type + :rtype: tuple + :returns: A tuple XML name + namespace dict + """ + internal_type_xml_map = getattr(internal_type, "_xml_map", {}) + xml_name = internal_type_xml_map.get("name", internal_type.__name__) + xml_ns = internal_type_xml_map.get("ns", None) + if xml_ns: + xml_name = "{{{}}}{}".format(xml_ns, xml_name) + return xml_name + + +def xml_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument,too-many-return-statements + if isinstance(data, dict): + return None + + # Test if this model is XML ready first + if not isinstance(data, ET.Element): + return None + + xml_desc = attr_desc.get("xml", {}) + xml_name = xml_desc.get("name", attr_desc["key"]) + + # Look for a children + is_iter_type = attr_desc["type"].startswith("[") + is_wrapped = xml_desc.get("wrapped", False) + internal_type = attr_desc.get("internalType", None) + internal_type_xml_map = getattr(internal_type, "_xml_map", {}) + + # Integrate namespace if necessary + xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None)) + if xml_ns: + xml_name = "{{{}}}{}".format(xml_ns, xml_name) + + # If it's an attribute, that's simple + if xml_desc.get("attr", False): + return data.get(xml_name) + + # If it's x-ms-text, that's simple too + if xml_desc.get("text", False): + return data.text + + # Scenario where I take the local name: + # - Wrapped node + # - Internal type is an enum (considered basic types) + # - Internal type has no XML/Name node + if is_wrapped or (internal_type and (issubclass(internal_type, Enum) or "name" not in internal_type_xml_map)): + children = data.findall(xml_name) + # If internal type has a local name and it's not a list, I use that name + elif not is_iter_type and internal_type and "name" in internal_type_xml_map: + xml_name = _extract_name_from_internal_type(internal_type) + children = data.findall(xml_name) + # That's an array + else: + if internal_type: # Complex type, ignore itemsName and use the complex type name + items_name = _extract_name_from_internal_type(internal_type) + else: + items_name = xml_desc.get("itemsName", xml_name) + children = data.findall(items_name) + + if len(children) == 0: + if is_iter_type: + if is_wrapped: + return None # is_wrapped no node, we want None + return [] # not wrapped, assume empty list + return None # Assume it's not there, maybe an optional node. + + # If is_iter_type and not wrapped, return all found children + if is_iter_type: + if not is_wrapped: + return children + # Iter and wrapped, should have found one node only (the wrap one) + if len(children) != 1: + raise DeserializationError( + "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( + xml_name + ) + ) + return list(children[0]) # Might be empty list and that's ok. + + # Here it's not a itertype, we should have found one element only or empty + if len(children) > 1: + raise DeserializationError("Find several XML '{}' where it was not expected".format(xml_name)) + return children[0] + + +class Deserializer: + """Response object model deserializer. + + :param dict classes: Class type dictionary for deserializing complex types. + :ivar list key_extractors: Ordered list of extractors to be used by this deserializer. + """ + + basic_types = {str: "str", int: "int", bool: "bool", float: "float"} + + valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") + + def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: + self.deserialize_type = { + "iso-8601": Deserializer.deserialize_iso, + "rfc-1123": Deserializer.deserialize_rfc, + "unix-time": Deserializer.deserialize_unix, + "duration": Deserializer.deserialize_duration, + "date": Deserializer.deserialize_date, + "time": Deserializer.deserialize_time, + "decimal": Deserializer.deserialize_decimal, + "long": Deserializer.deserialize_long, + "bytearray": Deserializer.deserialize_bytearray, + "base64": Deserializer.deserialize_base64, + "object": self.deserialize_object, + "[]": self.deserialize_iter, + "{}": self.deserialize_dict, + } + self.deserialize_expected_types = { + "duration": (isodate.Duration, datetime.timedelta), + "iso-8601": (datetime.datetime), + } + self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.key_extractors = [rest_key_extractor, xml_key_extractor] + # Additional properties only works if the "rest_key_extractor" is used to + # extract the keys. Making it to work whatever the key extractor is too much + # complicated, with no real scenario for now. + # So adding a flag to disable additional properties detection. This flag should be + # used if your expect the deserialization to NOT come from a JSON REST syntax. + # Otherwise, result are unexpected + self.additional_properties_detection = True + + def __call__(self, target_obj, response_data, content_type=None): + """Call the deserializer to process a REST response. + + :param str target_obj: Target data type to deserialize to. + :param requests.Response response_data: REST response object. + :param str content_type: Swagger "produces" if available. + :raises DeserializationError: if deserialization fails. + :return: Deserialized object. + :rtype: object + """ + data = self._unpack_content(response_data, content_type) + return self._deserialize(target_obj, data) + + def _deserialize(self, target_obj, data): # pylint: disable=inconsistent-return-statements + """Call the deserializer on a model. + + Data needs to be already deserialized as JSON or XML ElementTree + + :param str target_obj: Target data type to deserialize to. + :param object data: Object to deserialize. + :raises DeserializationError: if deserialization fails. + :return: Deserialized object. + :rtype: object + """ + # This is already a model, go recursive just in case + if hasattr(data, "_attribute_map"): + constants = [name for name, config in getattr(data, "_validation", {}).items() if config.get("constant")] + try: + for attr, mapconfig in data._attribute_map.items(): # pylint: disable=protected-access + if attr in constants: + continue + value = getattr(data, attr) + if value is None: + continue + local_type = mapconfig["type"] + internal_data_type = local_type.strip("[]{}") + if internal_data_type not in self.dependencies or isinstance(internal_data_type, Enum): + continue + setattr(data, attr, self._deserialize(local_type, value)) + return data + except AttributeError: + return + + response, class_name = self._classify_target(target_obj, data) + + if isinstance(response, str): + return self.deserialize_data(data, response) + if isinstance(response, type) and issubclass(response, Enum): + return self.deserialize_enum(data, response) + + if data is None or data is CoreNull: + return data + try: + attributes = response._attribute_map # type: ignore # pylint: disable=protected-access + d_attrs = {} + for attr, attr_desc in attributes.items(): + # Check empty string. If it's not empty, someone has a real "additionalProperties"... + if attr == "additional_properties" and attr_desc["key"] == "": + continue + raw_value = None + # Enhance attr_desc with some dynamic data + attr_desc = attr_desc.copy() # Do a copy, do not change the real one + internal_data_type = attr_desc["type"].strip("[]{}") + if internal_data_type in self.dependencies: + attr_desc["internalType"] = self.dependencies[internal_data_type] + + for key_extractor in self.key_extractors: + found_value = key_extractor(attr, attr_desc, data) + if found_value is not None: + if raw_value is not None and raw_value != found_value: + msg = ( + "Ignoring extracted value '%s' from %s for key '%s'" + " (duplicate extraction, follow extractors order)" + ) + _LOGGER.warning(msg, found_value, key_extractor, attr) + continue + raw_value = found_value + + value = self.deserialize_data(raw_value, attr_desc["type"]) + d_attrs[attr] = value + except (AttributeError, TypeError, KeyError) as err: + msg = "Unable to deserialize to object: " + class_name # type: ignore + raise DeserializationError(msg) from err + additional_properties = self._build_additional_properties(attributes, data) + return self._instantiate_model(response, d_attrs, additional_properties) + + def _build_additional_properties(self, attribute_map, data): + if not self.additional_properties_detection: + return None + if "additional_properties" in attribute_map and attribute_map.get("additional_properties", {}).get("key") != "": + # Check empty string. If it's not empty, someone has a real "additionalProperties" + return None + if isinstance(data, ET.Element): + data = {el.tag: el.text for el in data} + + known_keys = { + _decode_attribute_map_key(_FLATTEN.split(desc["key"])[0]) + for desc in attribute_map.values() + if desc["key"] != "" + } + present_keys = set(data.keys()) + missing_keys = present_keys - known_keys + return {key: data[key] for key in missing_keys} + + def _classify_target(self, target, data): + """Check to see whether the deserialization target object can + be classified into a subclass. + Once classification has been determined, initialize object. + + :param str target: The target object type to deserialize to. + :param str/dict data: The response data to deserialize. + :return: The classified target object and its class name. + :rtype: tuple + """ + if target is None: + return None, None + + if isinstance(target, str): + try: + target = self.dependencies[target] + except KeyError: + return target, target + + try: + target = target._classify(data, self.dependencies) # type: ignore # pylint: disable=protected-access + except AttributeError: + pass # Target is not a Model, no classify + return target, target.__class__.__name__ # type: ignore + + def failsafe_deserialize(self, target_obj, data, content_type=None): + """Ignores any errors encountered in deserialization, + and falls back to not deserializing the object. Recommended + for use in error deserialization, as we want to return the + HttpResponseError to users, and not have them deal with + a deserialization error. + + :param str target_obj: The target object type to deserialize to. + :param str/dict data: The response data to deserialize. + :param str content_type: Swagger "produces" if available. + :return: Deserialized object. + :rtype: object + """ + try: + return self(target_obj, data, content_type=content_type) + except: # pylint: disable=bare-except + _LOGGER.debug( + "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True + ) + return None + + @staticmethod + def _unpack_content(raw_data, content_type=None): + """Extract the correct structure for deserialization. + + If raw_data is a PipelineResponse, try to extract the result of RawDeserializer. + if we can't, raise. Your Pipeline should have a RawDeserializer. + + If not a pipeline response and raw_data is bytes or string, use content-type + to decode it. If no content-type, try JSON. + + If raw_data is something else, bypass all logic and return it directly. + + :param obj raw_data: Data to be processed. + :param str content_type: How to parse if raw_data is a string/bytes. + :raises JSONDecodeError: If JSON is requested and parsing is impossible. + :raises UnicodeDecodeError: If bytes is not UTF8 + :rtype: object + :return: Unpacked content. + """ + # Assume this is enough to detect a Pipeline Response without importing it + context = getattr(raw_data, "context", {}) + if context: + if RawDeserializer.CONTEXT_NAME in context: + return context[RawDeserializer.CONTEXT_NAME] + raise ValueError("This pipeline didn't have the RawDeserializer policy; can't deserialize") + + # Assume this is enough to recognize universal_http.ClientResponse without importing it + if hasattr(raw_data, "body"): + return RawDeserializer.deserialize_from_http_generics(raw_data.text(), raw_data.headers) + + # Assume this enough to recognize requests.Response without importing it. + if hasattr(raw_data, "_content_consumed"): + return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers) + + if isinstance(raw_data, (str, bytes)) or hasattr(raw_data, "read"): + return RawDeserializer.deserialize_from_text(raw_data, content_type) # type: ignore + return raw_data + + def _instantiate_model(self, response, attrs, additional_properties=None): + """Instantiate a response model passing in deserialized args. + + :param Response response: The response model class. + :param dict attrs: The deserialized response attributes. + :param dict additional_properties: Additional properties to be set. + :rtype: Response + :return: The instantiated response model. + """ + if callable(response): + subtype = getattr(response, "_subtype_map", {}) + try: + readonly = [ + k + for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore + if v.get("readonly") + ] + const = [ + k + for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore + if v.get("constant") + ] + kwargs = {k: v for k, v in attrs.items() if k not in subtype and k not in readonly + const} + response_obj = response(**kwargs) + for attr in readonly: + setattr(response_obj, attr, attrs.get(attr)) + if additional_properties: + response_obj.additional_properties = additional_properties # type: ignore + return response_obj + except TypeError as err: + msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) # type: ignore + raise DeserializationError(msg + str(err)) from err + else: + try: + for attr, value in attrs.items(): + setattr(response, attr, value) + return response + except Exception as exp: + msg = "Unable to populate response model. " + msg += "Type: {}, Error: {}".format(type(response), exp) + raise DeserializationError(msg) from exp + + def deserialize_data(self, data, data_type): # pylint: disable=too-many-return-statements + """Process data for deserialization according to data type. + + :param str data: The response string to be deserialized. + :param str data_type: The type to deserialize to. + :raises DeserializationError: if deserialization fails. + :return: Deserialized object. + :rtype: object + """ + if data is None: + return data + + try: + if not data_type: + return data + if data_type in self.basic_types.values(): + return self.deserialize_basic(data, data_type) + if data_type in self.deserialize_type: + if isinstance(data, self.deserialize_expected_types.get(data_type, tuple())): + return data + + is_a_text_parsing_type = lambda x: x not in [ # pylint: disable=unnecessary-lambda-assignment + "object", + "[]", + r"{}", + ] + if isinstance(data, ET.Element) and is_a_text_parsing_type(data_type) and not data.text: + return None + data_val = self.deserialize_type[data_type](data) + return data_val + + iter_type = data_type[0] + data_type[-1] + if iter_type in self.deserialize_type: + return self.deserialize_type[iter_type](data, data_type[1:-1]) + + obj_type = self.dependencies[data_type] + if issubclass(obj_type, Enum): + if isinstance(data, ET.Element): + data = data.text + return self.deserialize_enum(data, obj_type) + + except (ValueError, TypeError, AttributeError) as err: + msg = "Unable to deserialize response data." + msg += " Data: {}, {}".format(data, data_type) + raise DeserializationError(msg) from err + return self._deserialize(obj_type, data) + + def deserialize_iter(self, attr, iter_type): + """Deserialize an iterable. + + :param list attr: Iterable to be deserialized. + :param str iter_type: The type of object in the iterable. + :return: Deserialized iterable. + :rtype: list + """ + if attr is None: + return None + if isinstance(attr, ET.Element): # If I receive an element here, get the children + attr = list(attr) + if not isinstance(attr, (list, set)): + raise DeserializationError("Cannot deserialize as [{}] an object of type {}".format(iter_type, type(attr))) + return [self.deserialize_data(a, iter_type) for a in attr] + + def deserialize_dict(self, attr, dict_type): + """Deserialize a dictionary. + + :param dict/list attr: Dictionary to be deserialized. Also accepts + a list of key, value pairs. + :param str dict_type: The object type of the items in the dictionary. + :return: Deserialized dictionary. + :rtype: dict + """ + if isinstance(attr, list): + return {x["key"]: self.deserialize_data(x["value"], dict_type) for x in attr} + + if isinstance(attr, ET.Element): + # Transform value into {"Key": "value"} + attr = {el.tag: el.text for el in attr} + return {k: self.deserialize_data(v, dict_type) for k, v in attr.items()} + + def deserialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements + """Deserialize a generic object. + This will be handled as a dictionary. + + :param dict attr: Dictionary to be deserialized. + :return: Deserialized object. + :rtype: dict + :raises TypeError: if non-builtin datatype encountered. + """ + if attr is None: + return None + if isinstance(attr, ET.Element): + # Do no recurse on XML, just return the tree as-is + return attr + if isinstance(attr, str): + return self.deserialize_basic(attr, "str") + obj_type = type(attr) + if obj_type in self.basic_types: + return self.deserialize_basic(attr, self.basic_types[obj_type]) + if obj_type is _long_type: + return self.deserialize_long(attr) + + if obj_type == dict: + deserialized = {} + for key, value in attr.items(): + try: + deserialized[key] = self.deserialize_object(value, **kwargs) + except ValueError: + deserialized[key] = None + return deserialized + + if obj_type == list: + deserialized = [] + for obj in attr: + try: + deserialized.append(self.deserialize_object(obj, **kwargs)) + except ValueError: + pass + return deserialized + + error = "Cannot deserialize generic object with type: " + raise TypeError(error + str(obj_type)) + + def deserialize_basic(self, attr, data_type): # pylint: disable=too-many-return-statements + """Deserialize basic builtin data type from string. + Will attempt to convert to str, int, float and bool. + This function will also accept '1', '0', 'true' and 'false' as + valid bool values. + + :param str attr: response string to be deserialized. + :param str data_type: deserialization data type. + :return: Deserialized basic type. + :rtype: str, int, float or bool + :raises TypeError: if string format is not valid. + """ + # If we're here, data is supposed to be a basic type. + # If it's still an XML node, take the text + if isinstance(attr, ET.Element): + attr = attr.text + if not attr: + if data_type == "str": + # None or '', node is empty string. + return "" + # None or '', node with a strong type is None. + # Don't try to model "empty bool" or "empty int" + return None + + if data_type == "bool": + if attr in [True, False, 1, 0]: + return bool(attr) + if isinstance(attr, str): + if attr.lower() in ["true", "1"]: + return True + if attr.lower() in ["false", "0"]: + return False + raise TypeError("Invalid boolean value: {}".format(attr)) + + if data_type == "str": + return self.deserialize_unicode(attr) + return eval(data_type)(attr) # nosec # pylint: disable=eval-used + + @staticmethod + def deserialize_unicode(data): + """Preserve unicode objects in Python 2, otherwise return data + as a string. + + :param str data: response string to be deserialized. + :return: Deserialized string. + :rtype: str or unicode + """ + # We might be here because we have an enum modeled as string, + # and we try to deserialize a partial dict with enum inside + if isinstance(data, Enum): + return data + + # Consider this is real string + try: + if isinstance(data, unicode): # type: ignore + return data + except NameError: + return str(data) + return str(data) + + @staticmethod + def deserialize_enum(data, enum_obj): + """Deserialize string into enum object. + + If the string is not a valid enum value it will be returned as-is + and a warning will be logged. + + :param str data: Response string to be deserialized. If this value is + None or invalid it will be returned as-is. + :param Enum enum_obj: Enum object to deserialize to. + :return: Deserialized enum object. + :rtype: Enum + """ + if isinstance(data, enum_obj) or data is None: + return data + if isinstance(data, Enum): + data = data.value + if isinstance(data, int): + # Workaround. We might consider remove it in the future. + try: + return list(enum_obj.__members__.values())[data] + except IndexError as exc: + error = "{!r} is not a valid index for enum {!r}" + raise DeserializationError(error.format(data, enum_obj)) from exc + try: + return enum_obj(str(data)) + except ValueError: + for enum_value in enum_obj: + if enum_value.value.lower() == str(data).lower(): + return enum_value + # We don't fail anymore for unknown value, we deserialize as a string + _LOGGER.warning("Deserializer is not able to find %s as valid enum in %s", data, enum_obj) + return Deserializer.deserialize_unicode(data) + + @staticmethod + def deserialize_bytearray(attr): + """Deserialize string into bytearray. + + :param str attr: response string to be deserialized. + :return: Deserialized bytearray + :rtype: bytearray + :raises TypeError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + return bytearray(b64decode(attr)) # type: ignore + + @staticmethod + def deserialize_base64(attr): + """Deserialize base64 encoded string into string. + + :param str attr: response string to be deserialized. + :return: Deserialized base64 string + :rtype: bytearray + :raises TypeError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore + attr = attr + padding # type: ignore + encoded = attr.replace("-", "+").replace("_", "/") + return b64decode(encoded) + + @staticmethod + def deserialize_decimal(attr): + """Deserialize string into Decimal object. + + :param str attr: response string to be deserialized. + :return: Deserialized decimal + :raises DeserializationError: if string format invalid. + :rtype: decimal + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + return decimal.Decimal(str(attr)) # type: ignore + except decimal.DecimalException as err: + msg = "Invalid decimal {}".format(attr) + raise DeserializationError(msg) from err + + @staticmethod + def deserialize_long(attr): + """Deserialize string into long (Py2) or int (Py3). + + :param str attr: response string to be deserialized. + :return: Deserialized int + :rtype: long or int + :raises ValueError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + return _long_type(attr) # type: ignore + + @staticmethod + def deserialize_duration(attr): + """Deserialize ISO-8601 formatted string into TimeDelta object. + + :param str attr: response string to be deserialized. + :return: Deserialized duration + :rtype: TimeDelta + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + duration = isodate.parse_duration(attr) + except (ValueError, OverflowError, AttributeError) as err: + msg = "Cannot deserialize duration object." + raise DeserializationError(msg) from err + return duration + + @staticmethod + def deserialize_date(attr): + """Deserialize ISO-8601 formatted string into Date object. + + :param str attr: response string to be deserialized. + :return: Deserialized date + :rtype: Date + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore + raise DeserializationError("Date must have only digits and -. Received: %s" % attr) + # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. + return isodate.parse_date(attr, defaultmonth=0, defaultday=0) + + @staticmethod + def deserialize_time(attr): + """Deserialize ISO-8601 formatted string into time object. + + :param str attr: response string to be deserialized. + :return: Deserialized time + :rtype: datetime.time + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore + raise DeserializationError("Date must have only digits and -. Received: %s" % attr) + return isodate.parse_time(attr) + + @staticmethod + def deserialize_rfc(attr): + """Deserialize RFC-1123 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :return: Deserialized RFC datetime + :rtype: Datetime + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + parsed_date = email.utils.parsedate_tz(attr) # type: ignore + date_obj = datetime.datetime( + *parsed_date[:6], tzinfo=datetime.timezone(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60)) + ) + if not date_obj.tzinfo: + date_obj = date_obj.astimezone(tz=TZ_UTC) + except ValueError as err: + msg = "Cannot deserialize to rfc datetime object." + raise DeserializationError(msg) from err + return date_obj + + @staticmethod + def deserialize_iso(attr): + """Deserialize ISO-8601 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :return: Deserialized ISO datetime + :rtype: Datetime + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + attr = attr.upper() # type: ignore + match = Deserializer.valid_date.match(attr) + if not match: + raise ValueError("Invalid datetime string: " + attr) + + check_decimal = attr.split(".") + if len(check_decimal) > 1: + decimal_str = "" + for digit in check_decimal[1]: + if digit.isdigit(): + decimal_str += digit + else: + break + if len(decimal_str) > 6: + attr = attr.replace(decimal_str, decimal_str[0:6]) + + date_obj = isodate.parse_datetime(attr) + test_utc = date_obj.utctimetuple() + if test_utc.tm_year > 9999 or test_utc.tm_year < 1: + raise OverflowError("Hit max or min date") + except (ValueError, OverflowError, AttributeError) as err: + msg = "Cannot deserialize datetime object." + raise DeserializationError(msg) from err + return date_obj + + @staticmethod + def deserialize_unix(attr): + """Serialize Datetime object into IntTime format. + This is represented as seconds. + + :param int attr: Object to be serialized. + :return: Deserialized datetime + :rtype: Datetime + :raises DeserializationError: if format invalid + """ + if isinstance(attr, ET.Element): + attr = int(attr.text) # type: ignore + try: + attr = int(attr) + date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC) + except ValueError as err: + msg = "Cannot deserialize to unix datetime object." + raise DeserializationError(msg) from err + return date_obj diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/utils.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/utils.py new file mode 100644 index 00000000000..02aa2f816ea --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/utils.py @@ -0,0 +1,18 @@ +from abc import ABC +from typing import Generic, TYPE_CHECKING, TypeVar + +if TYPE_CHECKING: + from .serialization import Deserializer, Serializer + + +TClient = TypeVar("TClient") +TConfig = TypeVar("TConfig") + + +class ClientMixinABC(ABC, Generic[TClient, TConfig]): + """DO NOT use this class. It is for internal typing use only.""" + + _client: TClient + _config: TConfig + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/__init__.py new file mode 100644 index 00000000000..a5665d821b2 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/__init__.py @@ -0,0 +1,23 @@ +# coding=utf-8 +# pylint: disable=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._client import ApiKeyClient # type: ignore + +try: + from ._patch import __all__ as _patch_all + from ._patch import * +except ImportError: + _patch_all = [] +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "ApiKeyClient", +] +__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/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_client.py new file mode 100644 index 00000000000..028cb9f347e --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_client.py @@ -0,0 +1,84 @@ +# coding=utf-8 + +from copy import deepcopy +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._operations import _ApiKeyClientOperationsMixin + + +class ApiKeyClient(_ApiKeyClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Illustrates clients generated with ApiKey authentication. + + :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 + ) -> None: + _endpoint = "{endpoint}" + self._config = ApiKeyClientConfiguration(credential=credential, endpoint=endpoint, **kwargs) + + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + self._config.retry_policy, + self._config.authentication_policy, + self._config.logging_policy, + ] + self._client: AsyncPipelineClient = AsyncPipelineClient(endpoint=_endpoint, policies=_policies, **kwargs) + + self._serialize = Serializer() + self._deserialize = Deserializer() + self._serialize.client_side_validation = False + + def send_request( + self, request: HttpRequest, *, stream: bool = False, **kwargs: Any + ) -> Awaitable[AsyncHttpResponse]: + """Runs the network request through the client's chained policies. + + >>> from corehttp.rest import HttpRequest + >>> request = HttpRequest("GET", "https://www.example.org/") + + >>> response = await client.send_request(request) + + + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request + + :param request: The network request you want to make. Required. + :type request: ~corehttp.rest.HttpRequest + :keyword bool stream: Whether the response payload will be streamed. Defaults to False. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~corehttp.rest.AsyncHttpResponse + """ + + request_copy = deepcopy(request) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + + request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + async def close(self) -> None: + await self._client.close() + + async def __aenter__(self) -> Self: + await self._client.__aenter__() + return self + + async def __aexit__(self, *exc_details: Any) -> None: + await self._client.__aexit__(*exc_details) diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_configuration.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_configuration.py new file mode 100644 index 00000000000..d688ff35fc1 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_configuration.py @@ -0,0 +1,43 @@ +# coding=utf-8 + +from typing import Any + +from corehttp.credentials import ServiceKeyCredential +from corehttp.runtime import policies + +from .._version import VERSION + + +class ApiKeyClientConfiguration: + """Configuration for ApiKeyClient. + + 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.") + + self.credential = credential + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "authentication-api-key-with-subdir/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) + self._configure(**kwargs) + + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.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-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/__init__.py new file mode 100644 index 00000000000..0d033db47cd --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/__init__.py @@ -0,0 +1,16 @@ +# coding=utf-8 +# pylint: disable=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [] +__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/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_operations.py new file mode 100644 index 00000000000..bdc739e3998 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_operations.py @@ -0,0 +1,118 @@ +# 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-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_patch.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_patch.py new file mode 100644 index 00000000000..894b28a174c --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_patch.py @@ -0,0 +1,18 @@ +# coding=utf-8 + +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_patch.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_patch.py new file mode 100644 index 00000000000..894b28a174c --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_patch.py @@ -0,0 +1,18 @@ +# coding=utf-8 + +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/__init__.py new file mode 100644 index 00000000000..8187b432556 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/__init__.py @@ -0,0 +1,21 @@ +# coding=utf-8 +# pylint: disable=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + + +from ._models import ( # type: ignore + InvalidAuth, +) +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "InvalidAuth", +] +__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/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_models.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_models.py new file mode 100644 index 00000000000..74139dbef58 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_models.py @@ -0,0 +1,34 @@ +# 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-with-subdir/subdir/authentication/apikey/_generated/models/_patch.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_patch.py new file mode 100644 index 00000000000..894b28a174c --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_patch.py @@ -0,0 +1,18 @@ +# coding=utf-8 + +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_version.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_version.py new file mode 100644 index 00000000000..9f6458b8cda --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_version.py @@ -0,0 +1,3 @@ +# coding=utf-8 + +VERSION = "1.0.0b1" diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/aio/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/aio/_client.py new file mode 100644 index 00000000000..38ca67ee5e3 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/aio/_client.py @@ -0,0 +1,12 @@ +from .._generated.aio import ApiKeyClient + +class CustomizedApiKeyClient(ApiKeyClient): + """Customized ApiKeyClient with additional functionality.""" + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + # Additional initialization or customization can be done here + + def custom_method(self): + """An example of a custom method that extends the functionality.""" + print("This is a custom method in the CustomizedApiKeyClient.") diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/py.typed b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/py.typed new file mode 100644 index 00000000000..e5aff4f83af --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/py.typed @@ -0,0 +1 @@ +# Marker file for PEP 561. \ No newline at end of file diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/setup.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/setup.py new file mode 100644 index 00000000000..f2a51d6a432 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/setup.py @@ -0,0 +1,61 @@ +# coding=utf-8 + + +import os +import re +from setuptools import setup, find_packages + + +PACKAGE_NAME = "authentication-api-key-with-subdir" +PACKAGE_PPRINT_NAME = "Authentication Api Key With Subdir" +PACKAGE_NAMESPACE = "authentication.apikey" + +# a.b.c => a/b/c +package_folder_path = PACKAGE_NAMESPACE.replace(".", "/") + +# Version extraction inspired from 'requests' +with open(os.path.join(package_folder_path, "_version.py"), "r") as fd: + version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1) + +if not version: + raise RuntimeError("Cannot find version information") + + +setup( + name=PACKAGE_NAME, + version=version, + description=" {} Client Library for Python".format(PACKAGE_PPRINT_NAME), + long_description=open("README.md", "r").read(), + long_description_content_type="text/markdown", + license="MIT License", + author="", + classifiers=[ + "Development Status :: 4 - Beta", + "Programming Language :: Python", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "License :: OSI Approved :: MIT License", + ], + zip_safe=False, + packages=find_packages( + exclude=[ + "tests", + # Exclude packages that will be covered by PEP420 or nspkg + "authentication", + ] + ), + include_package_data=True, + package_data={ + "authentication.apikey": ["py.typed"], + }, + install_requires=[ + "isodate>=0.6.1", + "corehttp[requests]>=1.0.0b6", + "typing-extensions>=4.6.0", + ], + python_requires=">=3.9", +) From a12316613f67c4bfdb3d39c0f1cc236813c1e8e7 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Fri, 25 Jul 2025 13:26:10 -0400 Subject: [PATCH 03/34] regen --- .../subdir/CHANGELOG.md | 5 + .../subdir/LICENSE | 21 + .../subdir/MANIFEST.in | 6 + .../subdir/README.md | 43 + .../subdir/apiview-properties.json | 10 + .../subdir/authentication/__init__.py | 1 + .../apikey/_generated/__init__.py | 32 + .../apikey/_generated/_client.py | 95 + .../apikey/_generated/_configuration.py | 50 + .../apikey/_generated/_operations/__init__.py | 22 + .../_generated/_operations/_operations.py | 152 ++ .../apikey/_generated/_operations/_patch.py | 21 + .../apikey/_generated/_patch.py | 21 + .../apikey/_generated/_utils/__init__.py | 6 + .../apikey/_generated/_utils/model_base.py | 1232 ++++++++++ .../apikey/_generated/_utils/serialization.py | 2032 +++++++++++++++++ .../apikey/_generated/_utils/utils.py | 25 + .../apikey/_generated/aio/__init__.py | 29 + .../apikey/_generated/aio/_client.py | 97 + .../apikey/_generated/aio/_configuration.py | 50 + .../_generated/aio/_operations/__init__.py | 22 + .../_generated/aio/_operations/_operations.py | 128 ++ .../_generated/aio/_operations/_patch.py | 21 + .../apikey/_generated/aio/_patch.py | 21 + .../apikey/_generated/models/__init__.py | 27 + .../apikey/_generated/models/_models.py | 40 + .../apikey/_generated/models/_patch.py | 21 + .../subdir/authentication/apikey/_version.py | 9 + .../subdir/authentication/apikey/py.typed | 1 + .../subdir/dev_requirements.txt | 3 + .../subdir/generated_tests/conftest.py | 35 + .../subdir/generated_tests/test_api_key.py | 31 + .../generated_tests/test_api_key_async.py | 32 + .../subdir/generated_tests/testpreparer.py | 24 + .../generated_tests/testpreparer_async.py | 20 + .../subdir/setup.py | 70 + .../mock_api_tests/test_generation_subdir.py | 1 + .../subdir/authentication/apikey/_client.py | 1 + .../authentication/apikey/aio/_client.py | 1 + 39 files changed, 4458 insertions(+) create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/CHANGELOG.md create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/LICENSE create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/MANIFEST.in create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/README.md create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/apiview-properties.json create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_client.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_configuration.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_operations.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/model_base.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/serialization.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/utils.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_client.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_configuration.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_operations.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_models.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_version.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/py.typed create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/dev_requirements.txt create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/conftest.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/test_api_key.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/test_api_key_async.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/testpreparer.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/testpreparer_async.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/setup.py create mode 100644 packages/typespec-python/test/azure/mock_api_tests/test_generation_subdir.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/CHANGELOG.md b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/CHANGELOG.md new file mode 100644 index 00000000000..628743d283a --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/CHANGELOG.md @@ -0,0 +1,5 @@ +# Release History + +## 1.0.0b1 (1970-01-01) + +- Initial version diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/LICENSE b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/LICENSE new file mode 100644 index 00000000000..63447fd8bbb --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/LICENSE @@ -0,0 +1,21 @@ +Copyright (c) Microsoft Corporation. + +MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/MANIFEST.in b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/MANIFEST.in new file mode 100644 index 00000000000..805328d742a --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/MANIFEST.in @@ -0,0 +1,6 @@ +include *.md +include LICENSE +include authentication/apikey/py.typed +recursive-include tests *.py +recursive-include samples *.py *.md +include authentication/__init__.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/README.md b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/README.md new file mode 100644 index 00000000000..470c235fecd --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/README.md @@ -0,0 +1,43 @@ +# Authentication Api Key With Subdir client library for Python + + +## Getting started + +### Install the package + +```bash +python -m pip install authentication-api-key-with-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 With Subdir instance. + + +## Contributing + +This project welcomes contributions and suggestions. Most contributions require +you to agree to a Contributor License Agreement (CLA) declaring that you have +the right to, and actually do, grant us the rights to use your contribution. +For details, visit https://cla.microsoft.com. + +When you submit a pull request, a CLA-bot will automatically determine whether +you need to provide a CLA and decorate the PR appropriately (e.g., label, +comment). Simply follow the instructions provided by the bot. You will only +need to do this once across all repos using our CLA. + +This project has adopted the +[Microsoft Open Source Code of Conduct][code_of_conduct]. For more information, +see the Code of Conduct FAQ or contact opencode@microsoft.com with any +additional questions or comments. + + +[code_of_conduct]: https://opensource.microsoft.com/codeofconduct/ +[authenticate_with_token]: https://docs.microsoft.com/azure/cognitive-services/authentication?tabs=powershell#authenticate-with-an-authentication-token +[azure_identity_credentials]: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity#credentials +[azure_identity_pip]: https://pypi.org/project/azure-identity/ +[default_azure_credential]: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity#defaultazurecredential +[pip]: https://pypi.org/project/pip/ +[azure_sub]: https://azure.microsoft.com/free/ diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/apiview-properties.json b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/apiview-properties.json new file mode 100644 index 00000000000..b762ef4e8f0 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/apiview-properties.json @@ -0,0 +1,10 @@ +{ + "CrossLanguagePackageId": "Authentication.ApiKey", + "CrossLanguageDefinitionId": { + "authentication.apikey.models.InvalidAuth": "Authentication.ApiKey.InvalidAuth", + "authentication.apikey.ApiKeyClient.valid": "Authentication.ApiKey.valid", + "authentication.apikey.aio.ApiKeyClient.valid": "Authentication.ApiKey.valid", + "authentication.apikey.ApiKeyClient.invalid": "Authentication.ApiKey.invalid", + "authentication.apikey.aio.ApiKeyClient.invalid": "Authentication.ApiKey.invalid" + } +} \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/__init__.py new file mode 100644 index 00000000000..d55ccad1f57 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/__init__.py @@ -0,0 +1 @@ +__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/__init__.py new file mode 100644 index 00000000000..fb55d8ab1df --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/__init__.py @@ -0,0 +1,32 @@ +# 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=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._client import ApiKeyClient # type: ignore +from ._version import VERSION + +__version__ = VERSION + +try: + from ._patch import __all__ as _patch_all + from ._patch import * +except ImportError: + _patch_all = [] +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "ApiKeyClient", +] +__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/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_client.py new file mode 100644 index 00000000000..00fdad5a7e1 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_client.py @@ -0,0 +1,95 @@ +# 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 copy import deepcopy +from typing import Any +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._operations import _ApiKeyClientOperationsMixin +from ._utils.serialization import Deserializer, Serializer + + +class ApiKeyClient(_ApiKeyClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Illustrates clients generated with ApiKey authentication. + + :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 + ) -> None: + _endpoint = "{endpoint}" + self._config = ApiKeyClientConfiguration(credential=credential, endpoint=endpoint, **kwargs) + + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + policies.RequestIdPolicy(**kwargs), + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + self._config.redirect_policy, + self._config.retry_policy, + self._config.authentication_policy, + self._config.custom_hook_policy, + self._config.logging_policy, + policies.DistributedTracingPolicy(**kwargs), + policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, + self._config.http_logging_policy, + ] + self._client: PipelineClient = PipelineClient(base_url=_endpoint, policies=_policies, **kwargs) + + self._serialize = Serializer() + self._deserialize = Deserializer() + self._serialize.client_side_validation = False + + def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse: + """Runs the network request through the client's chained policies. + + >>> from azure.core.rest import HttpRequest + >>> request = HttpRequest("GET", "https://www.example.org/") + + >>> response = client.send_request(request) + + + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request + + :param request: The network request you want to make. Required. + :type request: ~azure.core.rest.HttpRequest + :keyword bool stream: Whether the response payload will be streamed. Defaults to False. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~azure.core.rest.HttpResponse + """ + + request_copy = deepcopy(request) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + + request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + def close(self) -> None: + self._client.close() + + def __enter__(self) -> Self: + self._client.__enter__() + return self + + def __exit__(self, *exc_details: Any) -> None: + self._client.__exit__(*exc_details) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_configuration.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_configuration.py new file mode 100644 index 00000000000..6ae9ebfa0f3 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_configuration.py @@ -0,0 +1,50 @@ +# 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 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. + + 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.") + + self.credential = credential + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "authentication-api-key-with-subdir/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) + self._configure(**kwargs) + + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs) + self.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-with-subdir/subdir/authentication/apikey/_generated/_operations/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/__init__.py new file mode 100644 index 00000000000..933fcd7d1b5 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/__init__.py @@ -0,0 +1,22 @@ +# 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=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [] +__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/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_operations.py new file mode 100644 index 00000000000..104d8af49e3 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_operations.py @@ -0,0 +1,152 @@ +# 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-with-subdir/subdir/authentication/apikey/_generated/_operations/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_patch.py @@ -0,0 +1,21 @@ +# 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. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_patch.py @@ -0,0 +1,21 @@ +# 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. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/__init__.py new file mode 100644 index 00000000000..8026245c2ab --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/__init__.py @@ -0,0 +1,6 @@ +# -------------------------------------------------------------------------- +# 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. +# -------------------------------------------------------------------------- diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/model_base.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/model_base.py new file mode 100644 index 00000000000..49d5c725938 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/model_base.py @@ -0,0 +1,1232 @@ +# pylint: disable=too-many-lines +# 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=protected-access, broad-except + +import copy +import calendar +import decimal +import functools +import sys +import logging +import base64 +import re +import typing +import enum +import email.utils +from datetime import datetime, date, time, timedelta, timezone +from json import JSONEncoder +import xml.etree.ElementTree as ET +from collections.abc import MutableMapping +from typing_extensions import Self +import isodate +from azure.core.exceptions import DeserializationError +from azure.core import CaseInsensitiveEnumMeta +from azure.core.pipeline import PipelineResponse +from azure.core.serialization import _Null + +_LOGGER = logging.getLogger(__name__) + +__all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"] + +TZ_UTC = timezone.utc +_T = typing.TypeVar("_T") + + +def _timedelta_as_isostr(td: timedelta) -> str: + """Converts a datetime.timedelta object into an ISO 8601 formatted string, e.g. 'P4DT12H30M05S' + + Function adapted from the Tin Can Python project: https://github.com/RusticiSoftware/TinCanPython + + :param timedelta td: The timedelta to convert + :rtype: str + :return: ISO8601 version of this timedelta + """ + + # Split seconds to larger units + seconds = td.total_seconds() + minutes, seconds = divmod(seconds, 60) + hours, minutes = divmod(minutes, 60) + days, hours = divmod(hours, 24) + + days, hours, minutes = list(map(int, (days, hours, minutes))) + seconds = round(seconds, 6) + + # Build date + date_str = "" + if days: + date_str = "%sD" % days + + if hours or minutes or seconds: + # Build time + time_str = "T" + + # Hours + bigger_exists = date_str or hours + if bigger_exists: + time_str += "{:02}H".format(hours) + + # Minutes + bigger_exists = bigger_exists or minutes + if bigger_exists: + time_str += "{:02}M".format(minutes) + + # Seconds + try: + if seconds.is_integer(): + seconds_string = "{:02}".format(int(seconds)) + else: + # 9 chars long w/ leading 0, 6 digits after decimal + seconds_string = "%09.6f" % seconds + # Remove trailing zeros + seconds_string = seconds_string.rstrip("0") + except AttributeError: # int.is_integer() raises + seconds_string = "{:02}".format(seconds) + + time_str += "{}S".format(seconds_string) + else: + time_str = "" + + return "P" + date_str + time_str + + +def _serialize_bytes(o, format: typing.Optional[str] = None) -> str: + encoded = base64.b64encode(o).decode() + if format == "base64url": + return encoded.strip("=").replace("+", "-").replace("/", "_") + return encoded + + +def _serialize_datetime(o, format: typing.Optional[str] = None): + if hasattr(o, "year") and hasattr(o, "hour"): + if format == "rfc7231": + return email.utils.format_datetime(o, usegmt=True) + if format == "unix-timestamp": + return int(calendar.timegm(o.utctimetuple())) + + # astimezone() fails for naive times in Python 2.7, so make make sure o is aware (tzinfo is set) + if not o.tzinfo: + iso_formatted = o.replace(tzinfo=TZ_UTC).isoformat() + else: + iso_formatted = o.astimezone(TZ_UTC).isoformat() + # Replace the trailing "+00:00" UTC offset with "Z" (RFC 3339: https://www.ietf.org/rfc/rfc3339.txt) + return iso_formatted.replace("+00:00", "Z") + # Next try datetime.date or datetime.time + return o.isoformat() + + +def _is_readonly(p): + try: + return p._visibility == ["read"] + except AttributeError: + return False + + +class SdkJSONEncoder(JSONEncoder): + """A JSON encoder that's capable of serializing datetime objects and bytes.""" + + def __init__(self, *args, exclude_readonly: bool = False, format: typing.Optional[str] = None, **kwargs): + super().__init__(*args, **kwargs) + self.exclude_readonly = exclude_readonly + self.format = format + + def default(self, o): # pylint: disable=too-many-return-statements + if _is_model(o): + if self.exclude_readonly: + readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)] + return {k: v for k, v in o.items() if k not in readonly_props} + return dict(o.items()) + try: + return super(SdkJSONEncoder, self).default(o) + except TypeError: + if isinstance(o, _Null): + return None + if isinstance(o, decimal.Decimal): + return float(o) + if isinstance(o, (bytes, bytearray)): + return _serialize_bytes(o, self.format) + try: + # First try datetime.datetime + return _serialize_datetime(o, self.format) + except AttributeError: + pass + # Last, try datetime.timedelta + try: + return _timedelta_as_isostr(o) + except AttributeError: + # This will be raised when it hits value.total_seconds in the method above + pass + return super(SdkJSONEncoder, self).default(o) + + +_VALID_DATE = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" + r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") +_VALID_RFC7231 = re.compile( + r"(Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s\d{2}\s" + r"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d{4}\s\d{2}:\d{2}:\d{2}\sGMT" +) + + +def _deserialize_datetime(attr: typing.Union[str, datetime]) -> datetime: + """Deserialize ISO-8601 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :rtype: ~datetime.datetime + :returns: The datetime object from that input + """ + if isinstance(attr, datetime): + # i'm already deserialized + return attr + attr = attr.upper() + match = _VALID_DATE.match(attr) + if not match: + raise ValueError("Invalid datetime string: " + attr) + + check_decimal = attr.split(".") + if len(check_decimal) > 1: + decimal_str = "" + for digit in check_decimal[1]: + if digit.isdigit(): + decimal_str += digit + else: + break + if len(decimal_str) > 6: + attr = attr.replace(decimal_str, decimal_str[0:6]) + + date_obj = isodate.parse_datetime(attr) + test_utc = date_obj.utctimetuple() + if test_utc.tm_year > 9999 or test_utc.tm_year < 1: + raise OverflowError("Hit max or min date") + return date_obj + + +def _deserialize_datetime_rfc7231(attr: typing.Union[str, datetime]) -> datetime: + """Deserialize RFC7231 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :rtype: ~datetime.datetime + :returns: The datetime object from that input + """ + if isinstance(attr, datetime): + # i'm already deserialized + return attr + match = _VALID_RFC7231.match(attr) + if not match: + raise ValueError("Invalid datetime string: " + attr) + + return email.utils.parsedate_to_datetime(attr) + + +def _deserialize_datetime_unix_timestamp(attr: typing.Union[float, datetime]) -> datetime: + """Deserialize unix timestamp into Datetime object. + + :param str attr: response string to be deserialized. + :rtype: ~datetime.datetime + :returns: The datetime object from that input + """ + if isinstance(attr, datetime): + # i'm already deserialized + return attr + return datetime.fromtimestamp(attr, TZ_UTC) + + +def _deserialize_date(attr: typing.Union[str, date]) -> date: + """Deserialize ISO-8601 formatted string into Date object. + :param str attr: response string to be deserialized. + :rtype: date + :returns: The date object from that input + """ + # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. + if isinstance(attr, date): + return attr + return isodate.parse_date(attr, defaultmonth=None, defaultday=None) # type: ignore + + +def _deserialize_time(attr: typing.Union[str, time]) -> time: + """Deserialize ISO-8601 formatted string into time object. + + :param str attr: response string to be deserialized. + :rtype: datetime.time + :returns: The time object from that input + """ + if isinstance(attr, time): + return attr + return isodate.parse_time(attr) + + +def _deserialize_bytes(attr): + if isinstance(attr, (bytes, bytearray)): + return attr + return bytes(base64.b64decode(attr)) + + +def _deserialize_bytes_base64(attr): + if isinstance(attr, (bytes, bytearray)): + return attr + padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore + attr = attr + padding # type: ignore + encoded = attr.replace("-", "+").replace("_", "/") + return bytes(base64.b64decode(encoded)) + + +def _deserialize_duration(attr): + if isinstance(attr, timedelta): + return attr + return isodate.parse_duration(attr) + + +def _deserialize_decimal(attr): + if isinstance(attr, decimal.Decimal): + return attr + return decimal.Decimal(str(attr)) + + +def _deserialize_int_as_str(attr): + if isinstance(attr, int): + return attr + return int(attr) + + +_DESERIALIZE_MAPPING = { + datetime: _deserialize_datetime, + date: _deserialize_date, + time: _deserialize_time, + bytes: _deserialize_bytes, + bytearray: _deserialize_bytes, + timedelta: _deserialize_duration, + typing.Any: lambda x: x, + decimal.Decimal: _deserialize_decimal, +} + +_DESERIALIZE_MAPPING_WITHFORMAT = { + "rfc3339": _deserialize_datetime, + "rfc7231": _deserialize_datetime_rfc7231, + "unix-timestamp": _deserialize_datetime_unix_timestamp, + "base64": _deserialize_bytes, + "base64url": _deserialize_bytes_base64, +} + + +def get_deserializer(annotation: typing.Any, rf: typing.Optional["_RestField"] = None): + if annotation is int and rf and rf._format == "str": + return _deserialize_int_as_str + if rf and rf._format: + return _DESERIALIZE_MAPPING_WITHFORMAT.get(rf._format) + return _DESERIALIZE_MAPPING.get(annotation) # pyright: ignore + + +def _get_type_alias_type(module_name: str, alias_name: str): + types = { + k: v + for k, v in sys.modules[module_name].__dict__.items() + if isinstance(v, typing._GenericAlias) # type: ignore + } + if alias_name not in types: + return alias_name + return types[alias_name] + + +def _get_model(module_name: str, model_name: str): + models = {k: v for k, v in sys.modules[module_name].__dict__.items() if isinstance(v, type)} + module_end = module_name.rsplit(".", 1)[0] + models.update({k: v for k, v in sys.modules[module_end].__dict__.items() if isinstance(v, type)}) + if isinstance(model_name, str): + model_name = model_name.split(".")[-1] + if model_name not in models: + return model_name + return models[model_name] + + +_UNSET = object() + + +class _MyMutableMapping(MutableMapping[str, typing.Any]): + def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + self._data = data + + def __contains__(self, key: typing.Any) -> bool: + return key in self._data + + def __getitem__(self, key: str) -> typing.Any: + return self._data.__getitem__(key) + + def __setitem__(self, key: str, value: typing.Any) -> None: + self._data.__setitem__(key, value) + + def __delitem__(self, key: str) -> None: + self._data.__delitem__(key) + + def __iter__(self) -> typing.Iterator[typing.Any]: + return self._data.__iter__() + + def __len__(self) -> int: + return self._data.__len__() + + def __ne__(self, other: typing.Any) -> bool: + return not self.__eq__(other) + + def keys(self) -> typing.KeysView[str]: + """ + :returns: a set-like object providing a view on D's keys + :rtype: ~typing.KeysView + """ + return self._data.keys() + + def values(self) -> typing.ValuesView[typing.Any]: + """ + :returns: an object providing a view on D's values + :rtype: ~typing.ValuesView + """ + return self._data.values() + + def items(self) -> typing.ItemsView[str, typing.Any]: + """ + :returns: set-like object providing a view on D's items + :rtype: ~typing.ItemsView + """ + return self._data.items() + + def get(self, key: str, default: typing.Any = None) -> typing.Any: + """ + Get the value for key if key is in the dictionary, else default. + :param str key: The key to look up. + :param any default: The value to return if key is not in the dictionary. Defaults to None + :returns: D[k] if k in D, else d. + :rtype: any + """ + try: + return self[key] + except KeyError: + return default + + @typing.overload + def pop(self, key: str) -> typing.Any: ... # pylint: disable=arguments-differ + + @typing.overload + def pop(self, key: str, default: _T) -> _T: ... # pylint: disable=signature-differs + + @typing.overload + def pop(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs + + def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: + """ + Removes specified key and return the corresponding value. + :param str key: The key to pop. + :param any default: The value to return if key is not in the dictionary + :returns: The value corresponding to the key. + :rtype: any + :raises KeyError: If key is not found and default is not given. + """ + if default is _UNSET: + return self._data.pop(key) + return self._data.pop(key, default) + + def popitem(self) -> typing.Tuple[str, typing.Any]: + """ + Removes and returns some (key, value) pair + :returns: The (key, value) pair. + :rtype: tuple + :raises KeyError: if D is empty. + """ + return self._data.popitem() + + def clear(self) -> None: + """ + Remove all items from D. + """ + self._data.clear() + + def update(self, *args: typing.Any, **kwargs: typing.Any) -> None: # pylint: disable=arguments-differ + """ + Updates D from mapping/iterable E and F. + :param any args: Either a mapping object or an iterable of key-value pairs. + """ + self._data.update(*args, **kwargs) + + @typing.overload + def setdefault(self, key: str, default: None = None) -> None: ... + + @typing.overload + def setdefault(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs + + def setdefault(self, key: str, default: typing.Any = _UNSET) -> typing.Any: + """ + Same as calling D.get(k, d), and setting D[k]=d if k not found + :param str key: The key to look up. + :param any default: The value to set if key is not in the dictionary + :returns: D[k] if k in D, else d. + :rtype: any + """ + if default is _UNSET: + return self._data.setdefault(key) + return self._data.setdefault(key, default) + + def __eq__(self, other: typing.Any) -> bool: + try: + other_model = self.__class__(other) + except Exception: + return False + return self._data == other_model._data + + def __repr__(self) -> str: + return str(self._data) + + +def _is_model(obj: typing.Any) -> bool: + return getattr(obj, "_is_model", False) + + +def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-many-return-statements + if isinstance(o, list): + return [_serialize(x, format) for x in o] + if isinstance(o, dict): + return {k: _serialize(v, format) for k, v in o.items()} + if isinstance(o, set): + return {_serialize(x, format) for x in o} + if isinstance(o, tuple): + return tuple(_serialize(x, format) for x in o) + if isinstance(o, (bytes, bytearray)): + return _serialize_bytes(o, format) + if isinstance(o, decimal.Decimal): + return float(o) + if isinstance(o, enum.Enum): + return o.value + if isinstance(o, int): + if format == "str": + return str(o) + return o + try: + # First try datetime.datetime + return _serialize_datetime(o, format) + except AttributeError: + pass + # Last, try datetime.timedelta + try: + return _timedelta_as_isostr(o) + except AttributeError: + # This will be raised when it hits value.total_seconds in the method above + pass + return o + + +def _get_rest_field( + attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str +) -> typing.Optional["_RestField"]: + try: + return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) + except StopIteration: + return None + + +def _create_value(rf: typing.Optional["_RestField"], value: typing.Any) -> typing.Any: + if not rf: + return _serialize(value, None) + if rf._is_multipart_file_input: + return value + if rf._is_model: + return _deserialize(rf._type, value) + if isinstance(value, ET.Element): + value = _deserialize(rf._type, value) + return _serialize(value, rf._format) + + +class Model(_MyMutableMapping): + _is_model = True + # label whether current class's _attr_to_rest_field has been calculated + # could not see _attr_to_rest_field directly because subclass inherits it from parent class + _calculated: typing.Set[str] = set() + + def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: + class_name = self.__class__.__name__ + if len(args) > 1: + raise TypeError(f"{class_name}.__init__() takes 2 positional arguments but {len(args) + 1} were given") + dict_to_pass = { + rest_field._rest_name: rest_field._default + for rest_field in self._attr_to_rest_field.values() + if rest_field._default is not _UNSET + } + if args: # pylint: disable=too-many-nested-blocks + if isinstance(args[0], ET.Element): + existed_attr_keys = [] + model_meta = getattr(self, "_xml", {}) + + for rf in self._attr_to_rest_field.values(): + prop_meta = getattr(rf, "_xml", {}) + xml_name = prop_meta.get("name", rf._rest_name) + xml_ns = prop_meta.get("ns", model_meta.get("ns", None)) + if xml_ns: + xml_name = "{" + xml_ns + "}" + xml_name + + # attribute + if prop_meta.get("attribute", False) and args[0].get(xml_name) is not None: + existed_attr_keys.append(xml_name) + dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].get(xml_name)) + continue + + # unwrapped element is array + if prop_meta.get("unwrapped", False): + # unwrapped array could either use prop items meta/prop meta + if prop_meta.get("itemsName"): + xml_name = prop_meta.get("itemsName") + xml_ns = prop_meta.get("itemNs") + if xml_ns: + xml_name = "{" + xml_ns + "}" + xml_name + items = args[0].findall(xml_name) # pyright: ignore + if len(items) > 0: + existed_attr_keys.append(xml_name) + dict_to_pass[rf._rest_name] = _deserialize(rf._type, items) + continue + + # text element is primitive type + if prop_meta.get("text", False): + if args[0].text is not None: + dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].text) + continue + + # wrapped element could be normal property or array, it should only have one element + item = args[0].find(xml_name) + if item is not None: + existed_attr_keys.append(xml_name) + dict_to_pass[rf._rest_name] = _deserialize(rf._type, item) + + # rest thing is additional properties + for e in args[0]: + if e.tag not in existed_attr_keys: + dict_to_pass[e.tag] = _convert_element(e) + else: + dict_to_pass.update( + {k: _create_value(_get_rest_field(self._attr_to_rest_field, k), v) for k, v in args[0].items()} + ) + else: + non_attr_kwargs = [k for k in kwargs if k not in self._attr_to_rest_field] + if non_attr_kwargs: + # actual type errors only throw the first wrong keyword arg they see, so following that. + raise TypeError(f"{class_name}.__init__() got an unexpected keyword argument '{non_attr_kwargs[0]}'") + dict_to_pass.update( + { + self._attr_to_rest_field[k]._rest_name: _create_value(self._attr_to_rest_field[k], v) + for k, v in kwargs.items() + if v is not None + } + ) + super().__init__(dict_to_pass) + + def copy(self) -> "Model": + return Model(self.__dict__) + + def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: + if f"{cls.__module__}.{cls.__qualname__}" not in cls._calculated: + # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', + # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' + mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order + attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") + } + annotations = { + k: v + for mro_class in mros + if hasattr(mro_class, "__annotations__") + for k, v in mro_class.__annotations__.items() + } + for attr, rf in attr_to_rest_field.items(): + rf._module = cls.__module__ + if not rf._type: + rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) + if not rf._rest_name_input: + rf._rest_name_input = attr + cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") + + return super().__new__(cls) + + def __init_subclass__(cls, discriminator: typing.Optional[str] = None) -> None: + for base in cls.__bases__: + if hasattr(base, "__mapping__"): + base.__mapping__[discriminator or cls.__name__] = cls # type: ignore + + @classmethod + def _get_discriminator(cls, exist_discriminators) -> typing.Optional["_RestField"]: + for v in cls.__dict__.values(): + if isinstance(v, _RestField) and v._is_discriminator and v._rest_name not in exist_discriminators: + return v + return None + + @classmethod + def _deserialize(cls, data, exist_discriminators): + if not hasattr(cls, "__mapping__"): + return cls(data) + discriminator = cls._get_discriminator(exist_discriminators) + if discriminator is None: + return cls(data) + exist_discriminators.append(discriminator._rest_name) + if isinstance(data, ET.Element): + model_meta = getattr(cls, "_xml", {}) + prop_meta = getattr(discriminator, "_xml", {}) + xml_name = prop_meta.get("name", discriminator._rest_name) + xml_ns = prop_meta.get("ns", model_meta.get("ns", None)) + if xml_ns: + xml_name = "{" + xml_ns + "}" + xml_name + + if data.get(xml_name) is not None: + discriminator_value = data.get(xml_name) + else: + discriminator_value = data.find(xml_name).text # pyright: ignore + else: + discriminator_value = data.get(discriminator._rest_name) + mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member + return mapped_cls._deserialize(data, exist_discriminators) + + def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + """Return a dict that can be turned into json using json.dump. + + :keyword bool exclude_readonly: Whether to remove the readonly properties. + :returns: A dict JSON compatible object + :rtype: dict + """ + + result = {} + readonly_props = [] + if exclude_readonly: + readonly_props = [p._rest_name for p in self._attr_to_rest_field.values() if _is_readonly(p)] + for k, v in self.items(): + if exclude_readonly and k in readonly_props: # pyright: ignore + continue + is_multipart_file_input = False + try: + is_multipart_file_input = next( + rf for rf in self._attr_to_rest_field.values() if rf._rest_name == k + )._is_multipart_file_input + except StopIteration: + pass + result[k] = v if is_multipart_file_input else Model._as_dict_value(v, exclude_readonly=exclude_readonly) + return result + + @staticmethod + def _as_dict_value(v: typing.Any, exclude_readonly: bool = False) -> typing.Any: + if v is None or isinstance(v, _Null): + return None + if isinstance(v, (list, tuple, set)): + return type(v)(Model._as_dict_value(x, exclude_readonly=exclude_readonly) for x in v) + if isinstance(v, dict): + return {dk: Model._as_dict_value(dv, exclude_readonly=exclude_readonly) for dk, dv in v.items()} + return v.as_dict(exclude_readonly=exclude_readonly) if hasattr(v, "as_dict") else v + + +def _deserialize_model(model_deserializer: typing.Optional[typing.Callable], obj): + if _is_model(obj): + return obj + return _deserialize(model_deserializer, obj) + + +def _deserialize_with_optional(if_obj_deserializer: typing.Optional[typing.Callable], obj): + if obj is None: + return obj + return _deserialize_with_callable(if_obj_deserializer, obj) + + +def _deserialize_with_union(deserializers, obj): + for deserializer in deserializers: + try: + return _deserialize(deserializer, obj) + except DeserializationError: + pass + raise DeserializationError() + + +def _deserialize_dict( + value_deserializer: typing.Optional[typing.Callable], + module: typing.Optional[str], + obj: typing.Dict[typing.Any, typing.Any], +): + if obj is None: + return obj + if isinstance(obj, ET.Element): + obj = {child.tag: child for child in obj} + return {k: _deserialize(value_deserializer, v, module) for k, v in obj.items()} + + +def _deserialize_multiple_sequence( + entry_deserializers: typing.List[typing.Optional[typing.Callable]], + module: typing.Optional[str], + obj, +): + if obj is None: + return obj + return type(obj)(_deserialize(deserializer, entry, module) for entry, deserializer in zip(obj, entry_deserializers)) + + +def _deserialize_sequence( + deserializer: typing.Optional[typing.Callable], + module: typing.Optional[str], + obj, +): + if obj is None: + return obj + if isinstance(obj, ET.Element): + obj = list(obj) + return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) + + +def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: + return sorted( + types, + key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), + ) + + +def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-return-statements, too-many-branches + annotation: typing.Any, + module: typing.Optional[str], + rf: typing.Optional["_RestField"] = None, +) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]: + if not annotation: + return None + + # is it a type alias? + if isinstance(annotation, str): + if module is not None: + annotation = _get_type_alias_type(module, annotation) + + # is it a forward ref / in quotes? + if isinstance(annotation, (str, typing.ForwardRef)): + try: + model_name = annotation.__forward_arg__ # type: ignore + except AttributeError: + model_name = annotation + if module is not None: + annotation = _get_model(module, model_name) # type: ignore + + try: + if module and _is_model(annotation): + if rf: + rf._is_model = True + + return functools.partial(_deserialize_model, annotation) # pyright: ignore + except Exception: + pass + + # is it a literal? + try: + if annotation.__origin__ is typing.Literal: # pyright: ignore + return None + except AttributeError: + pass + + # is it optional? + try: + if any(a for a in annotation.__args__ if a == type(None)): # pyright: ignore + if len(annotation.__args__) <= 2: # pyright: ignore + if_obj_deserializer = _get_deserialize_callable_from_annotation( + next(a for a in annotation.__args__ if a != type(None)), module, rf # pyright: ignore + ) + + return functools.partial(_deserialize_with_optional, if_obj_deserializer) + # the type is Optional[Union[...]], we need to remove the None type from the Union + annotation_copy = copy.copy(annotation) + annotation_copy.__args__ = [a for a in annotation_copy.__args__ if a != type(None)] # pyright: ignore + return _get_deserialize_callable_from_annotation(annotation_copy, module, rf) + except AttributeError: + pass + + # is it union? + if getattr(annotation, "__origin__", None) is typing.Union: + # initial ordering is we make `string` the last deserialization option, because it is often them most generic + deserializers = [ + _get_deserialize_callable_from_annotation(arg, module, rf) + for arg in _sorted_annotations(annotation.__args__) # pyright: ignore + ] + + return functools.partial(_deserialize_with_union, deserializers) + + try: + if annotation._name == "Dict": # pyright: ignore + value_deserializer = _get_deserialize_callable_from_annotation( + annotation.__args__[1], module, rf # pyright: ignore + ) + + return functools.partial( + _deserialize_dict, + value_deserializer, + module, + ) + except (AttributeError, IndexError): + pass + try: + if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if len(annotation.__args__) > 1: # pyright: ignore + entry_deserializers = [ + _get_deserialize_callable_from_annotation(dt, module, rf) + for dt in annotation.__args__ # pyright: ignore + ] + return functools.partial(_deserialize_multiple_sequence, entry_deserializers, module) + deserializer = _get_deserialize_callable_from_annotation( + annotation.__args__[0], module, rf # pyright: ignore + ) + + return functools.partial(_deserialize_sequence, deserializer, module) + except (TypeError, IndexError, AttributeError, SyntaxError): + pass + + def _deserialize_default( + deserializer, + obj, + ): + if obj is None: + return obj + try: + return _deserialize_with_callable(deserializer, obj) + except Exception: + pass + return obj + + if get_deserializer(annotation, rf): + return functools.partial(_deserialize_default, get_deserializer(annotation, rf)) + + return functools.partial(_deserialize_default, annotation) + + +def _deserialize_with_callable( + deserializer: typing.Optional[typing.Callable[[typing.Any], typing.Any]], + value: typing.Any, +): # pylint: disable=too-many-return-statements + try: + if value is None or isinstance(value, _Null): + return None + if isinstance(value, ET.Element): + if deserializer is str: + return value.text or "" + if deserializer is int: + return int(value.text) if value.text else None + if deserializer is float: + return float(value.text) if value.text else None + if deserializer is bool: + return value.text == "true" if value.text else None + if deserializer is None: + return value + if deserializer in [int, float, bool]: + return deserializer(value) + if isinstance(deserializer, CaseInsensitiveEnumMeta): + try: + return deserializer(value) + except ValueError: + # for unknown value, return raw value + return value + if isinstance(deserializer, type) and issubclass(deserializer, Model): + return deserializer._deserialize(value, []) + return typing.cast(typing.Callable[[typing.Any], typing.Any], deserializer)(value) + except Exception as e: + raise DeserializationError() from e + + +def _deserialize( + deserializer: typing.Any, + value: typing.Any, + module: typing.Optional[str] = None, + rf: typing.Optional["_RestField"] = None, + format: typing.Optional[str] = None, +) -> typing.Any: + if isinstance(value, PipelineResponse): + value = value.http_response.json() + if rf is None and format: + rf = _RestField(format=format) + if not isinstance(deserializer, functools.partial): + deserializer = _get_deserialize_callable_from_annotation(deserializer, module, rf) + return _deserialize_with_callable(deserializer, value) + + +def _failsafe_deserialize( + deserializer: typing.Any, + value: typing.Any, + module: typing.Optional[str] = None, + rf: typing.Optional["_RestField"] = None, + format: typing.Optional[str] = None, +) -> typing.Any: + try: + return _deserialize(deserializer, value, module, rf, format) + except DeserializationError: + _LOGGER.warning( + "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True + ) + return None + + +def _failsafe_deserialize_xml( + deserializer: typing.Any, + value: typing.Any, +) -> typing.Any: + try: + return _deserialize_xml(deserializer, value) + except DeserializationError: + _LOGGER.warning( + "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True + ) + return None + + +class _RestField: + def __init__( + self, + *, + name: typing.Optional[str] = None, + type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin + is_discriminator: bool = False, + visibility: typing.Optional[typing.List[str]] = None, + default: typing.Any = _UNSET, + format: typing.Optional[str] = None, + is_multipart_file_input: bool = False, + xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + ): + self._type = type + self._rest_name_input = name + self._module: typing.Optional[str] = None + self._is_discriminator = is_discriminator + self._visibility = visibility + self._is_model = False + self._default = default + self._format = format + self._is_multipart_file_input = is_multipart_file_input + self._xml = xml if xml is not None else {} + + @property + def _class_type(self) -> typing.Any: + return getattr(self._type, "args", [None])[0] + + @property + def _rest_name(self) -> str: + if self._rest_name_input is None: + raise ValueError("Rest name was never set") + return self._rest_name_input + + def __get__(self, obj: Model, type=None): # pylint: disable=redefined-builtin + # by this point, type and rest_name will have a value bc we default + # them in __new__ of the Model class + item = obj.get(self._rest_name) + if item is None: + return item + if self._is_model: + return item + return _deserialize(self._type, _serialize(item, self._format), rf=self) + + def __set__(self, obj: Model, value) -> None: + if value is None: + # we want to wipe out entries if users set attr to None + try: + obj.__delitem__(self._rest_name) + except KeyError: + pass + return + if self._is_model: + if not _is_model(value): + value = _deserialize(self._type, value) + obj.__setitem__(self._rest_name, value) + return + obj.__setitem__(self._rest_name, _serialize(value, self._format)) + + def _get_deserialize_callable_from_annotation( + self, annotation: typing.Any + ) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]: + return _get_deserialize_callable_from_annotation(annotation, self._module, self) + + +def rest_field( + *, + name: typing.Optional[str] = None, + type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin + visibility: typing.Optional[typing.List[str]] = None, + default: typing.Any = _UNSET, + format: typing.Optional[str] = None, + is_multipart_file_input: bool = False, + xml: typing.Optional[typing.Dict[str, typing.Any]] = None, +) -> typing.Any: + return _RestField( + name=name, + type=type, + visibility=visibility, + default=default, + format=format, + is_multipart_file_input=is_multipart_file_input, + xml=xml, + ) + + +def rest_discriminator( + *, + name: typing.Optional[str] = None, + type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin + visibility: typing.Optional[typing.List[str]] = None, + xml: typing.Optional[typing.Dict[str, typing.Any]] = None, +) -> typing.Any: + return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) + + +def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: + """Serialize a model to XML. + + :param Model model: The model to serialize. + :param bool exclude_readonly: Whether to exclude readonly properties. + :returns: The XML representation of the model. + :rtype: str + """ + return ET.tostring(_get_element(model, exclude_readonly), encoding="unicode") # type: ignore + + +def _get_element( + o: typing.Any, + exclude_readonly: bool = False, + parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + wrapped_element: typing.Optional[ET.Element] = None, +) -> typing.Union[ET.Element, typing.List[ET.Element]]: + if _is_model(o): + model_meta = getattr(o, "_xml", {}) + + # if prop is a model, then use the prop element directly, else generate a wrapper of model + if wrapped_element is None: + wrapped_element = _create_xml_element( + model_meta.get("name", o.__class__.__name__), + model_meta.get("prefix"), + model_meta.get("ns"), + ) + + readonly_props = [] + if exclude_readonly: + readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)] + + for k, v in o.items(): + # do not serialize readonly properties + if exclude_readonly and k in readonly_props: + continue + + prop_rest_field = _get_rest_field(o._attr_to_rest_field, k) + if prop_rest_field: + prop_meta = getattr(prop_rest_field, "_xml").copy() + # use the wire name as xml name if no specific name is set + if prop_meta.get("name") is None: + prop_meta["name"] = k + else: + # additional properties will not have rest field, use the wire name as xml name + prop_meta = {"name": k} + + # if no ns for prop, use model's + if prop_meta.get("ns") is None and model_meta.get("ns"): + prop_meta["ns"] = model_meta.get("ns") + prop_meta["prefix"] = model_meta.get("prefix") + + if prop_meta.get("unwrapped", False): + # unwrapped could only set on array + wrapped_element.extend(_get_element(v, exclude_readonly, prop_meta)) + elif prop_meta.get("text", False): + # text could only set on primitive type + wrapped_element.text = _get_primitive_type_value(v) + elif prop_meta.get("attribute", False): + xml_name = prop_meta.get("name", k) + if prop_meta.get("ns"): + ET.register_namespace(prop_meta.get("prefix"), prop_meta.get("ns")) # pyright: ignore + xml_name = "{" + prop_meta.get("ns") + "}" + xml_name # pyright: ignore + # attribute should be primitive type + wrapped_element.set(xml_name, _get_primitive_type_value(v)) + else: + # other wrapped prop element + wrapped_element.append(_get_wrapped_element(v, exclude_readonly, prop_meta)) + return wrapped_element + if isinstance(o, list): + return [_get_element(x, exclude_readonly, parent_meta) for x in o] # type: ignore + if isinstance(o, dict): + result = [] + for k, v in o.items(): + result.append( + _get_wrapped_element( + v, + exclude_readonly, + { + "name": k, + "ns": parent_meta.get("ns") if parent_meta else None, + "prefix": parent_meta.get("prefix") if parent_meta else None, + }, + ) + ) + return result + + # primitive case need to create element based on parent_meta + if parent_meta: + return _get_wrapped_element( + o, + exclude_readonly, + { + "name": parent_meta.get("itemsName", parent_meta.get("name")), + "prefix": parent_meta.get("itemsPrefix", parent_meta.get("prefix")), + "ns": parent_meta.get("itemsNs", parent_meta.get("ns")), + }, + ) + + raise ValueError("Could not serialize value into xml: " + o) + + +def _get_wrapped_element( + v: typing.Any, + exclude_readonly: bool, + meta: typing.Optional[typing.Dict[str, typing.Any]], +) -> ET.Element: + wrapped_element = _create_xml_element( + meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None + ) + if isinstance(v, (dict, list)): + wrapped_element.extend(_get_element(v, exclude_readonly, meta)) + elif _is_model(v): + _get_element(v, exclude_readonly, meta, wrapped_element) + else: + wrapped_element.text = _get_primitive_type_value(v) + return wrapped_element + + +def _get_primitive_type_value(v) -> str: + if v is True: + return "true" + if v is False: + return "false" + if isinstance(v, _Null): + return "" + return str(v) + + +def _create_xml_element(tag, prefix=None, ns=None): + if prefix and ns: + ET.register_namespace(prefix, ns) + if ns: + return ET.Element("{" + ns + "}" + tag) + return ET.Element(tag) + + +def _deserialize_xml( + deserializer: typing.Any, + value: str, +) -> typing.Any: + element = ET.fromstring(value) # nosec + return _deserialize(deserializer, element) + + +def _convert_element(e: ET.Element): + # dict case + if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: + dict_result: typing.Dict[str, typing.Any] = {} + for child in e: + if dict_result.get(child.tag) is not None: + if isinstance(dict_result[child.tag], list): + dict_result[child.tag].append(_convert_element(child)) + else: + dict_result[child.tag] = [dict_result[child.tag], _convert_element(child)] + else: + dict_result[child.tag] = _convert_element(child) + dict_result.update(e.attrib) + return dict_result + # array case + if len(e) > 0: + array_result: typing.List[typing.Any] = [] + for child in e: + array_result.append(_convert_element(child)) + return array_result + # primitive case + return e.text diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/serialization.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/serialization.py new file mode 100644 index 00000000000..eb86ea23c96 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/serialization.py @@ -0,0 +1,2032 @@ +# pylint: disable=line-too-long,useless-suppression,too-many-lines +# 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. +# -------------------------------------------------------------------------- + +# pyright: reportUnnecessaryTypeIgnoreComment=false + +from base64 import b64decode, b64encode +import calendar +import datetime +import decimal +import email +from enum import Enum +import json +import logging +import re +import sys +import codecs +from typing import ( + Dict, + Any, + cast, + Optional, + Union, + AnyStr, + IO, + Mapping, + Callable, + MutableMapping, + List, +) + +try: + from urllib import quote # type: ignore +except ImportError: + from urllib.parse import quote +import xml.etree.ElementTree as ET + +import isodate # type: ignore +from typing_extensions import Self + +from azure.core.exceptions import DeserializationError, SerializationError +from azure.core.serialization import NULL as CoreNull + +_BOM = codecs.BOM_UTF8.decode(encoding="utf-8") + +JSON = MutableMapping[str, Any] + + +class RawDeserializer: + + # Accept "text" because we're open minded people... + JSON_REGEXP = re.compile(r"^(application|text)/([a-z+.]+\+)?json$") + + # Name used in context + CONTEXT_NAME = "deserialized_data" + + @classmethod + def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type: Optional[str] = None) -> Any: + """Decode data according to content-type. + + Accept a stream of data as well, but will be load at once in memory for now. + + If no content-type, will return the string version (not bytes, not stream) + + :param data: Input, could be bytes or stream (will be decoded with UTF8) or text + :type data: str or bytes or IO + :param str content_type: The content type. + :return: The deserialized data. + :rtype: object + """ + if hasattr(data, "read"): + # Assume a stream + data = cast(IO, data).read() + + if isinstance(data, bytes): + data_as_str = data.decode(encoding="utf-8-sig") + else: + # Explain to mypy the correct type. + data_as_str = cast(str, data) + + # Remove Byte Order Mark if present in string + data_as_str = data_as_str.lstrip(_BOM) + + if content_type is None: + return data + + if cls.JSON_REGEXP.match(content_type): + try: + return json.loads(data_as_str) + except ValueError as err: + raise DeserializationError("JSON is invalid: {}".format(err), err) from err + elif "xml" in (content_type or []): + try: + + try: + if isinstance(data, unicode): # type: ignore + # If I'm Python 2.7 and unicode XML will scream if I try a "fromstring" on unicode string + data_as_str = data_as_str.encode(encoding="utf-8") # type: ignore + except NameError: + pass + + return ET.fromstring(data_as_str) # nosec + except ET.ParseError as err: + # It might be because the server has an issue, and returned JSON with + # content-type XML.... + # So let's try a JSON load, and if it's still broken + # let's flow the initial exception + def _json_attemp(data): + try: + return True, json.loads(data) + except ValueError: + return False, None # Don't care about this one + + success, json_result = _json_attemp(data) + if success: + return json_result + # If i'm here, it's not JSON, it's not XML, let's scream + # and raise the last context in this block (the XML exception) + # The function hack is because Py2.7 messes up with exception + # context otherwise. + _LOGGER.critical("Wasn't XML not JSON, failing") + raise DeserializationError("XML is invalid") from err + elif content_type.startswith("text/"): + return data_as_str + raise DeserializationError("Cannot deserialize content-type: {}".format(content_type)) + + @classmethod + def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], headers: Mapping) -> Any: + """Deserialize from HTTP response. + + Use bytes and headers to NOT use any requests/aiohttp or whatever + specific implementation. + Headers will tested for "content-type" + + :param bytes body_bytes: The body of the response. + :param dict headers: The headers of the response. + :returns: The deserialized data. + :rtype: object + """ + # Try to use content-type from headers if available + content_type = None + if "content-type" in headers: + content_type = headers["content-type"].split(";")[0].strip().lower() + # Ouch, this server did not declare what it sent... + # Let's guess it's JSON... + # Also, since Autorest was considering that an empty body was a valid JSON, + # need that test as well.... + else: + content_type = "application/json" + + if body_bytes: + return cls.deserialize_from_text(body_bytes, content_type) + return None + + +_LOGGER = logging.getLogger(__name__) + +try: + _long_type = long # type: ignore +except NameError: + _long_type = int + +TZ_UTC = datetime.timezone.utc + +_FLATTEN = re.compile(r"(? None: + self.additional_properties: Optional[Dict[str, Any]] = {} + for k in kwargs: # pylint: disable=consider-using-dict-items + if k not in self._attribute_map: + _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) + elif k in self._validation and self._validation[k].get("readonly", False): + _LOGGER.warning("Readonly attribute %s will be ignored in class %s", k, self.__class__) + else: + setattr(self, k, kwargs[k]) + + def __eq__(self, other: Any) -> bool: + """Compare objects by comparing all attributes. + + :param object other: The object to compare + :returns: True if objects are equal + :rtype: bool + """ + if isinstance(other, self.__class__): + return self.__dict__ == other.__dict__ + return False + + def __ne__(self, other: Any) -> bool: + """Compare objects by comparing all attributes. + + :param object other: The object to compare + :returns: True if objects are not equal + :rtype: bool + """ + return not self.__eq__(other) + + def __str__(self) -> str: + return str(self.__dict__) + + @classmethod + def enable_additional_properties_sending(cls) -> None: + cls._attribute_map["additional_properties"] = {"key": "", "type": "{object}"} + + @classmethod + def is_xml_model(cls) -> bool: + try: + cls._xml_map # type: ignore + except AttributeError: + return False + return True + + @classmethod + def _create_xml_node(cls): + """Create XML node. + + :returns: The XML node + :rtype: xml.etree.ElementTree.Element + """ + try: + xml_map = cls._xml_map # type: ignore + except AttributeError: + xml_map = {} + + return _create_xml_node(xml_map.get("name", cls.__name__), xml_map.get("prefix", None), xml_map.get("ns", None)) + + def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: + """Return the JSON that would be sent to server from this model. + + This is an alias to `as_dict(full_restapi_key_transformer, keep_readonly=False)`. + + If you want XML serialization, you can pass the kwargs is_xml=True. + + :param bool keep_readonly: If you want to serialize the readonly attributes + :returns: A dict JSON compatible object + :rtype: dict + """ + serializer = Serializer(self._infer_class_models()) + return serializer._serialize( # type: ignore # pylint: disable=protected-access + self, keep_readonly=keep_readonly, **kwargs + ) + + def as_dict( + self, + keep_readonly: bool = True, + key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + **kwargs: Any + ) -> JSON: + """Return a dict that can be serialized using json.dump. + + Advanced usage might optionally use a callback as parameter: + + .. code::python + + def my_key_transformer(key, attr_desc, value): + return key + + Key is the attribute name used in Python. Attr_desc + is a dict of metadata. Currently contains 'type' with the + msrest type and 'key' with the RestAPI encoded key. + Value is the current value in this object. + + The string returned will be used to serialize the key. + If the return type is a list, this is considered hierarchical + result dict. + + See the three examples in this file: + + - attribute_transformer + - full_restapi_key_transformer + - last_restapi_key_transformer + + If you want XML serialization, you can pass the kwargs is_xml=True. + + :param bool keep_readonly: If you want to serialize the readonly attributes + :param function key_transformer: A key transformer function. + :returns: A dict JSON compatible object + :rtype: dict + """ + serializer = Serializer(self._infer_class_models()) + return serializer._serialize( # type: ignore # pylint: disable=protected-access + self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs + ) + + @classmethod + def _infer_class_models(cls): + try: + str_models = cls.__module__.rsplit(".", 1)[0] + models = sys.modules[str_models] + client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} + if cls.__name__ not in client_models: + raise ValueError("Not Autorest generated code") + except Exception: # pylint: disable=broad-exception-caught + # Assume it's not Autorest generated (tests?). Add ourselves as dependencies. + client_models = {cls.__name__: cls} + return client_models + + @classmethod + def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: + """Parse a str using the RestAPI syntax and return a model. + + :param str data: A str using RestAPI structure. JSON by default. + :param str content_type: JSON by default, set application/xml if XML. + :returns: An instance of this model + :raises DeserializationError: if something went wrong + :rtype: Self + """ + deserializer = Deserializer(cls._infer_class_models()) + return deserializer(cls.__name__, data, content_type=content_type) # type: ignore + + @classmethod + def from_dict( + cls, + data: Any, + key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + content_type: Optional[str] = None, + ) -> Self: + """Parse a dict using given key extractor return a model. + + By default consider key + extractors (rest_key_case_insensitive_extractor, attribute_key_case_insensitive_extractor + and last_rest_key_case_insensitive_extractor) + + :param dict data: A dict using RestAPI structure + :param function key_extractors: A key extractor function. + :param str content_type: JSON by default, set application/xml if XML. + :returns: An instance of this model + :raises DeserializationError: if something went wrong + :rtype: Self + """ + deserializer = Deserializer(cls._infer_class_models()) + deserializer.key_extractors = ( # type: ignore + [ # type: ignore + attribute_key_case_insensitive_extractor, + rest_key_case_insensitive_extractor, + last_rest_key_case_insensitive_extractor, + ] + if key_extractors is None + else key_extractors + ) + return deserializer(cls.__name__, data, content_type=content_type) # type: ignore + + @classmethod + def _flatten_subtype(cls, key, objects): + if "_subtype_map" not in cls.__dict__: + return {} + result = dict(cls._subtype_map[key]) + for valuetype in cls._subtype_map[key].values(): + result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + return result + + @classmethod + def _classify(cls, response, objects): + """Check the class _subtype_map for any child classes. + We want to ignore any inherited _subtype_maps. + + :param dict response: The initial data + :param dict objects: The class objects + :returns: The class to be used + :rtype: class + """ + for subtype_key in cls.__dict__.get("_subtype_map", {}).keys(): + subtype_value = None + + if not isinstance(response, ET.Element): + rest_api_response_key = cls._get_rest_key_parts(subtype_key)[-1] + subtype_value = response.get(rest_api_response_key, None) or response.get(subtype_key, None) + else: + subtype_value = xml_key_extractor(subtype_key, cls._attribute_map[subtype_key], response) + if subtype_value: + # Try to match base class. Can be class name only + # (bug to fix in Autorest to support x-ms-discriminator-name) + if cls.__name__ == subtype_value: + return cls + flatten_mapping_type = cls._flatten_subtype(subtype_key, objects) + try: + return objects[flatten_mapping_type[subtype_value]] # type: ignore + except KeyError: + _LOGGER.warning( + "Subtype value %s has no mapping, use base class %s.", + subtype_value, + cls.__name__, + ) + break + else: + _LOGGER.warning("Discriminator %s is absent or null, use base class %s.", subtype_key, cls.__name__) + break + return cls + + @classmethod + def _get_rest_key_parts(cls, attr_key): + """Get the RestAPI key of this attr, split it and decode part + :param str attr_key: Attribute key must be in attribute_map. + :returns: A list of RestAPI part + :rtype: list + """ + rest_split_key = _FLATTEN.split(cls._attribute_map[attr_key]["key"]) + return [_decode_attribute_map_key(key_part) for key_part in rest_split_key] + + +def _decode_attribute_map_key(key): + """This decode a key in an _attribute_map to the actual key we want to look at + inside the received data. + + :param str key: A key string from the generated code + :returns: The decoded key + :rtype: str + """ + return key.replace("\\.", ".") + + +class Serializer: # pylint: disable=too-many-public-methods + """Request object model serializer.""" + + basic_types = {str: "str", int: "int", bool: "bool", float: "float"} + + _xml_basic_types_serializers = {"bool": lambda x: str(x).lower()} + days = {0: "Mon", 1: "Tue", 2: "Wed", 3: "Thu", 4: "Fri", 5: "Sat", 6: "Sun"} + months = { + 1: "Jan", + 2: "Feb", + 3: "Mar", + 4: "Apr", + 5: "May", + 6: "Jun", + 7: "Jul", + 8: "Aug", + 9: "Sep", + 10: "Oct", + 11: "Nov", + 12: "Dec", + } + validation = { + "min_length": lambda x, y: len(x) < y, + "max_length": lambda x, y: len(x) > y, + "minimum": lambda x, y: x < y, + "maximum": lambda x, y: x > y, + "minimum_ex": lambda x, y: x <= y, + "maximum_ex": lambda x, y: x >= y, + "min_items": lambda x, y: len(x) < y, + "max_items": lambda x, y: len(x) > y, + "pattern": lambda x, y: not re.match(y, x, re.UNICODE), + "unique": lambda x, y: len(x) != len(set(x)), + "multiple": lambda x, y: x % y != 0, + } + + def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: + self.serialize_type = { + "iso-8601": Serializer.serialize_iso, + "rfc-1123": Serializer.serialize_rfc, + "unix-time": Serializer.serialize_unix, + "duration": Serializer.serialize_duration, + "date": Serializer.serialize_date, + "time": Serializer.serialize_time, + "decimal": Serializer.serialize_decimal, + "long": Serializer.serialize_long, + "bytearray": Serializer.serialize_bytearray, + "base64": Serializer.serialize_base64, + "object": self.serialize_object, + "[]": self.serialize_iter, + "{}": self.serialize_dict, + } + self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.key_transformer = full_restapi_key_transformer + self.client_side_validation = True + + def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, too-many-statements, too-many-locals + self, target_obj, data_type=None, **kwargs + ): + """Serialize data into a string according to type. + + :param object target_obj: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str, dict + :raises SerializationError: if serialization fails. + :returns: The serialized data. + """ + key_transformer = kwargs.get("key_transformer", self.key_transformer) + keep_readonly = kwargs.get("keep_readonly", False) + if target_obj is None: + return None + + attr_name = None + class_name = target_obj.__class__.__name__ + + if data_type: + return self.serialize_data(target_obj, data_type, **kwargs) + + if not hasattr(target_obj, "_attribute_map"): + data_type = type(target_obj).__name__ + if data_type in self.basic_types.values(): + return self.serialize_data(target_obj, data_type, **kwargs) + + # Force "is_xml" kwargs if we detect a XML model + try: + is_xml_model_serialization = kwargs["is_xml"] + except KeyError: + is_xml_model_serialization = kwargs.setdefault("is_xml", target_obj.is_xml_model()) + + serialized = {} + if is_xml_model_serialization: + serialized = target_obj._create_xml_node() # pylint: disable=protected-access + try: + attributes = target_obj._attribute_map # pylint: disable=protected-access + for attr, attr_desc in attributes.items(): + attr_name = attr + if not keep_readonly and target_obj._validation.get( # pylint: disable=protected-access + attr_name, {} + ).get("readonly", False): + continue + + if attr_name == "additional_properties" and attr_desc["key"] == "": + if target_obj.additional_properties is not None: + serialized.update(target_obj.additional_properties) + continue + try: + + orig_attr = getattr(target_obj, attr) + if is_xml_model_serialization: + pass # Don't provide "transformer" for XML for now. Keep "orig_attr" + else: # JSON + keys, orig_attr = key_transformer(attr, attr_desc.copy(), orig_attr) + keys = keys if isinstance(keys, list) else [keys] + + kwargs["serialization_ctxt"] = attr_desc + new_attr = self.serialize_data(orig_attr, attr_desc["type"], **kwargs) + + if is_xml_model_serialization: + xml_desc = attr_desc.get("xml", {}) + xml_name = xml_desc.get("name", attr_desc["key"]) + xml_prefix = xml_desc.get("prefix", None) + xml_ns = xml_desc.get("ns", None) + if xml_desc.get("attr", False): + if xml_ns: + ET.register_namespace(xml_prefix, xml_ns) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) + serialized.set(xml_name, new_attr) # type: ignore + continue + if xml_desc.get("text", False): + serialized.text = new_attr # type: ignore + continue + if isinstance(new_attr, list): + serialized.extend(new_attr) # type: ignore + elif isinstance(new_attr, ET.Element): + # If the down XML has no XML/Name, + # we MUST replace the tag with the local tag. But keeping the namespaces. + if "name" not in getattr(orig_attr, "_xml_map", {}): + splitted_tag = new_attr.tag.split("}") + if len(splitted_tag) == 2: # Namespace + new_attr.tag = "}".join([splitted_tag[0], xml_name]) + else: + new_attr.tag = xml_name + serialized.append(new_attr) # type: ignore + else: # That's a basic type + # Integrate namespace if necessary + local_node = _create_xml_node(xml_name, xml_prefix, xml_ns) + local_node.text = str(new_attr) + serialized.append(local_node) # type: ignore + else: # JSON + for k in reversed(keys): # type: ignore + new_attr = {k: new_attr} + + _new_attr = new_attr + _serialized = serialized + for k in keys: # type: ignore + if k not in _serialized: + _serialized.update(_new_attr) # type: ignore + _new_attr = _new_attr[k] # type: ignore + _serialized = _serialized[k] + except ValueError as err: + if isinstance(err, SerializationError): + raise + + except (AttributeError, KeyError, TypeError) as err: + msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj)) + raise SerializationError(msg) from err + return serialized + + def body(self, data, data_type, **kwargs): + """Serialize data intended for a request body. + + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: dict + :raises SerializationError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized request body + """ + + # Just in case this is a dict + internal_data_type_str = data_type.strip("[]{}") + internal_data_type = self.dependencies.get(internal_data_type_str, None) + try: + is_xml_model_serialization = kwargs["is_xml"] + except KeyError: + if internal_data_type and issubclass(internal_data_type, Model): + is_xml_model_serialization = kwargs.setdefault("is_xml", internal_data_type.is_xml_model()) + else: + is_xml_model_serialization = False + if internal_data_type and not isinstance(internal_data_type, Enum): + try: + deserializer = Deserializer(self.dependencies) + # Since it's on serialization, it's almost sure that format is not JSON REST + # We're not able to deal with additional properties for now. + deserializer.additional_properties_detection = False + if is_xml_model_serialization: + deserializer.key_extractors = [ # type: ignore + attribute_key_case_insensitive_extractor, + ] + else: + deserializer.key_extractors = [ + rest_key_case_insensitive_extractor, + attribute_key_case_insensitive_extractor, + last_rest_key_case_insensitive_extractor, + ] + data = deserializer._deserialize(data_type, data) # pylint: disable=protected-access + except DeserializationError as err: + raise SerializationError("Unable to build a model: " + str(err)) from err + + return self._serialize(data, data_type, **kwargs) + + def url(self, name, data, data_type, **kwargs): + """Serialize data intended for a URL path. + + :param str name: The name of the URL path parameter. + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str + :returns: The serialized URL path + :raises TypeError: if serialization fails. + :raises ValueError: if data is None + """ + try: + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + + if kwargs.get("skip_quote") is True: + output = str(output) + output = output.replace("{", quote("{")).replace("}", quote("}")) + else: + output = quote(str(output), safe="") + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return output + + def query(self, name, data, data_type, **kwargs): + """Serialize data intended for a URL query. + + :param str name: The name of the query parameter. + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str, list + :raises TypeError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized query parameter + """ + try: + # Treat the list aside, since we don't want to encode the div separator + if data_type.startswith("["): + internal_data_type = data_type[1:-1] + do_quote = not kwargs.get("skip_quote", False) + return self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs) + + # Not a list, regular serialization + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + if kwargs.get("skip_quote") is True: + output = str(output) + else: + output = quote(str(output), safe="") + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return str(output) + + def header(self, name, data, data_type, **kwargs): + """Serialize data intended for a request header. + + :param str name: The name of the header. + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str + :raises TypeError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized header + """ + try: + if data_type in ["[str]"]: + data = ["" if d is None else d for d in data] + + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return str(output) + + def serialize_data(self, data, data_type, **kwargs): + """Serialize generic data according to supplied data type. + + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :raises AttributeError: if required data is None. + :raises ValueError: if data is None + :raises SerializationError: if serialization fails. + :returns: The serialized data. + :rtype: str, int, float, bool, dict, list + """ + if data is None: + raise ValueError("No value for given attribute") + + try: + if data is CoreNull: + return None + if data_type in self.basic_types.values(): + return self.serialize_basic(data, data_type, **kwargs) + + if data_type in self.serialize_type: + return self.serialize_type[data_type](data, **kwargs) + + # If dependencies is empty, try with current data class + # It has to be a subclass of Enum anyway + enum_type = self.dependencies.get(data_type, data.__class__) + if issubclass(enum_type, Enum): + return Serializer.serialize_enum(data, enum_obj=enum_type) + + iter_type = data_type[0] + data_type[-1] + if iter_type in self.serialize_type: + return self.serialize_type[iter_type](data, data_type[1:-1], **kwargs) + + except (ValueError, TypeError) as err: + msg = "Unable to serialize value: {!r} as type: {!r}." + raise SerializationError(msg.format(data, data_type)) from err + return self._serialize(data, **kwargs) + + @classmethod + def _get_custom_serializers(cls, data_type, **kwargs): # pylint: disable=inconsistent-return-statements + custom_serializer = kwargs.get("basic_types_serializers", {}).get(data_type) + if custom_serializer: + return custom_serializer + if kwargs.get("is_xml", False): + return cls._xml_basic_types_serializers.get(data_type) + + @classmethod + def serialize_basic(cls, data, data_type, **kwargs): + """Serialize basic builting data type. + Serializes objects to str, int, float or bool. + + Possible kwargs: + - basic_types_serializers dict[str, callable] : If set, use the callable as serializer + - is_xml bool : If set, use xml_basic_types_serializers + + :param obj data: Object to be serialized. + :param str data_type: Type of object in the iterable. + :rtype: str, int, float, bool + :return: serialized object + """ + custom_serializer = cls._get_custom_serializers(data_type, **kwargs) + if custom_serializer: + return custom_serializer(data) + if data_type == "str": + return cls.serialize_unicode(data) + return eval(data_type)(data) # nosec # pylint: disable=eval-used + + @classmethod + def serialize_unicode(cls, data): + """Special handling for serializing unicode strings in Py2. + Encode to UTF-8 if unicode, otherwise handle as a str. + + :param str data: Object to be serialized. + :rtype: str + :return: serialized object + """ + try: # If I received an enum, return its value + return data.value + except AttributeError: + pass + + try: + if isinstance(data, unicode): # type: ignore + # Don't change it, JSON and XML ElementTree are totally able + # to serialize correctly u'' strings + return data + except NameError: + return str(data) + return str(data) + + def serialize_iter(self, data, iter_type, div=None, **kwargs): + """Serialize iterable. + + Supported kwargs: + - serialization_ctxt dict : The current entry of _attribute_map, or same format. + serialization_ctxt['type'] should be same as data_type. + - is_xml bool : If set, serialize as XML + + :param list data: Object to be serialized. + :param str iter_type: Type of object in the iterable. + :param str div: If set, this str will be used to combine the elements + in the iterable into a combined string. Default is 'None'. + Defaults to False. + :rtype: list, str + :return: serialized iterable + """ + if isinstance(data, str): + raise SerializationError("Refuse str type as a valid iter type.") + + serialization_ctxt = kwargs.get("serialization_ctxt", {}) + is_xml = kwargs.get("is_xml", False) + + serialized = [] + for d in data: + try: + serialized.append(self.serialize_data(d, iter_type, **kwargs)) + except ValueError as err: + if isinstance(err, SerializationError): + raise + serialized.append(None) + + if kwargs.get("do_quote", False): + serialized = ["" if s is None else quote(str(s), safe="") for s in serialized] + + if div: + serialized = ["" if s is None else str(s) for s in serialized] + serialized = div.join(serialized) + + if "xml" in serialization_ctxt or is_xml: + # XML serialization is more complicated + xml_desc = serialization_ctxt.get("xml", {}) + xml_name = xml_desc.get("name") + if not xml_name: + xml_name = serialization_ctxt["key"] + + # Create a wrap node if necessary (use the fact that Element and list have "append") + is_wrapped = xml_desc.get("wrapped", False) + node_name = xml_desc.get("itemsName", xml_name) + if is_wrapped: + final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + else: + final_result = [] + # All list elements to "local_node" + for el in serialized: + if isinstance(el, ET.Element): + el_node = el + else: + el_node = _create_xml_node(node_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + if el is not None: # Otherwise it writes "None" :-p + el_node.text = str(el) + final_result.append(el_node) + return final_result + return serialized + + def serialize_dict(self, attr, dict_type, **kwargs): + """Serialize a dictionary of objects. + + :param dict attr: Object to be serialized. + :param str dict_type: Type of object in the dictionary. + :rtype: dict + :return: serialized dictionary + """ + serialization_ctxt = kwargs.get("serialization_ctxt", {}) + serialized = {} + for key, value in attr.items(): + try: + serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs) + except ValueError as err: + if isinstance(err, SerializationError): + raise + serialized[self.serialize_unicode(key)] = None + + if "xml" in serialization_ctxt: + # XML serialization is more complicated + xml_desc = serialization_ctxt["xml"] + xml_name = xml_desc["name"] + + final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + for key, value in serialized.items(): + ET.SubElement(final_result, key).text = value + return final_result + + return serialized + + def serialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements + """Serialize a generic object. + This will be handled as a dictionary. If object passed in is not + a basic type (str, int, float, dict, list) it will simply be + cast to str. + + :param dict attr: Object to be serialized. + :rtype: dict or str + :return: serialized object + """ + if attr is None: + return None + if isinstance(attr, ET.Element): + return attr + obj_type = type(attr) + if obj_type in self.basic_types: + return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs) + if obj_type is _long_type: + return self.serialize_long(attr) + if obj_type is str: + return self.serialize_unicode(attr) + if obj_type is datetime.datetime: + return self.serialize_iso(attr) + if obj_type is datetime.date: + return self.serialize_date(attr) + if obj_type is datetime.time: + return self.serialize_time(attr) + if obj_type is datetime.timedelta: + return self.serialize_duration(attr) + if obj_type is decimal.Decimal: + return self.serialize_decimal(attr) + + # If it's a model or I know this dependency, serialize as a Model + if obj_type in self.dependencies.values() or isinstance(attr, Model): + return self._serialize(attr) + + if obj_type == dict: + serialized = {} + for key, value in attr.items(): + try: + serialized[self.serialize_unicode(key)] = self.serialize_object(value, **kwargs) + except ValueError: + serialized[self.serialize_unicode(key)] = None + return serialized + + if obj_type == list: + serialized = [] + for obj in attr: + try: + serialized.append(self.serialize_object(obj, **kwargs)) + except ValueError: + pass + return serialized + return str(attr) + + @staticmethod + def serialize_enum(attr, enum_obj=None): + try: + result = attr.value + except AttributeError: + result = attr + try: + enum_obj(result) # type: ignore + return result + except ValueError as exc: + for enum_value in enum_obj: # type: ignore + if enum_value.value.lower() == str(attr).lower(): + return enum_value.value + error = "{!r} is not valid value for enum {!r}" + raise SerializationError(error.format(attr, enum_obj)) from exc + + @staticmethod + def serialize_bytearray(attr, **kwargs): # pylint: disable=unused-argument + """Serialize bytearray into base-64 string. + + :param str attr: Object to be serialized. + :rtype: str + :return: serialized base64 + """ + return b64encode(attr).decode() + + @staticmethod + def serialize_base64(attr, **kwargs): # pylint: disable=unused-argument + """Serialize str into base-64 string. + + :param str attr: Object to be serialized. + :rtype: str + :return: serialized base64 + """ + encoded = b64encode(attr).decode("ascii") + return encoded.strip("=").replace("+", "-").replace("/", "_") + + @staticmethod + def serialize_decimal(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Decimal object to float. + + :param decimal attr: Object to be serialized. + :rtype: float + :return: serialized decimal + """ + return float(attr) + + @staticmethod + def serialize_long(attr, **kwargs): # pylint: disable=unused-argument + """Serialize long (Py2) or int (Py3). + + :param int attr: Object to be serialized. + :rtype: int/long + :return: serialized long + """ + return _long_type(attr) + + @staticmethod + def serialize_date(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Date object into ISO-8601 formatted string. + + :param Date attr: Object to be serialized. + :rtype: str + :return: serialized date + """ + if isinstance(attr, str): + attr = isodate.parse_date(attr) + t = "{:04}-{:02}-{:02}".format(attr.year, attr.month, attr.day) + return t + + @staticmethod + def serialize_time(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Time object into ISO-8601 formatted string. + + :param datetime.time attr: Object to be serialized. + :rtype: str + :return: serialized time + """ + if isinstance(attr, str): + attr = isodate.parse_time(attr) + t = "{:02}:{:02}:{:02}".format(attr.hour, attr.minute, attr.second) + if attr.microsecond: + t += ".{:02}".format(attr.microsecond) + return t + + @staticmethod + def serialize_duration(attr, **kwargs): # pylint: disable=unused-argument + """Serialize TimeDelta object into ISO-8601 formatted string. + + :param TimeDelta attr: Object to be serialized. + :rtype: str + :return: serialized duration + """ + if isinstance(attr, str): + attr = isodate.parse_duration(attr) + return isodate.duration_isoformat(attr) + + @staticmethod + def serialize_rfc(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Datetime object into RFC-1123 formatted string. + + :param Datetime attr: Object to be serialized. + :rtype: str + :raises TypeError: if format invalid. + :return: serialized rfc + """ + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + utc = attr.utctimetuple() + except AttributeError as exc: + raise TypeError("RFC1123 object must be valid Datetime object.") from exc + + return "{}, {:02} {} {:04} {:02}:{:02}:{:02} GMT".format( + Serializer.days[utc.tm_wday], + utc.tm_mday, + Serializer.months[utc.tm_mon], + utc.tm_year, + utc.tm_hour, + utc.tm_min, + utc.tm_sec, + ) + + @staticmethod + def serialize_iso(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Datetime object into ISO-8601 formatted string. + + :param Datetime attr: Object to be serialized. + :rtype: str + :raises SerializationError: if format invalid. + :return: serialized iso + """ + if isinstance(attr, str): + attr = isodate.parse_datetime(attr) + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + utc = attr.utctimetuple() + if utc.tm_year > 9999 or utc.tm_year < 1: + raise OverflowError("Hit max or min date") + + microseconds = str(attr.microsecond).rjust(6, "0").rstrip("0").ljust(3, "0") + if microseconds: + microseconds = "." + microseconds + date = "{:04}-{:02}-{:02}T{:02}:{:02}:{:02}".format( + utc.tm_year, utc.tm_mon, utc.tm_mday, utc.tm_hour, utc.tm_min, utc.tm_sec + ) + return date + microseconds + "Z" + except (ValueError, OverflowError) as err: + msg = "Unable to serialize datetime object." + raise SerializationError(msg) from err + except AttributeError as err: + msg = "ISO-8601 object must be valid Datetime object." + raise TypeError(msg) from err + + @staticmethod + def serialize_unix(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Datetime object into IntTime format. + This is represented as seconds. + + :param Datetime attr: Object to be serialized. + :rtype: int + :raises SerializationError: if format invalid + :return: serialied unix + """ + if isinstance(attr, int): + return attr + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + return int(calendar.timegm(attr.utctimetuple())) + except AttributeError as exc: + raise TypeError("Unix time object must be valid Datetime object.") from exc + + +def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument + key = attr_desc["key"] + working_data = data + + while "." in key: + # Need the cast, as for some reasons "split" is typed as list[str | Any] + dict_keys = cast(List[str], _FLATTEN.split(key)) + if len(dict_keys) == 1: + key = _decode_attribute_map_key(dict_keys[0]) + break + working_key = _decode_attribute_map_key(dict_keys[0]) + working_data = working_data.get(working_key, data) + if working_data is None: + # If at any point while following flatten JSON path see None, it means + # that all properties under are None as well + return None + key = ".".join(dict_keys[1:]) + + return working_data.get(key) + + +def rest_key_case_insensitive_extractor( # pylint: disable=unused-argument, inconsistent-return-statements + attr, attr_desc, data +): + key = attr_desc["key"] + working_data = data + + while "." in key: + dict_keys = _FLATTEN.split(key) + if len(dict_keys) == 1: + key = _decode_attribute_map_key(dict_keys[0]) + break + working_key = _decode_attribute_map_key(dict_keys[0]) + working_data = attribute_key_case_insensitive_extractor(working_key, None, working_data) + if working_data is None: + # If at any point while following flatten JSON path see None, it means + # that all properties under are None as well + return None + key = ".".join(dict_keys[1:]) + + if working_data: + return attribute_key_case_insensitive_extractor(key, None, working_data) + + +def last_rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument + """Extract the attribute in "data" based on the last part of the JSON path key. + + :param str attr: The attribute to extract + :param dict attr_desc: The attribute description + :param dict data: The data to extract from + :rtype: object + :returns: The extracted attribute + """ + key = attr_desc["key"] + dict_keys = _FLATTEN.split(key) + return attribute_key_extractor(dict_keys[-1], None, data) + + +def last_rest_key_case_insensitive_extractor(attr, attr_desc, data): # pylint: disable=unused-argument + """Extract the attribute in "data" based on the last part of the JSON path key. + + This is the case insensitive version of "last_rest_key_extractor" + :param str attr: The attribute to extract + :param dict attr_desc: The attribute description + :param dict data: The data to extract from + :rtype: object + :returns: The extracted attribute + """ + key = attr_desc["key"] + dict_keys = _FLATTEN.split(key) + return attribute_key_case_insensitive_extractor(dict_keys[-1], None, data) + + +def attribute_key_extractor(attr, _, data): + return data.get(attr) + + +def attribute_key_case_insensitive_extractor(attr, _, data): + found_key = None + lower_attr = attr.lower() + for key in data: + if lower_attr == key.lower(): + found_key = key + break + + return data.get(found_key) + + +def _extract_name_from_internal_type(internal_type): + """Given an internal type XML description, extract correct XML name with namespace. + + :param dict internal_type: An model type + :rtype: tuple + :returns: A tuple XML name + namespace dict + """ + internal_type_xml_map = getattr(internal_type, "_xml_map", {}) + xml_name = internal_type_xml_map.get("name", internal_type.__name__) + xml_ns = internal_type_xml_map.get("ns", None) + if xml_ns: + xml_name = "{{{}}}{}".format(xml_ns, xml_name) + return xml_name + + +def xml_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument,too-many-return-statements + if isinstance(data, dict): + return None + + # Test if this model is XML ready first + if not isinstance(data, ET.Element): + return None + + xml_desc = attr_desc.get("xml", {}) + xml_name = xml_desc.get("name", attr_desc["key"]) + + # Look for a children + is_iter_type = attr_desc["type"].startswith("[") + is_wrapped = xml_desc.get("wrapped", False) + internal_type = attr_desc.get("internalType", None) + internal_type_xml_map = getattr(internal_type, "_xml_map", {}) + + # Integrate namespace if necessary + xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None)) + if xml_ns: + xml_name = "{{{}}}{}".format(xml_ns, xml_name) + + # If it's an attribute, that's simple + if xml_desc.get("attr", False): + return data.get(xml_name) + + # If it's x-ms-text, that's simple too + if xml_desc.get("text", False): + return data.text + + # Scenario where I take the local name: + # - Wrapped node + # - Internal type is an enum (considered basic types) + # - Internal type has no XML/Name node + if is_wrapped or (internal_type and (issubclass(internal_type, Enum) or "name" not in internal_type_xml_map)): + children = data.findall(xml_name) + # If internal type has a local name and it's not a list, I use that name + elif not is_iter_type and internal_type and "name" in internal_type_xml_map: + xml_name = _extract_name_from_internal_type(internal_type) + children = data.findall(xml_name) + # That's an array + else: + if internal_type: # Complex type, ignore itemsName and use the complex type name + items_name = _extract_name_from_internal_type(internal_type) + else: + items_name = xml_desc.get("itemsName", xml_name) + children = data.findall(items_name) + + if len(children) == 0: + if is_iter_type: + if is_wrapped: + return None # is_wrapped no node, we want None + return [] # not wrapped, assume empty list + return None # Assume it's not there, maybe an optional node. + + # If is_iter_type and not wrapped, return all found children + if is_iter_type: + if not is_wrapped: + return children + # Iter and wrapped, should have found one node only (the wrap one) + if len(children) != 1: + raise DeserializationError( + "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( + xml_name + ) + ) + return list(children[0]) # Might be empty list and that's ok. + + # Here it's not a itertype, we should have found one element only or empty + if len(children) > 1: + raise DeserializationError("Find several XML '{}' where it was not expected".format(xml_name)) + return children[0] + + +class Deserializer: + """Response object model deserializer. + + :param dict classes: Class type dictionary for deserializing complex types. + :ivar list key_extractors: Ordered list of extractors to be used by this deserializer. + """ + + basic_types = {str: "str", int: "int", bool: "bool", float: "float"} + + valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") + + def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: + self.deserialize_type = { + "iso-8601": Deserializer.deserialize_iso, + "rfc-1123": Deserializer.deserialize_rfc, + "unix-time": Deserializer.deserialize_unix, + "duration": Deserializer.deserialize_duration, + "date": Deserializer.deserialize_date, + "time": Deserializer.deserialize_time, + "decimal": Deserializer.deserialize_decimal, + "long": Deserializer.deserialize_long, + "bytearray": Deserializer.deserialize_bytearray, + "base64": Deserializer.deserialize_base64, + "object": self.deserialize_object, + "[]": self.deserialize_iter, + "{}": self.deserialize_dict, + } + self.deserialize_expected_types = { + "duration": (isodate.Duration, datetime.timedelta), + "iso-8601": (datetime.datetime), + } + self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.key_extractors = [rest_key_extractor, xml_key_extractor] + # Additional properties only works if the "rest_key_extractor" is used to + # extract the keys. Making it to work whatever the key extractor is too much + # complicated, with no real scenario for now. + # So adding a flag to disable additional properties detection. This flag should be + # used if your expect the deserialization to NOT come from a JSON REST syntax. + # Otherwise, result are unexpected + self.additional_properties_detection = True + + def __call__(self, target_obj, response_data, content_type=None): + """Call the deserializer to process a REST response. + + :param str target_obj: Target data type to deserialize to. + :param requests.Response response_data: REST response object. + :param str content_type: Swagger "produces" if available. + :raises DeserializationError: if deserialization fails. + :return: Deserialized object. + :rtype: object + """ + data = self._unpack_content(response_data, content_type) + return self._deserialize(target_obj, data) + + def _deserialize(self, target_obj, data): # pylint: disable=inconsistent-return-statements + """Call the deserializer on a model. + + Data needs to be already deserialized as JSON or XML ElementTree + + :param str target_obj: Target data type to deserialize to. + :param object data: Object to deserialize. + :raises DeserializationError: if deserialization fails. + :return: Deserialized object. + :rtype: object + """ + # This is already a model, go recursive just in case + if hasattr(data, "_attribute_map"): + constants = [name for name, config in getattr(data, "_validation", {}).items() if config.get("constant")] + try: + for attr, mapconfig in data._attribute_map.items(): # pylint: disable=protected-access + if attr in constants: + continue + value = getattr(data, attr) + if value is None: + continue + local_type = mapconfig["type"] + internal_data_type = local_type.strip("[]{}") + if internal_data_type not in self.dependencies or isinstance(internal_data_type, Enum): + continue + setattr(data, attr, self._deserialize(local_type, value)) + return data + except AttributeError: + return + + response, class_name = self._classify_target(target_obj, data) + + if isinstance(response, str): + return self.deserialize_data(data, response) + if isinstance(response, type) and issubclass(response, Enum): + return self.deserialize_enum(data, response) + + if data is None or data is CoreNull: + return data + try: + attributes = response._attribute_map # type: ignore # pylint: disable=protected-access + d_attrs = {} + for attr, attr_desc in attributes.items(): + # Check empty string. If it's not empty, someone has a real "additionalProperties"... + if attr == "additional_properties" and attr_desc["key"] == "": + continue + raw_value = None + # Enhance attr_desc with some dynamic data + attr_desc = attr_desc.copy() # Do a copy, do not change the real one + internal_data_type = attr_desc["type"].strip("[]{}") + if internal_data_type in self.dependencies: + attr_desc["internalType"] = self.dependencies[internal_data_type] + + for key_extractor in self.key_extractors: + found_value = key_extractor(attr, attr_desc, data) + if found_value is not None: + if raw_value is not None and raw_value != found_value: + msg = ( + "Ignoring extracted value '%s' from %s for key '%s'" + " (duplicate extraction, follow extractors order)" + ) + _LOGGER.warning(msg, found_value, key_extractor, attr) + continue + raw_value = found_value + + value = self.deserialize_data(raw_value, attr_desc["type"]) + d_attrs[attr] = value + except (AttributeError, TypeError, KeyError) as err: + msg = "Unable to deserialize to object: " + class_name # type: ignore + raise DeserializationError(msg) from err + additional_properties = self._build_additional_properties(attributes, data) + return self._instantiate_model(response, d_attrs, additional_properties) + + def _build_additional_properties(self, attribute_map, data): + if not self.additional_properties_detection: + return None + if "additional_properties" in attribute_map and attribute_map.get("additional_properties", {}).get("key") != "": + # Check empty string. If it's not empty, someone has a real "additionalProperties" + return None + if isinstance(data, ET.Element): + data = {el.tag: el.text for el in data} + + known_keys = { + _decode_attribute_map_key(_FLATTEN.split(desc["key"])[0]) + for desc in attribute_map.values() + if desc["key"] != "" + } + present_keys = set(data.keys()) + missing_keys = present_keys - known_keys + return {key: data[key] for key in missing_keys} + + def _classify_target(self, target, data): + """Check to see whether the deserialization target object can + be classified into a subclass. + Once classification has been determined, initialize object. + + :param str target: The target object type to deserialize to. + :param str/dict data: The response data to deserialize. + :return: The classified target object and its class name. + :rtype: tuple + """ + if target is None: + return None, None + + if isinstance(target, str): + try: + target = self.dependencies[target] + except KeyError: + return target, target + + try: + target = target._classify(data, self.dependencies) # type: ignore # pylint: disable=protected-access + except AttributeError: + pass # Target is not a Model, no classify + return target, target.__class__.__name__ # type: ignore + + def failsafe_deserialize(self, target_obj, data, content_type=None): + """Ignores any errors encountered in deserialization, + and falls back to not deserializing the object. Recommended + for use in error deserialization, as we want to return the + HttpResponseError to users, and not have them deal with + a deserialization error. + + :param str target_obj: The target object type to deserialize to. + :param str/dict data: The response data to deserialize. + :param str content_type: Swagger "produces" if available. + :return: Deserialized object. + :rtype: object + """ + try: + return self(target_obj, data, content_type=content_type) + except: # pylint: disable=bare-except + _LOGGER.debug( + "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True + ) + return None + + @staticmethod + def _unpack_content(raw_data, content_type=None): + """Extract the correct structure for deserialization. + + If raw_data is a PipelineResponse, try to extract the result of RawDeserializer. + if we can't, raise. Your Pipeline should have a RawDeserializer. + + If not a pipeline response and raw_data is bytes or string, use content-type + to decode it. If no content-type, try JSON. + + If raw_data is something else, bypass all logic and return it directly. + + :param obj raw_data: Data to be processed. + :param str content_type: How to parse if raw_data is a string/bytes. + :raises JSONDecodeError: If JSON is requested and parsing is impossible. + :raises UnicodeDecodeError: If bytes is not UTF8 + :rtype: object + :return: Unpacked content. + """ + # Assume this is enough to detect a Pipeline Response without importing it + context = getattr(raw_data, "context", {}) + if context: + if RawDeserializer.CONTEXT_NAME in context: + return context[RawDeserializer.CONTEXT_NAME] + raise ValueError("This pipeline didn't have the RawDeserializer policy; can't deserialize") + + # Assume this is enough to recognize universal_http.ClientResponse without importing it + if hasattr(raw_data, "body"): + return RawDeserializer.deserialize_from_http_generics(raw_data.text(), raw_data.headers) + + # Assume this enough to recognize requests.Response without importing it. + if hasattr(raw_data, "_content_consumed"): + return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers) + + if isinstance(raw_data, (str, bytes)) or hasattr(raw_data, "read"): + return RawDeserializer.deserialize_from_text(raw_data, content_type) # type: ignore + return raw_data + + def _instantiate_model(self, response, attrs, additional_properties=None): + """Instantiate a response model passing in deserialized args. + + :param Response response: The response model class. + :param dict attrs: The deserialized response attributes. + :param dict additional_properties: Additional properties to be set. + :rtype: Response + :return: The instantiated response model. + """ + if callable(response): + subtype = getattr(response, "_subtype_map", {}) + try: + readonly = [ + k + for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore + if v.get("readonly") + ] + const = [ + k + for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore + if v.get("constant") + ] + kwargs = {k: v for k, v in attrs.items() if k not in subtype and k not in readonly + const} + response_obj = response(**kwargs) + for attr in readonly: + setattr(response_obj, attr, attrs.get(attr)) + if additional_properties: + response_obj.additional_properties = additional_properties # type: ignore + return response_obj + except TypeError as err: + msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) # type: ignore + raise DeserializationError(msg + str(err)) from err + else: + try: + for attr, value in attrs.items(): + setattr(response, attr, value) + return response + except Exception as exp: + msg = "Unable to populate response model. " + msg += "Type: {}, Error: {}".format(type(response), exp) + raise DeserializationError(msg) from exp + + def deserialize_data(self, data, data_type): # pylint: disable=too-many-return-statements + """Process data for deserialization according to data type. + + :param str data: The response string to be deserialized. + :param str data_type: The type to deserialize to. + :raises DeserializationError: if deserialization fails. + :return: Deserialized object. + :rtype: object + """ + if data is None: + return data + + try: + if not data_type: + return data + if data_type in self.basic_types.values(): + return self.deserialize_basic(data, data_type) + if data_type in self.deserialize_type: + if isinstance(data, self.deserialize_expected_types.get(data_type, tuple())): + return data + + is_a_text_parsing_type = lambda x: x not in [ # pylint: disable=unnecessary-lambda-assignment + "object", + "[]", + r"{}", + ] + if isinstance(data, ET.Element) and is_a_text_parsing_type(data_type) and not data.text: + return None + data_val = self.deserialize_type[data_type](data) + return data_val + + iter_type = data_type[0] + data_type[-1] + if iter_type in self.deserialize_type: + return self.deserialize_type[iter_type](data, data_type[1:-1]) + + obj_type = self.dependencies[data_type] + if issubclass(obj_type, Enum): + if isinstance(data, ET.Element): + data = data.text + return self.deserialize_enum(data, obj_type) + + except (ValueError, TypeError, AttributeError) as err: + msg = "Unable to deserialize response data." + msg += " Data: {}, {}".format(data, data_type) + raise DeserializationError(msg) from err + return self._deserialize(obj_type, data) + + def deserialize_iter(self, attr, iter_type): + """Deserialize an iterable. + + :param list attr: Iterable to be deserialized. + :param str iter_type: The type of object in the iterable. + :return: Deserialized iterable. + :rtype: list + """ + if attr is None: + return None + if isinstance(attr, ET.Element): # If I receive an element here, get the children + attr = list(attr) + if not isinstance(attr, (list, set)): + raise DeserializationError("Cannot deserialize as [{}] an object of type {}".format(iter_type, type(attr))) + return [self.deserialize_data(a, iter_type) for a in attr] + + def deserialize_dict(self, attr, dict_type): + """Deserialize a dictionary. + + :param dict/list attr: Dictionary to be deserialized. Also accepts + a list of key, value pairs. + :param str dict_type: The object type of the items in the dictionary. + :return: Deserialized dictionary. + :rtype: dict + """ + if isinstance(attr, list): + return {x["key"]: self.deserialize_data(x["value"], dict_type) for x in attr} + + if isinstance(attr, ET.Element): + # Transform value into {"Key": "value"} + attr = {el.tag: el.text for el in attr} + return {k: self.deserialize_data(v, dict_type) for k, v in attr.items()} + + def deserialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements + """Deserialize a generic object. + This will be handled as a dictionary. + + :param dict attr: Dictionary to be deserialized. + :return: Deserialized object. + :rtype: dict + :raises TypeError: if non-builtin datatype encountered. + """ + if attr is None: + return None + if isinstance(attr, ET.Element): + # Do no recurse on XML, just return the tree as-is + return attr + if isinstance(attr, str): + return self.deserialize_basic(attr, "str") + obj_type = type(attr) + if obj_type in self.basic_types: + return self.deserialize_basic(attr, self.basic_types[obj_type]) + if obj_type is _long_type: + return self.deserialize_long(attr) + + if obj_type == dict: + deserialized = {} + for key, value in attr.items(): + try: + deserialized[key] = self.deserialize_object(value, **kwargs) + except ValueError: + deserialized[key] = None + return deserialized + + if obj_type == list: + deserialized = [] + for obj in attr: + try: + deserialized.append(self.deserialize_object(obj, **kwargs)) + except ValueError: + pass + return deserialized + + error = "Cannot deserialize generic object with type: " + raise TypeError(error + str(obj_type)) + + def deserialize_basic(self, attr, data_type): # pylint: disable=too-many-return-statements + """Deserialize basic builtin data type from string. + Will attempt to convert to str, int, float and bool. + This function will also accept '1', '0', 'true' and 'false' as + valid bool values. + + :param str attr: response string to be deserialized. + :param str data_type: deserialization data type. + :return: Deserialized basic type. + :rtype: str, int, float or bool + :raises TypeError: if string format is not valid. + """ + # If we're here, data is supposed to be a basic type. + # If it's still an XML node, take the text + if isinstance(attr, ET.Element): + attr = attr.text + if not attr: + if data_type == "str": + # None or '', node is empty string. + return "" + # None or '', node with a strong type is None. + # Don't try to model "empty bool" or "empty int" + return None + + if data_type == "bool": + if attr in [True, False, 1, 0]: + return bool(attr) + if isinstance(attr, str): + if attr.lower() in ["true", "1"]: + return True + if attr.lower() in ["false", "0"]: + return False + raise TypeError("Invalid boolean value: {}".format(attr)) + + if data_type == "str": + return self.deserialize_unicode(attr) + return eval(data_type)(attr) # nosec # pylint: disable=eval-used + + @staticmethod + def deserialize_unicode(data): + """Preserve unicode objects in Python 2, otherwise return data + as a string. + + :param str data: response string to be deserialized. + :return: Deserialized string. + :rtype: str or unicode + """ + # We might be here because we have an enum modeled as string, + # and we try to deserialize a partial dict with enum inside + if isinstance(data, Enum): + return data + + # Consider this is real string + try: + if isinstance(data, unicode): # type: ignore + return data + except NameError: + return str(data) + return str(data) + + @staticmethod + def deserialize_enum(data, enum_obj): + """Deserialize string into enum object. + + If the string is not a valid enum value it will be returned as-is + and a warning will be logged. + + :param str data: Response string to be deserialized. If this value is + None or invalid it will be returned as-is. + :param Enum enum_obj: Enum object to deserialize to. + :return: Deserialized enum object. + :rtype: Enum + """ + if isinstance(data, enum_obj) or data is None: + return data + if isinstance(data, Enum): + data = data.value + if isinstance(data, int): + # Workaround. We might consider remove it in the future. + try: + return list(enum_obj.__members__.values())[data] + except IndexError as exc: + error = "{!r} is not a valid index for enum {!r}" + raise DeserializationError(error.format(data, enum_obj)) from exc + try: + return enum_obj(str(data)) + except ValueError: + for enum_value in enum_obj: + if enum_value.value.lower() == str(data).lower(): + return enum_value + # We don't fail anymore for unknown value, we deserialize as a string + _LOGGER.warning("Deserializer is not able to find %s as valid enum in %s", data, enum_obj) + return Deserializer.deserialize_unicode(data) + + @staticmethod + def deserialize_bytearray(attr): + """Deserialize string into bytearray. + + :param str attr: response string to be deserialized. + :return: Deserialized bytearray + :rtype: bytearray + :raises TypeError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + return bytearray(b64decode(attr)) # type: ignore + + @staticmethod + def deserialize_base64(attr): + """Deserialize base64 encoded string into string. + + :param str attr: response string to be deserialized. + :return: Deserialized base64 string + :rtype: bytearray + :raises TypeError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore + attr = attr + padding # type: ignore + encoded = attr.replace("-", "+").replace("_", "/") + return b64decode(encoded) + + @staticmethod + def deserialize_decimal(attr): + """Deserialize string into Decimal object. + + :param str attr: response string to be deserialized. + :return: Deserialized decimal + :raises DeserializationError: if string format invalid. + :rtype: decimal + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + return decimal.Decimal(str(attr)) # type: ignore + except decimal.DecimalException as err: + msg = "Invalid decimal {}".format(attr) + raise DeserializationError(msg) from err + + @staticmethod + def deserialize_long(attr): + """Deserialize string into long (Py2) or int (Py3). + + :param str attr: response string to be deserialized. + :return: Deserialized int + :rtype: long or int + :raises ValueError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + return _long_type(attr) # type: ignore + + @staticmethod + def deserialize_duration(attr): + """Deserialize ISO-8601 formatted string into TimeDelta object. + + :param str attr: response string to be deserialized. + :return: Deserialized duration + :rtype: TimeDelta + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + duration = isodate.parse_duration(attr) + except (ValueError, OverflowError, AttributeError) as err: + msg = "Cannot deserialize duration object." + raise DeserializationError(msg) from err + return duration + + @staticmethod + def deserialize_date(attr): + """Deserialize ISO-8601 formatted string into Date object. + + :param str attr: response string to be deserialized. + :return: Deserialized date + :rtype: Date + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore + raise DeserializationError("Date must have only digits and -. Received: %s" % attr) + # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. + return isodate.parse_date(attr, defaultmonth=0, defaultday=0) + + @staticmethod + def deserialize_time(attr): + """Deserialize ISO-8601 formatted string into time object. + + :param str attr: response string to be deserialized. + :return: Deserialized time + :rtype: datetime.time + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore + raise DeserializationError("Date must have only digits and -. Received: %s" % attr) + return isodate.parse_time(attr) + + @staticmethod + def deserialize_rfc(attr): + """Deserialize RFC-1123 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :return: Deserialized RFC datetime + :rtype: Datetime + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + parsed_date = email.utils.parsedate_tz(attr) # type: ignore + date_obj = datetime.datetime( + *parsed_date[:6], tzinfo=datetime.timezone(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60)) + ) + if not date_obj.tzinfo: + date_obj = date_obj.astimezone(tz=TZ_UTC) + except ValueError as err: + msg = "Cannot deserialize to rfc datetime object." + raise DeserializationError(msg) from err + return date_obj + + @staticmethod + def deserialize_iso(attr): + """Deserialize ISO-8601 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :return: Deserialized ISO datetime + :rtype: Datetime + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + attr = attr.upper() # type: ignore + match = Deserializer.valid_date.match(attr) + if not match: + raise ValueError("Invalid datetime string: " + attr) + + check_decimal = attr.split(".") + if len(check_decimal) > 1: + decimal_str = "" + for digit in check_decimal[1]: + if digit.isdigit(): + decimal_str += digit + else: + break + if len(decimal_str) > 6: + attr = attr.replace(decimal_str, decimal_str[0:6]) + + date_obj = isodate.parse_datetime(attr) + test_utc = date_obj.utctimetuple() + if test_utc.tm_year > 9999 or test_utc.tm_year < 1: + raise OverflowError("Hit max or min date") + except (ValueError, OverflowError, AttributeError) as err: + msg = "Cannot deserialize datetime object." + raise DeserializationError(msg) from err + return date_obj + + @staticmethod + def deserialize_unix(attr): + """Serialize Datetime object into IntTime format. + This is represented as seconds. + + :param int attr: Object to be serialized. + :return: Deserialized datetime + :rtype: Datetime + :raises DeserializationError: if format invalid + """ + if isinstance(attr, ET.Element): + attr = int(attr.text) # type: ignore + try: + attr = int(attr) + date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC) + except ValueError as err: + msg = "Cannot deserialize to unix datetime object." + raise DeserializationError(msg) from err + return date_obj diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/utils.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/utils.py new file mode 100644 index 00000000000..35c9c836f85 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/utils.py @@ -0,0 +1,25 @@ +# -------------------------------------------------------------------------- +# 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 abc import ABC +from typing import Generic, TYPE_CHECKING, TypeVar + +if TYPE_CHECKING: + from .serialization import Deserializer, Serializer + + +TClient = TypeVar("TClient") +TConfig = TypeVar("TConfig") + + +class ClientMixinABC(ABC, Generic[TClient, TConfig]): + """DO NOT use this class. It is for internal typing use only.""" + + _client: TClient + _config: TConfig + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/__init__.py new file mode 100644 index 00000000000..a2bfcc451fb --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/__init__.py @@ -0,0 +1,29 @@ +# 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=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._client import ApiKeyClient # type: ignore + +try: + from ._patch import __all__ as _patch_all + from ._patch import * +except ImportError: + _patch_all = [] +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "ApiKeyClient", +] +__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/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_client.py new file mode 100644 index 00000000000..606037dfe6b --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_client.py @@ -0,0 +1,97 @@ +# 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 copy import deepcopy +from typing import Any, Awaitable +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._operations import _ApiKeyClientOperationsMixin + + +class ApiKeyClient(_ApiKeyClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Illustrates clients generated with ApiKey authentication. + + :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 + ) -> None: + _endpoint = "{endpoint}" + self._config = ApiKeyClientConfiguration(credential=credential, endpoint=endpoint, **kwargs) + + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + policies.RequestIdPolicy(**kwargs), + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + self._config.redirect_policy, + self._config.retry_policy, + self._config.authentication_policy, + self._config.custom_hook_policy, + self._config.logging_policy, + policies.DistributedTracingPolicy(**kwargs), + policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, + self._config.http_logging_policy, + ] + self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=_endpoint, policies=_policies, **kwargs) + + self._serialize = Serializer() + self._deserialize = Deserializer() + self._serialize.client_side_validation = False + + def send_request( + self, request: HttpRequest, *, stream: bool = False, **kwargs: Any + ) -> Awaitable[AsyncHttpResponse]: + """Runs the network request through the client's chained policies. + + >>> from azure.core.rest import HttpRequest + >>> request = HttpRequest("GET", "https://www.example.org/") + + >>> response = await client.send_request(request) + + + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request + + :param request: The network request you want to make. Required. + :type request: ~azure.core.rest.HttpRequest + :keyword bool stream: Whether the response payload will be streamed. Defaults to False. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~azure.core.rest.AsyncHttpResponse + """ + + request_copy = deepcopy(request) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + + request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + async def close(self) -> None: + await self._client.close() + + async def __aenter__(self) -> Self: + await self._client.__aenter__() + return self + + async def __aexit__(self, *exc_details: Any) -> None: + await self._client.__aexit__(*exc_details) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_configuration.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_configuration.py new file mode 100644 index 00000000000..33598014bf6 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_configuration.py @@ -0,0 +1,50 @@ +# 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 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. + + 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.") + + self.credential = credential + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "authentication-api-key-with-subdir/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) + self._configure(**kwargs) + + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs) + self.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-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/__init__.py new file mode 100644 index 00000000000..933fcd7d1b5 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/__init__.py @@ -0,0 +1,22 @@ +# 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=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [] +__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/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_operations.py new file mode 100644 index 00000000000..52a900f805b --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_operations.py @@ -0,0 +1,128 @@ +# 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-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_patch.py @@ -0,0 +1,21 @@ +# 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. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_patch.py @@ -0,0 +1,21 @@ +# 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. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/__init__.py new file mode 100644 index 00000000000..afdf5ab4e36 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/__init__.py @@ -0,0 +1,27 @@ +# 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=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + + +from ._models import ( # type: ignore + InvalidAuth, +) +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "InvalidAuth", +] +__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/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_models.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_models.py new file mode 100644 index 00000000000..b695706d2dd --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_models.py @@ -0,0 +1,40 @@ +# 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-with-subdir/subdir/authentication/apikey/_generated/models/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_patch.py @@ -0,0 +1,21 @@ +# 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. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_version.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_version.py new file mode 100644 index 00000000000..be71c81bd28 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_version.py @@ -0,0 +1,9 @@ +# 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. +# -------------------------------------------------------------------------- + +VERSION = "1.0.0b1" diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/py.typed b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/py.typed new file mode 100644 index 00000000000..e5aff4f83af --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/py.typed @@ -0,0 +1 @@ +# Marker file for PEP 561. \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/dev_requirements.txt b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/dev_requirements.txt new file mode 100644 index 00000000000..10548647144 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/dev_requirements.txt @@ -0,0 +1,3 @@ +-e ../../../tools/azure-sdk-tools +../../core/azure-core +aiohttp \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/conftest.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/conftest.py new file mode 100644 index 00000000000..8082748a92a --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/conftest.py @@ -0,0 +1,35 @@ +# 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. +# -------------------------------------------------------------------------- +import os +import pytest +from dotenv import load_dotenv +from devtools_testutils import ( + test_proxy, + add_general_regex_sanitizer, + add_body_key_sanitizer, + add_header_regex_sanitizer, +) + +load_dotenv() + + +# 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") + + add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]") + add_header_regex_sanitizer(key="Cookie", value="cookie;") + add_body_key_sanitizer(json_path="$..access_token", value="access_token") diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/test_api_key.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/test_api_key.py new file mode 100644 index 00000000000..2916e7b9498 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/test_api_key.py @@ -0,0 +1,31 @@ +# 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. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils import recorded_by_proxy +from testpreparer import ApiKeyClientTestBase, ApiKeyPreparer + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestApiKey(ApiKeyClientTestBase): + @ApiKeyPreparer() + @recorded_by_proxy + def test_valid(self, apikey_endpoint): + client = self.create_client(endpoint=apikey_endpoint) + response = client.valid() + + # please add some check logic here by yourself + # ... + + @ApiKeyPreparer() + @recorded_by_proxy + def test_invalid(self, apikey_endpoint): + client = self.create_client(endpoint=apikey_endpoint) + response = client.invalid() + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/test_api_key_async.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/test_api_key_async.py new file mode 100644 index 00000000000..214be1ee608 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/test_api_key_async.py @@ -0,0 +1,32 @@ +# 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. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils.aio import recorded_by_proxy_async +from testpreparer import ApiKeyPreparer +from testpreparer_async import ApiKeyClientTestBaseAsync + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestApiKeyAsync(ApiKeyClientTestBaseAsync): + @ApiKeyPreparer() + @recorded_by_proxy_async + async def test_valid(self, apikey_endpoint): + client = self.create_async_client(endpoint=apikey_endpoint) + response = await client.valid() + + # please add some check logic here by yourself + # ... + + @ApiKeyPreparer() + @recorded_by_proxy_async + async def test_invalid(self, apikey_endpoint): + client = self.create_async_client(endpoint=apikey_endpoint) + response = await client.invalid() + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/testpreparer.py new file mode 100644 index 00000000000..5af4c923ab1 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/testpreparer.py @@ -0,0 +1,24 @@ +# 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 authentication.apikey import ApiKeyClient +from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer +import functools + + +class ApiKeyClientTestBase(AzureRecordedTestCase): + + def create_client(self, endpoint): + credential = self.get_credential(ApiKeyClient) + return self.create_client_from_credential( + ApiKeyClient, + credential=credential, + endpoint=endpoint, + ) + + +ApiKeyPreparer = functools.partial(PowerShellPreparer, "apikey", apikey_endpoint="https://fake_apikey_endpoint.com") diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/testpreparer_async.py new file mode 100644 index 00000000000..09c26f3fe60 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/testpreparer_async.py @@ -0,0 +1,20 @@ +# 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 authentication.apikey.aio import ApiKeyClient +from devtools_testutils import AzureRecordedTestCase + + +class ApiKeyClientTestBaseAsync(AzureRecordedTestCase): + + def create_async_client(self, endpoint): + credential = self.get_credential(ApiKeyClient, is_async=True) + return self.create_client_from_credential( + ApiKeyClient, + credential=credential, + endpoint=endpoint, + ) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/setup.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/setup.py new file mode 100644 index 00000000000..27cc6c2fb6b --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/setup.py @@ -0,0 +1,70 @@ +# 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. +# -------------------------------------------------------------------------- + + +import os +import re +from setuptools import setup, find_packages + + +PACKAGE_NAME = "authentication-api-key-with-subdir" +PACKAGE_PPRINT_NAME = "Authentication Api Key With Subdir" +PACKAGE_NAMESPACE = "authentication.apikey" + +# a.b.c => a/b/c +package_folder_path = PACKAGE_NAMESPACE.replace(".", "/") + +# Version extraction inspired from 'requests' +with open(os.path.join(package_folder_path, "_version.py"), "r") as fd: + version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1) + +if not version: + raise RuntimeError("Cannot find version information") + + +setup( + name=PACKAGE_NAME, + version=version, + description="Microsoft Corporation {} Client Library for Python".format(PACKAGE_PPRINT_NAME), + long_description=open("README.md", "r").read(), + long_description_content_type="text/markdown", + license="MIT License", + author="Microsoft Corporation", + author_email="azpysdkhelp@microsoft.com", + url="https://github.com/Azure/azure-sdk-for-python/tree/main/sdk", + keywords="azure, azure sdk", + classifiers=[ + "Development Status :: 4 - Beta", + "Programming Language :: Python", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "License :: OSI Approved :: MIT License", + ], + zip_safe=False, + packages=find_packages( + exclude=[ + "tests", + # Exclude packages that will be covered by PEP420 or nspkg + "authentication", + ] + ), + include_package_data=True, + package_data={ + "authentication.apikey": ["py.typed"], + }, + install_requires=[ + "isodate>=0.6.1", + "azure-core>=1.30.0", + "typing-extensions>=4.6.0", + ], + python_requires=">=3.9", +) diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_generation_subdir.py b/packages/typespec-python/test/azure/mock_api_tests/test_generation_subdir.py new file mode 100644 index 00000000000..13e6a918400 --- /dev/null +++ b/packages/typespec-python/test/azure/mock_api_tests/test_generation_subdir.py @@ -0,0 +1 @@ +from authentication.apikey import diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_client.py index 3a48d493e70..9660004b327 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_client.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_client.py @@ -1,5 +1,6 @@ from ._generated import ApiKeyClient + class CustomizedApiKeyClient(ApiKeyClient): """Customized ApiKeyClient with additional functionality.""" diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/aio/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/aio/_client.py index 38ca67ee5e3..6eb92087c4c 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/aio/_client.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/aio/_client.py @@ -1,5 +1,6 @@ from .._generated.aio import ApiKeyClient + class CustomizedApiKeyClient(ApiKeyClient): """Customized ApiKeyClient with additional functionality.""" From 967b3ac50dcb0d64e1b357404efb1b1bf5df1e27 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Fri, 25 Jul 2025 13:40:49 -0400 Subject: [PATCH 04/34] not deleting parent code --- packages/typespec-python/scripts/eng/regenerate.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/typespec-python/scripts/eng/regenerate.ts b/packages/typespec-python/scripts/eng/regenerate.ts index f7ee6f912af..98a0faf6e72 100644 --- a/packages/typespec-python/scripts/eng/regenerate.ts +++ b/packages/typespec-python/scripts/eng/regenerate.ts @@ -254,7 +254,14 @@ function getEmitterOption(spec: string, flavor: string): Record[ // Function to execute CLI commands asynchronously async function executeCommand(tspCommand: TspCommand): Promise { try { - rmSync(tspCommand.outputDir, { recursive: true, force: true }); + if (tspCommand.command.includes("generation-subdir")) { + // For generation-subdir, only delete the _generated folder within the output directory + const generatedSubdir = join(tspCommand.outputDir, "_generated"); + rmSync(generatedSubdir, { recursive: true, force: true }); + } else { + // For normal generation, delete the entire output directory + rmSync(tspCommand.outputDir, { recursive: true, force: true }); + } } catch (error) { console.error(`rm error: ${error}`); } From aff13ac91ebd9e95f22bec9c7e05c55f9b861ba1 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Fri, 25 Jul 2025 14:05:12 -0400 Subject: [PATCH 05/34] add tests for generation subdir --- .gitignore | 3 +++ .../typespec-python/scripts/eng/regenerate.ts | 7 +++++-- .../test_generation_subdir.py | 5 +++++ .../_utils/__init__.py => CHANGELOG.md} | 0 .../{subdir => }/MANIFEST.in | 0 .../{subdir => }/README.md | 0 .../{subdir => }/authentication/__init__.py | 0 .../authentication/apikey/__init__.py | 10 ++++++++++ .../authentication/apikey/_client.py | 20 +++++++++++++++++++ .../apikey/_generated/__init__.py | 0 .../apikey/_generated/_client.py | 0 .../apikey/_generated/_configuration.py | 0 .../apikey/_generated/_operations/__init__.py | 0 .../_generated/_operations/_operations.py | 0 .../apikey/_generated/_operations/_patch.py | 0 .../apikey/_generated/_patch.py | 0 .../apikey/_generated/_utils/__init__.py | 0 .../apikey/_generated/_utils/model_base.py | 0 .../apikey/_generated/_utils/serialization.py | 0 .../apikey/_generated/_utils/utils.py | 0 .../apikey/_generated/aio/__init__.py | 0 .../apikey/_generated/aio/_client.py | 0 .../apikey/_generated/aio/_configuration.py | 0 .../_generated/aio/_operations/__init__.py | 0 .../_generated/aio/_operations/_operations.py | 0 .../_generated/aio/_operations/_patch.py | 0 .../apikey/_generated/aio/_patch.py | 0 .../apikey/_generated/models/__init__.py | 0 .../apikey/_generated/models/_models.py | 0 .../apikey/_generated/models/_patch.py | 0 .../authentication/apikey/_version.py | 0 .../authentication/apikey/aio/__init__.py | 9 +++++++++ .../authentication/apikey/aio/_client.py | 20 +++++++++++++++++++ .../authentication/apikey/py.typed | 0 .../{subdir => }/setup.py | 0 .../subdir/CHANGELOG.md | 5 ----- .../subdir/authentication/apikey/_client.py | 13 ------------ .../authentication/apikey/aio/_client.py | 13 ------------ .../test/unbranded/requirements.txt | 1 + 39 files changed, 73 insertions(+), 33 deletions(-) create mode 100644 packages/typespec-python/test/generic_mock_api_tests/test_generation_subdir.py rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir/authentication/apikey/_generated/_utils/__init__.py => CHANGELOG.md} (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/MANIFEST.in (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/README.md (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/__init__.py (100%) create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/__init__.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_client.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_configuration.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_operations/__init__.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_operations/_operations.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_operations/_patch.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_patch.py (100%) create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/__init__.py rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_utils/model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_utils/serialization.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_utils/utils.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/aio/__init__.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/aio/_client.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/aio/_configuration.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/aio/_operations/__init__.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/aio/_operations/_operations.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/aio/_operations/_patch.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/aio/_patch.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/models/__init__.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/models/_models.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/models/_patch.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_version.py (100%) create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/py.typed (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/{subdir => }/setup.py (100%) delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/CHANGELOG.md delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_client.py delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/aio/_client.py diff --git a/.gitignore b/.gitignore index 06bd3cb697b..cf1d6e87806 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,9 @@ __pycache__/ # C extensions *.so +# macOS +.DS_Store + # Distribution / packaging .Python build/ diff --git a/packages/typespec-python/scripts/eng/regenerate.ts b/packages/typespec-python/scripts/eng/regenerate.ts index 98a0faf6e72..49e4186338b 100644 --- a/packages/typespec-python/scripts/eng/regenerate.ts +++ b/packages/typespec-python/scripts/eng/regenerate.ts @@ -392,8 +392,11 @@ function addOptions(spec: string, generatedFolder: string, flags: RegenerateFlag ...options, "package-name": packageName, "generation-subdir": "_generated/", - "emitter-output-dir": toPosix(`${generatedFolder}/test/${flags.flavor}/generated/${packageName}/subdir`) - } + "emitter-output-dir": toPosix( + `${generatedFolder}/test/${flags.flavor}/generated/${packageName}`, + ), + "generate-packaging-files": "false", + }; emitterConfigs.push({ optionsStr: getConfigsFromOptions(subdirOptions).join(" "), outputDir: subdirOptions["emitter-output-dir"], 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 new file mode 100644 index 00000000000..5b396cd202e --- /dev/null +++ b/packages/typespec-python/test/generic_mock_api_tests/test_generation_subdir.py @@ -0,0 +1,5 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/CHANGELOG.md similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/__init__.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/CHANGELOG.md diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/MANIFEST.in b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/MANIFEST.in similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/MANIFEST.in rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/MANIFEST.in diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/README.md b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/README.md similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/README.md rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/README.md diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/__init__.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/__init__.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/__init__.py new file mode 100644 index 00000000000..40b1309b160 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/__init__.py @@ -0,0 +1,10 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- + +from ._client import CustomizedApiKeyClient +from ._generated.models import InvalidAuth + +__all__ = ["CustomizedApiKeyClient", "InvalidAuth"] diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py new file mode 100644 index 00000000000..494a30bc010 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py @@ -0,0 +1,20 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- + +from ._generated import ApiKeyClient + +class CustomizedApiKeyClient(ApiKeyClient): + + def custom_method(self) -> str: + """ + A custom method that does something specific. + + :param param1: A string parameter. + :param param2: An integer parameter. + :return: A string result. + """ + # Custom logic here + return "Hello, world!" diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/__init__.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/__init__.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_client.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_client.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_client.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_configuration.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_configuration.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_configuration.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_configuration.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/__init__.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_operations.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_operations.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_operations.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_patch.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_patch.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_patch.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_patch.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_patch.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_patch.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_patch.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/model_base.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/model_base.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/serialization.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/serialization.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/serialization.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/serialization.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/utils.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/utils.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/utils.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/utils.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/__init__.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_client.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_client.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_client.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_configuration.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_configuration.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_configuration.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_configuration.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/__init__.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_operations.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_operations.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_operations.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_patch.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_patch.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_patch.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_patch.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_patch.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_patch.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/__init__.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/__init__.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_models.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_models.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_models.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_models.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_patch.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_patch.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_patch.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_patch.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_version.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_version.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_version.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_version.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/__init__.py new file mode 100644 index 00000000000..05103a06495 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/__init__.py @@ -0,0 +1,9 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- + +from ._client import CustomizedApiKeyClient + +__all__ = ["CustomizedApiKeyClient"] diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py new file mode 100644 index 00000000000..1a6a919d0db --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py @@ -0,0 +1,20 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- + +from .._generated.aio import ApiKeyClient + +class CustomizedApiKeyClient(ApiKeyClient): + + def custom_method(self) -> str: + """ + A custom method that does something specific. + + :param param1: A string parameter. + :param param2: An integer parameter. + :return: A string result. + """ + # Custom logic here + return "Hello, world!" diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/py.typed b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/py.typed similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/py.typed rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/py.typed diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/setup.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/setup.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/setup.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/setup.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/CHANGELOG.md b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/CHANGELOG.md deleted file mode 100644 index 628743d283a..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/CHANGELOG.md +++ /dev/null @@ -1,5 +0,0 @@ -# Release History - -## 1.0.0b1 (1970-01-01) - -- Initial version diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_client.py deleted file mode 100644 index 9660004b327..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_client.py +++ /dev/null @@ -1,13 +0,0 @@ -from ._generated import ApiKeyClient - - -class CustomizedApiKeyClient(ApiKeyClient): - """Customized ApiKeyClient with additional functionality.""" - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - # Additional initialization or customization can be done here - - def custom_method(self): - """An example of a custom method that extends the functionality.""" - print("This is a custom method in the CustomizedApiKeyClient.") diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/aio/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/aio/_client.py deleted file mode 100644 index 6eb92087c4c..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/aio/_client.py +++ /dev/null @@ -1,13 +0,0 @@ -from .._generated.aio import ApiKeyClient - - -class CustomizedApiKeyClient(ApiKeyClient): - """Customized ApiKeyClient with additional functionality.""" - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - # Additional initialization or customization can be done here - - def custom_method(self): - """An example of a custom method that extends the functionality.""" - print("This is a custom method in the CustomizedApiKeyClient.") diff --git a/packages/typespec-python/test/unbranded/requirements.txt b/packages/typespec-python/test/unbranded/requirements.txt index b4b97840559..4ac844aff9f 100644 --- a/packages/typespec-python/test/unbranded/requirements.txt +++ b/packages/typespec-python/test/unbranded/requirements.txt @@ -5,6 +5,7 @@ pytest-asyncio==0.14.0;python_full_version>="3.5.2" # common test case -e ./generated/authentication-api-key +-e ./generated/authentication-api-key-with-subdir -e ./generated/authentication-http-custom -e ./generated/authentication-oauth2 -e ./generated/authentication-union From fa719d3e0bdeb44faaab1147b5852dcdd35c71d8 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Fri, 25 Jul 2025 14:14:07 -0400 Subject: [PATCH 06/34] use existing infrastructure --- .../typespec-python/scripts/eng/regenerate.ts | 32 +++---------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/packages/typespec-python/scripts/eng/regenerate.ts b/packages/typespec-python/scripts/eng/regenerate.ts index 49e4186338b..369ab6379be 100644 --- a/packages/typespec-python/scripts/eng/regenerate.ts +++ b/packages/typespec-python/scripts/eng/regenerate.ts @@ -362,10 +362,6 @@ interface EmitterConfig { outputDir: string; } -function generateSubdir(spec: string): boolean { - return spec.includes("authentication/api-key"); -} - function addOptions(spec: string, generatedFolder: string, flags: RegenerateFlags): EmitterConfig[] { const emitterConfigs: EmitterConfig[] = []; for (const config of getEmitterOption(spec, flags.flavor)) { @@ -382,36 +378,16 @@ function addOptions(spec: string, generatedFolder: string, flags: RegenerateFlag options["debug"] = "true"; } options["examples-dir"] = toPosix(join(dirname(spec), "examples")); + const configs = Object.entries(options).flatMap(([k, v]) => { + return `--option @azure-tools/typespec-python.${k}=${typeof v === "string" && v.indexOf(" ") > -1 ? `"${v}"` : v}`; + }); emitterConfigs.push({ - optionsStr: getConfigsFromOptions(options).join(" "), + optionsStr: configs.join(" "), outputDir: options["emitter-output-dir"], }); - if (generateSubdir(spec)) { - const packageName = `${options["package-name"] || defaultPackageName(spec)}-with-subdir`; - const subdirOptions = { - ...options, - "package-name": packageName, - "generation-subdir": "_generated/", - "emitter-output-dir": toPosix( - `${generatedFolder}/test/${flags.flavor}/generated/${packageName}`, - ), - "generate-packaging-files": "false", - }; - emitterConfigs.push({ - optionsStr: getConfigsFromOptions(subdirOptions).join(" "), - outputDir: subdirOptions["emitter-output-dir"], - }); - } } return emitterConfigs; } - -function getConfigsFromOptions(options: Record): string[] { - return Object.entries(options).flatMap(([k, v]) => { - return `--option @azure-tools/typespec-python.${k}=${typeof v === "string" && v.indexOf(" ") > -1 ? `"${v}"` : v}`; - }); -} - function _getCmdList(spec: string, flags: RegenerateFlags): TspCommand[] { return addOptions(spec, PLUGIN_DIR, flags).map((option) => { return { From 95fdcbd09c93274ad6eb3ed4fa667a579411d4b4 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Fri, 25 Jul 2025 14:17:47 -0400 Subject: [PATCH 07/34] clean up regenerate.ts and black code --- packages/typespec-python/scripts/eng/regenerate.ts | 10 ++++++++++ .../authentication/apikey/_client.py | 5 +++-- .../authentication/apikey/aio/_client.py | 5 +++-- .../authentication/apikey/_configuration.py | 2 +- .../authentication/apikey/aio/_configuration.py | 2 +- .../generated/authentication-api-key/setup.py | 4 ++-- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/packages/typespec-python/scripts/eng/regenerate.ts b/packages/typespec-python/scripts/eng/regenerate.ts index 369ab6379be..f7b8dbf3dab 100644 --- a/packages/typespec-python/scripts/eng/regenerate.ts +++ b/packages/typespec-python/scripts/eng/regenerate.ts @@ -131,6 +131,16 @@ const EMITTER_OPTIONS: Record | Record str: """ A custom method that does something specific. - + :param param1: A string parameter. :param param2: An integer parameter. :return: A string result. diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py index 1a6a919d0db..2afc1074f72 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py @@ -6,12 +6,13 @@ from .._generated.aio import ApiKeyClient + class CustomizedApiKeyClient(ApiKeyClient): - + def custom_method(self) -> str: """ A custom method that does something specific. - + :param param1: A string parameter. :param param2: An integer parameter. :return: A string result. diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_configuration.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_configuration.py index 4f9890c8b43..83920ccb680 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_configuration.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_configuration.py @@ -28,7 +28,7 @@ def __init__( self.credential = credential self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "authentication-apikey/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "authentication-api-key/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/aio/_configuration.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/aio/_configuration.py index dca06237d05..9e408d523ab 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/aio/_configuration.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/aio/_configuration.py @@ -28,7 +28,7 @@ def __init__( self.credential = credential self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "authentication-apikey/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "authentication-api-key/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key/setup.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key/setup.py index 659e31d511b..37a88c7f5f8 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key/setup.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key/setup.py @@ -6,8 +6,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "authentication-apikey" -PACKAGE_PPRINT_NAME = "Authentication Apikey" +PACKAGE_NAME = "authentication-api-key" +PACKAGE_PPRINT_NAME = "Authentication Api Key" PACKAGE_NAMESPACE = "authentication.apikey" # a.b.c => a/b/c From dcfc458d579b0a3235663239bacf23525a460352 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Fri, 25 Jul 2025 14:43:29 -0400 Subject: [PATCH 08/34] working on azure --- .../typespec-python/scripts/eng/regenerate.ts | 1 - .../CHANGELOG.md | 0 .../{subdir => }/MANIFEST.in | 0 .../README.md | 30 +++++++++++++ .../{subdir => }/authentication/__init__.py | 0 .../authentication/apikey/__init__.py | 10 +++++ .../authentication/apikey/_client.py | 21 +++++++++ .../apikey/_generated/__init__.py | 0 .../apikey/_generated/_client.py | 0 .../apikey/_generated/_configuration.py | 0 .../apikey/_generated/_operations/__init__.py | 0 .../_generated/_operations/_operations.py | 0 .../apikey/_generated/_operations/_patch.py | 0 .../apikey/_generated/_patch.py | 0 .../apikey/_generated/_utils/__init__.py | 0 .../apikey/_generated/_utils/model_base.py | 0 .../apikey/_generated/_utils/serialization.py | 0 .../apikey/_generated/_utils/utils.py | 0 .../apikey/_generated/aio/__init__.py | 0 .../apikey/_generated/aio/_client.py | 0 .../apikey/_generated/aio/_configuration.py | 0 .../_generated/aio/_operations/__init__.py | 0 .../_generated/aio/_operations/_operations.py | 0 .../_generated/aio/_operations/_patch.py | 0 .../apikey/_generated/aio/_patch.py | 0 .../_generated}/apiview-properties.json | 0 .../_generated}/generated_tests/conftest.py | 0 .../generated_tests/test_api_key.py | 0 .../generated_tests/test_api_key_async.py | 0 .../generated_tests/testpreparer.py | 0 .../generated_tests/testpreparer_async.py | 0 .../apikey/_generated/models/__init__.py | 0 .../apikey/_generated/models/_models.py | 0 .../apikey/_generated/models/_patch.py | 0 .../authentication/apikey/_version.py | 0 .../authentication/apikey/aio/__init__.py | 9 ++++ .../authentication/apikey/aio/_client.py | 21 +++++++++ .../authentication/apikey/py.typed | 0 .../{subdir => }/setup.py | 15 ++----- .../subdir/CHANGELOG.md | 5 --- .../subdir/LICENSE | 21 --------- .../subdir/README.md | 43 ------------------- .../subdir/dev_requirements.txt | 3 -- .../test/azure/requirements.txt | 1 + .../authentication/apikey/_configuration.py | 2 +- .../apikey/aio/_configuration.py | 2 +- .../generated/authentication-api-key/setup.py | 4 +- 47 files changed, 99 insertions(+), 89 deletions(-) create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/CHANGELOG.md rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/MANIFEST.in (100%) create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/README.md rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/__init__.py (100%) create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/__init__.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_client.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_configuration.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_operations/__init__.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_operations/_operations.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_operations/_patch.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_patch.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_utils/__init__.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_utils/model_base.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_utils/serialization.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/_utils/utils.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/aio/__init__.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/aio/_client.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/aio/_configuration.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/aio/_operations/__init__.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/aio/_operations/_operations.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/aio/_operations/_patch.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/aio/_patch.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => authentication/apikey/_generated}/apiview-properties.json (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => authentication/apikey/_generated}/generated_tests/conftest.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => authentication/apikey/_generated}/generated_tests/test_api_key.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => authentication/apikey/_generated}/generated_tests/test_api_key_async.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => authentication/apikey/_generated}/generated_tests/testpreparer.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => authentication/apikey/_generated}/generated_tests/testpreparer_async.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/models/__init__.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/models/_models.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_generated/models/_patch.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/_version.py (100%) create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/authentication/apikey/py.typed (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/{subdir => }/setup.py (68%) delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/CHANGELOG.md delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/LICENSE delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/README.md delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/dev_requirements.txt diff --git a/packages/typespec-python/scripts/eng/regenerate.ts b/packages/typespec-python/scripts/eng/regenerate.ts index f7b8dbf3dab..7125a620dca 100644 --- a/packages/typespec-python/scripts/eng/regenerate.ts +++ b/packages/typespec-python/scripts/eng/regenerate.ts @@ -133,7 +133,6 @@ const EMITTER_OPTIONS: Record | Record>> from authentication.apikey import ApiKeyClient +>>> from corehttp.exceptions import HttpResponseError + +>>> client = ApiKeyClient(endpoint='') +>>> try: + + except HttpResponseError as e: + print('service responds error: {}'.format(e.response.json())) +``` diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/__init__.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/__init__.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/__init__.py new file mode 100644 index 00000000000..40b1309b160 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/__init__.py @@ -0,0 +1,10 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- + +from ._client import CustomizedApiKeyClient +from ._generated.models import InvalidAuth + +__all__ = ["CustomizedApiKeyClient", "InvalidAuth"] diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py new file mode 100644 index 00000000000..8d5e460053b --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py @@ -0,0 +1,21 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- + +from ._generated import ApiKeyClient + + +class CustomizedApiKeyClient(ApiKeyClient): + + def custom_method(self) -> str: + """ + A custom method that does something specific. + + :param param1: A string parameter. + :param param2: An integer parameter. + :return: A string result. + """ + # Custom logic here + return "Hello, world!" diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/__init__.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/__init__.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_client.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_client.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_configuration.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_configuration.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_configuration.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_configuration.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_operations.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_operations.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_patch.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_patch.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/__init__.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/__init__.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/model_base.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/model_base.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/model_base.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/serialization.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/serialization.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/serialization.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/utils.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/utils.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/_utils/utils.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/utils.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/__init__.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_client.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_client.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_configuration.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_configuration.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_configuration.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_operations.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_operations.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/aio/_patch.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/apiview-properties.json b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/apiview-properties.json similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/apiview-properties.json rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/apiview-properties.json diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/conftest.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/conftest.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/conftest.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/conftest.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/test_api_key.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/test_api_key.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/test_api_key.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/test_api_key.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/test_api_key_async.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/test_api_key_async.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/test_api_key_async.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/test_api_key_async.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/testpreparer.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/testpreparer.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/testpreparer.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/testpreparer_async.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/generated_tests/testpreparer_async.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/testpreparer_async.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/__init__.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/__init__.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_models.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_models.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_models.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_models.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_generated/models/_patch.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_patch.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_version.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/_version.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_version.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/__init__.py new file mode 100644 index 00000000000..05103a06495 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/__init__.py @@ -0,0 +1,9 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- + +from ._client import CustomizedApiKeyClient + +__all__ = ["CustomizedApiKeyClient"] diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py new file mode 100644 index 00000000000..2afc1074f72 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py @@ -0,0 +1,21 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- + +from .._generated.aio import ApiKeyClient + + +class CustomizedApiKeyClient(ApiKeyClient): + + def custom_method(self) -> str: + """ + A custom method that does something specific. + + :param param1: A string parameter. + :param param2: An integer parameter. + :return: A string result. + """ + # Custom logic here + return "Hello, world!" diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/py.typed b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/authentication/apikey/py.typed rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/py.typed diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/setup.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/setup.py similarity index 68% rename from packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/setup.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/setup.py index 27cc6c2fb6b..f2a51d6a432 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/setup.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/setup.py @@ -1,10 +1,4 @@ # 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. -# -------------------------------------------------------------------------- import os @@ -30,14 +24,11 @@ setup( name=PACKAGE_NAME, version=version, - description="Microsoft Corporation {} Client Library for Python".format(PACKAGE_PPRINT_NAME), + description=" {} Client Library for Python".format(PACKAGE_PPRINT_NAME), long_description=open("README.md", "r").read(), long_description_content_type="text/markdown", license="MIT License", - author="Microsoft Corporation", - author_email="azpysdkhelp@microsoft.com", - url="https://github.com/Azure/azure-sdk-for-python/tree/main/sdk", - keywords="azure, azure sdk", + author="", classifiers=[ "Development Status :: 4 - Beta", "Programming Language :: Python", @@ -63,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "azure-core>=1.30.0", + "corehttp[requests]>=1.0.0b6", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/CHANGELOG.md b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/CHANGELOG.md deleted file mode 100644 index 628743d283a..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/CHANGELOG.md +++ /dev/null @@ -1,5 +0,0 @@ -# Release History - -## 1.0.0b1 (1970-01-01) - -- Initial version diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/LICENSE b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/LICENSE deleted file mode 100644 index 63447fd8bbb..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -Copyright (c) Microsoft Corporation. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/README.md b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/README.md deleted file mode 100644 index 470c235fecd..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/README.md +++ /dev/null @@ -1,43 +0,0 @@ -# Authentication Api Key With Subdir client library for Python - - -## Getting started - -### Install the package - -```bash -python -m pip install authentication-api-key-with-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 With Subdir instance. - - -## Contributing - -This project welcomes contributions and suggestions. Most contributions require -you to agree to a Contributor License Agreement (CLA) declaring that you have -the right to, and actually do, grant us the rights to use your contribution. -For details, visit https://cla.microsoft.com. - -When you submit a pull request, a CLA-bot will automatically determine whether -you need to provide a CLA and decorate the PR appropriately (e.g., label, -comment). Simply follow the instructions provided by the bot. You will only -need to do this once across all repos using our CLA. - -This project has adopted the -[Microsoft Open Source Code of Conduct][code_of_conduct]. For more information, -see the Code of Conduct FAQ or contact opencode@microsoft.com with any -additional questions or comments. - - -[code_of_conduct]: https://opensource.microsoft.com/codeofconduct/ -[authenticate_with_token]: https://docs.microsoft.com/azure/cognitive-services/authentication?tabs=powershell#authenticate-with-an-authentication-token -[azure_identity_credentials]: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity#credentials -[azure_identity_pip]: https://pypi.org/project/azure-identity/ -[default_azure_credential]: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity#defaultazurecredential -[pip]: https://pypi.org/project/pip/ -[azure_sub]: https://azure.microsoft.com/free/ diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/dev_requirements.txt b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/dev_requirements.txt deleted file mode 100644 index 10548647144..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/subdir/dev_requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ --e ../../../tools/azure-sdk-tools -../../core/azure-core -aiohttp \ No newline at end of file diff --git a/packages/typespec-python/test/azure/requirements.txt b/packages/typespec-python/test/azure/requirements.txt index 8ea937c9590..1d01bf4a8a0 100644 --- a/packages/typespec-python/test/azure/requirements.txt +++ b/packages/typespec-python/test/azure/requirements.txt @@ -38,6 +38,7 @@ azure-mgmt-core==1.5.0 # common test case -e ./generated/authentication-api-key +-e ./generated/authentication-api-key-with-subdir -e ./generated/authentication-http-custom -e ./generated/authentication-oauth2 -e ./generated/authentication-union diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_configuration.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_configuration.py index 83920ccb680..4f9890c8b43 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_configuration.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_configuration.py @@ -28,7 +28,7 @@ def __init__( self.credential = credential self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "authentication-api-key/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "authentication-apikey/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/aio/_configuration.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/aio/_configuration.py index 9e408d523ab..dca06237d05 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/aio/_configuration.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/aio/_configuration.py @@ -28,7 +28,7 @@ def __init__( self.credential = credential self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "authentication-api-key/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "authentication-apikey/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key/setup.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key/setup.py index 37a88c7f5f8..659e31d511b 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key/setup.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key/setup.py @@ -6,8 +6,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "authentication-api-key" -PACKAGE_PPRINT_NAME = "Authentication Api Key" +PACKAGE_NAME = "authentication-apikey" +PACKAGE_PPRINT_NAME = "Authentication Apikey" PACKAGE_NAMESPACE = "authentication.apikey" # a.b.c => a/b/c From b01aea83f0941627156a37e6739730294eefad68 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Fri, 25 Jul 2025 15:04:48 -0400 Subject: [PATCH 09/34] add tests --- .../authentication/apikey/_client.py | 2 +- .../authentication/apikey/aio/_client.py | 2 +- .../asynctests/test_generation_subdir_async.py | 13 +++++++++++++ .../test_generation_subdir.py | 15 +++++++++++++++ .../authentication/apikey/_client.py | 2 +- .../authentication/apikey/aio/_client.py | 2 +- 6 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 packages/typespec-python/test/generic_mock_api_tests/asynctests/test_generation_subdir_async.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py index 8d5e460053b..420231520ea 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py @@ -18,4 +18,4 @@ def custom_method(self) -> str: :return: A string result. """ # Custom logic here - return "Hello, world!" + return "This is a custom method in the subdirectory client." diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py index 2afc1074f72..9afa30756f0 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py @@ -18,4 +18,4 @@ def custom_method(self) -> str: :return: A string result. """ # Custom logic here - return "Hello, world!" + return "This is a custom method in the subdirectory client." 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 new file mode 100644 index 00000000000..6d07cb87478 --- /dev/null +++ b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_generation_subdir_async.py @@ -0,0 +1,13 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +import pytest +from authentication.apikey.aio import ApiKeyClient + +@pytest.mark.asyncio +async def test_custom_method(key_credential): + async with ApiKeyClient(key_credential("valid-key")) as client: + + assert client.custom_method() == "This is a custom method in the subdirectory client." 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 5b396cd202e..839544b4e84 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,3 +3,18 @@ # Licensed under the MIT License. See License.txt in the project root for # license information. # -------------------------------------------------------------------------- +import pytest +from authentication.apikey import ApiKeyClient + + +def test_custom_method(key_credential): + with ApiKeyClient(key_credential("valid-key")) as client: + assert client.custom_method() == "This is a custom method in the subdirectory client." + +def test_custom_model(): + try: + from authentication.apikey import InvalidAuth + assert InvalidAuth is not None + except ImportError: + pytest.fail("InvalidAuth could not be imported") + diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py index 8d5e460053b..420231520ea 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py @@ -18,4 +18,4 @@ def custom_method(self) -> str: :return: A string result. """ # Custom logic here - return "Hello, world!" + return "This is a custom method in the subdirectory client." diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py index 2afc1074f72..9afa30756f0 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py @@ -18,4 +18,4 @@ def custom_method(self) -> str: :return: A string result. """ # Custom logic here - return "Hello, world!" + return "This is a custom method in the subdirectory client." From 65ad99cb6464aea13f8bf6e1632eccfa0a3da824 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 29 Jul 2025 14:21:14 -0400 Subject: [PATCH 10/34] use latest --- packages/autorest.python/package.json | 2 +- packages/typespec-python/package.json | 2 +- pnpm-lock.yaml | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/autorest.python/package.json b/packages/autorest.python/package.json index 087932dced3..5844ebceda1 100644 --- a/packages/autorest.python/package.json +++ b/packages/autorest.python/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md", "dependencies": { - "@typespec/http-client-python": "/Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz", + "@typespec/http-client-python": "/Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz", "@autorest/system-requirements": "~1.0.2", "fs-extra": "~11.2.0", "tsx": "~4.19.1" diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json index 5b8fbfee226..1ec433730ba 100644 --- a/packages/typespec-python/package.json +++ b/packages/typespec-python/package.json @@ -67,7 +67,7 @@ "js-yaml": "~4.1.0", "semver": "~7.6.2", "tsx": "~4.19.1", - "@typespec/http-client-python": "/Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz", + "@typespec/http-client-python": "/Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz", "fs-extra": "~11.2.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index df8688b7264..baac26297de 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,8 +60,8 @@ importers: specifier: ~1.0.2 version: 1.0.2 '@typespec/http-client-python': - specifier: /Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz - version: file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz(iurth4uuk4s6znzuuc7ncenk2q) + specifier: /Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz + version: file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz(iurth4uuk4s6znzuuc7ncenk2q) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -82,8 +82,8 @@ importers: packages/typespec-python: dependencies: '@typespec/http-client-python': - specifier: /Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz - version: file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz(iurth4uuk4s6znzuuc7ncenk2q) + specifier: /Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz + version: file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz(iurth4uuk4s6znzuuc7ncenk2q) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -1668,9 +1668,9 @@ packages: peerDependencies: '@typespec/compiler': ^1.2.1 - '@typespec/http-client-python@file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz': - resolution: {integrity: sha512-zPYqoQGixirxALVmurSGwsiM7FaQ3xwyMe/rk4OJVP+SLIiTr4JWRMHTRA6JI6d1+iIm+9OY8HEDfVHtdA/vNA==, tarball: file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz} - version: 0.14.0 + '@typespec/http-client-python@file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz': + resolution: {integrity: sha512-57r85vuMTSYfoTJc/MGCSqazA7P+dup4tekHbuyfU1bEf525HlJ1pdeGvyFFx6IqY/GKIzrNA9QqPbowUnsG9w==, tarball: file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz} + version: 0.14.1 engines: {node: '>=20.0.0'} peerDependencies: '@azure-tools/typespec-autorest': '>=0.58.0 <1.0.0' @@ -6422,7 +6422,7 @@ snapshots: dependencies: '@typespec/compiler': 1.2.1(@types/node@22.13.17) - '@typespec/http-client-python@file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.0.tgz(iurth4uuk4s6znzuuc7ncenk2q)': + '@typespec/http-client-python@file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz(iurth4uuk4s6znzuuc7ncenk2q)': dependencies: '@azure-tools/typespec-autorest': 0.58.0(vddu6w2yloigenmssnpyjivoim) '@azure-tools/typespec-azure-core': 0.58.0(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))(@typespec/rest@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))) From 49384946f5db6476e7f331bec403be56b6a7fb9b Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Fri, 1 Aug 2025 16:02:05 -0400 Subject: [PATCH 11/34] use build artficat --- packages/autorest.python/package.json | 2 +- packages/typespec-python/package.json | 2 +- pnpm-lock.yaml | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/autorest.python/package.json b/packages/autorest.python/package.json index 169d13f7cc6..4e1b08f89fc 100644 --- a/packages/autorest.python/package.json +++ b/packages/autorest.python/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md", "dependencies": { - "@typespec/http-client-python": "/Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz", + "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", "@autorest/system-requirements": "~1.0.2", "fs-extra": "~11.2.0", "tsx": "~4.19.1" diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json index 142922a993e..461f0661ca9 100644 --- a/packages/typespec-python/package.json +++ b/packages/typespec-python/package.json @@ -67,7 +67,7 @@ "js-yaml": "~4.1.0", "semver": "~7.6.2", "tsx": "~4.19.1", - "@typespec/http-client-python": "/Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz", + "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", "fs-extra": "~11.2.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3a7e6a18370..10f7e1191ea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,8 +60,8 @@ importers: specifier: ~1.0.2 version: 1.0.2 '@typespec/http-client-python': - specifier: /Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz - version: file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz(iczbepxqiakhsdv7fgak6rpfim) + specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz + version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -82,8 +82,8 @@ importers: packages/typespec-python: dependencies: '@typespec/http-client-python': - specifier: /Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz - version: file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz(syuyg2efcycv4rjoyukojjfo2i) + specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz + version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(syuyg2efcycv4rjoyukojjfo2i) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -1527,9 +1527,9 @@ packages: peerDependencies: '@typespec/compiler': ^1.2.1 - '@typespec/http-client-python@file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz': - resolution: {integrity: sha512-eBUupYvvs7S30/r/bRim83t+sZ4MtSORkHbAX2rKSYxUK2yQ+rlIjkVKpxD7J7H3z/IANMFOZO6Vq0OhZDq3Dw==, tarball: file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz} - version: 0.14.1 + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz': + resolution: {tarball: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz} + version: 0.14.2 engines: {node: '>=20.0.0'} peerDependencies: '@azure-tools/typespec-autorest': '>=0.58.0 <1.0.0' @@ -4693,7 +4693,7 @@ snapshots: '@autorest/python@file:packages/autorest.python(iczbepxqiakhsdv7fgak6rpfim)': dependencies: '@autorest/system-requirements': 1.0.2 - '@typespec/http-client-python': file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz(iczbepxqiakhsdv7fgak6rpfim) + '@typespec/http-client-python': https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim) fs-extra: 11.2.0 tsx: 4.19.4 transitivePeerDependencies: @@ -6497,7 +6497,7 @@ snapshots: dependencies: '@typespec/compiler': 1.2.1(@types/node@24.0.15) - '@typespec/http-client-python@file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz(iczbepxqiakhsdv7fgak6rpfim)': + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim)': dependencies: '@azure-tools/typespec-autorest': 0.58.1(v7wf2zb5txflycjk6xzznulzs4) '@azure-tools/typespec-azure-core': 0.58.0(@typespec/compiler@1.2.1(@types/node@24.0.15))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@24.0.15))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@24.0.15))))(@typespec/rest@0.72.1(@typespec/compiler@1.2.1(@types/node@24.0.15))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@24.0.15))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@24.0.15))))) @@ -6522,7 +6522,7 @@ snapshots: - bufferutil - utf-8-validate - '@typespec/http-client-python@file:../typespec/packages/http-client-python/typespec-http-client-python-0.14.1.tgz(syuyg2efcycv4rjoyukojjfo2i)': + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(syuyg2efcycv4rjoyukojjfo2i)': dependencies: '@azure-tools/typespec-autorest': 0.58.1(3incr7dx56ztepkodc2t2fp6e4) '@azure-tools/typespec-azure-core': 0.58.0(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))(@typespec/rest@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))) From a23bcccfc103615ec7aedde60ec9b482cea9476c Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 4 Aug 2025 12:06:02 -0400 Subject: [PATCH 12/34] test latest --- packages/autorest.python/package.json | 2 +- packages/typespec-python/package.json | 2 +- pnpm-lock.yaml | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/autorest.python/package.json b/packages/autorest.python/package.json index 4e1b08f89fc..f9fad6152d7 100644 --- a/packages/autorest.python/package.json +++ b/packages/autorest.python/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md", "dependencies": { - "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", + "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", "@autorest/system-requirements": "~1.0.2", "fs-extra": "~11.2.0", "tsx": "~4.19.1" diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json index 461f0661ca9..4ba617075cb 100644 --- a/packages/typespec-python/package.json +++ b/packages/typespec-python/package.json @@ -67,7 +67,7 @@ "js-yaml": "~4.1.0", "semver": "~7.6.2", "tsx": "~4.19.1", - "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", + "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", "fs-extra": "~11.2.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 10f7e1191ea..e0054673e55 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,8 +60,8 @@ importers: specifier: ~1.0.2 version: 1.0.2 '@typespec/http-client-python': - specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz - version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim) + specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz + version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -82,8 +82,8 @@ importers: packages/typespec-python: dependencies: '@typespec/http-client-python': - specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz - version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(syuyg2efcycv4rjoyukojjfo2i) + specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz + version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(syuyg2efcycv4rjoyukojjfo2i) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -1527,8 +1527,8 @@ packages: peerDependencies: '@typespec/compiler': ^1.2.1 - '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz': - resolution: {tarball: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz} + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz': + resolution: {tarball: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz} version: 0.14.2 engines: {node: '>=20.0.0'} peerDependencies: @@ -4693,7 +4693,7 @@ snapshots: '@autorest/python@file:packages/autorest.python(iczbepxqiakhsdv7fgak6rpfim)': dependencies: '@autorest/system-requirements': 1.0.2 - '@typespec/http-client-python': https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim) + '@typespec/http-client-python': https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim) fs-extra: 11.2.0 tsx: 4.19.4 transitivePeerDependencies: @@ -6497,7 +6497,7 @@ snapshots: dependencies: '@typespec/compiler': 1.2.1(@types/node@24.0.15) - '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim)': + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim)': dependencies: '@azure-tools/typespec-autorest': 0.58.1(v7wf2zb5txflycjk6xzznulzs4) '@azure-tools/typespec-azure-core': 0.58.0(@typespec/compiler@1.2.1(@types/node@24.0.15))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@24.0.15))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@24.0.15))))(@typespec/rest@0.72.1(@typespec/compiler@1.2.1(@types/node@24.0.15))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@24.0.15))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@24.0.15))))) @@ -6522,7 +6522,7 @@ snapshots: - bufferutil - utf-8-validate - '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MDA2NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(syuyg2efcycv4rjoyukojjfo2i)': + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(syuyg2efcycv4rjoyukojjfo2i)': dependencies: '@azure-tools/typespec-autorest': 0.58.1(3incr7dx56ztepkodc2t2fp6e4) '@azure-tools/typespec-azure-core': 0.58.0(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))(@typespec/rest@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))) From d134371d8c6a8d039bbd4c747eb4be7125ca5ece Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 4 Aug 2025 12:17:12 -0400 Subject: [PATCH 13/34] regenerate --- .../typespec-python/scripts/eng/regenerate.ts | 1 + .../CHANGELOG.md | 0 .../MANIFEST.in | 6 - .../README.md | 30 - .../authentication/__init__.py | 1 - .../authentication/apikey/__init__.py | 10 - .../authentication/apikey/_client.py | 21 - .../apikey/_generated/__init__.py | 32 - .../apikey/_generated/_client.py | 95 - .../apikey/_generated/_configuration.py | 50 - .../apikey/_generated/_operations/__init__.py | 22 - .../_generated/_operations/_operations.py | 152 -- .../apikey/_generated/_operations/_patch.py | 21 - .../apikey/_generated/_patch.py | 21 - .../apikey/_generated/_utils/__init__.py | 6 - .../apikey/_generated/_utils/model_base.py | 1232 ---------- .../apikey/_generated/_utils/serialization.py | 2032 ----------------- .../apikey/_generated/_utils/utils.py | 25 - .../apikey/_generated/aio/__init__.py | 29 - .../apikey/_generated/aio/_client.py | 97 - .../apikey/_generated/aio/_configuration.py | 50 - .../_generated/aio/_operations/__init__.py | 22 - .../_generated/aio/_operations/_operations.py | 128 -- .../_generated/aio/_operations/_patch.py | 21 - .../apikey/_generated/aio/_patch.py | 21 - .../apikey/_generated/apiview-properties.json | 10 - .../_generated/generated_tests/conftest.py | 35 - .../generated_tests/test_api_key.py | 31 - .../generated_tests/test_api_key_async.py | 32 - .../generated_tests/testpreparer.py | 24 - .../generated_tests/testpreparer_async.py | 20 - .../apikey/_generated/models/__init__.py | 27 - .../apikey/_generated/models/_models.py | 40 - .../apikey/_generated/models/_patch.py | 21 - .../authentication/apikey/_version.py | 9 - .../authentication/apikey/aio/__init__.py | 9 - .../authentication/apikey/aio/_client.py | 21 - .../authentication/apikey/py.typed | 1 - .../setup.py | 61 - .../apikey/_operations/_operations.py | 10 +- .../http/custom/_operations/_operations.py | 10 +- .../core/override/models/_models.py | 36 +- .../core/basic/_operations/_operations.py | 8 +- .../commonproperties/models/_models.py | 12 +- ...test_common_properties_error_operations.py | 2 +- ...ommon_properties_error_operations_async.py | 2 +- ..._properties_managed_identity_operations.py | 4 +- ...rties_managed_identity_operations_async.py | 4 +- .../operationtemplates/models/_models.py | 12 +- .../operations/_operations.py | 8 +- ...test_operation_templates_lro_operations.py | 2 +- ...peration_templates_lro_operations_async.py | 2 +- .../resources/models/_models.py | 30 +- .../resources/operations/_operations.py | 35 +- ...sources_extensions_resources_operations.py | 4 +- ...s_extensions_resources_operations_async.py | 4 +- ...resources_location_resources_operations.py | 4 +- ...ces_location_resources_operations_async.py | 4 +- .../test_resources_nested_operations.py | 4 +- .../test_resources_nested_operations_async.py | 4 +- .../test_resources_singleton_operations.py | 4 +- ...st_resources_singleton_operations_async.py | 4 +- .../test_resources_top_level_operations.py | 4 +- ...st_resources_top_level_operations_async.py | 4 +- .../generated_tests/test_visibility.py | 12 +- .../generated_tests/test_visibility_async.py | 12 +- .../headasbooleanfalse/models/_models.py | 5 + .../generated_tests/test_visibility.py | 12 +- .../generated_tests/test_visibility_async.py | 12 +- .../headasbooleantrue/models/_models.py | 5 + .../generated_tests/test_visibility.py | 12 +- .../generated_tests/test_visibility_async.py | 12 +- .../model/visibility/models/_models.py | 5 + 73 files changed, 158 insertions(+), 4612 deletions(-) delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/CHANGELOG.md delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/MANIFEST.in delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/README.md delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/__init__.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/__init__.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/__init__.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_client.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_configuration.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/__init__.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_operations.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_patch.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_patch.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/__init__.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/model_base.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/serialization.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/utils.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/__init__.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_client.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_configuration.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/__init__.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_operations.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_patch.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_patch.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/apiview-properties.json delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/conftest.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/test_api_key.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/test_api_key_async.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/testpreparer.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/testpreparer_async.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/__init__.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_models.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_patch.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_version.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/__init__.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/py.typed delete mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/setup.py diff --git a/packages/typespec-python/scripts/eng/regenerate.ts b/packages/typespec-python/scripts/eng/regenerate.ts index 427e1032a82..916d567cbbe 100644 --- a/packages/typespec-python/scripts/eng/regenerate.ts +++ b/packages/typespec-python/scripts/eng/regenerate.ts @@ -138,6 +138,7 @@ const EMITTER_OPTIONS: Record | Record>> from authentication.apikey import ApiKeyClient ->>> from corehttp.exceptions import HttpResponseError - ->>> client = ApiKeyClient(endpoint='') ->>> try: - - except HttpResponseError as e: - print('service responds error: {}'.format(e.response.json())) -``` diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/__init__.py deleted file mode 100644 index d55ccad1f57..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-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/azure/generated/authentication-api-key-with-subdir/authentication/apikey/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/__init__.py deleted file mode 100644 index 40b1309b160..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/__init__.py +++ /dev/null @@ -1,10 +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 ._client import CustomizedApiKeyClient -from ._generated.models import InvalidAuth - -__all__ = ["CustomizedApiKeyClient", "InvalidAuth"] diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py deleted file mode 100644 index 420231520ea..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py +++ /dev/null @@ -1,21 +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 ._generated import ApiKeyClient - - -class CustomizedApiKeyClient(ApiKeyClient): - - def custom_method(self) -> str: - """ - A custom method that does something specific. - - :param param1: A string parameter. - :param param2: An integer parameter. - :return: A string result. - """ - # Custom logic here - return "This is a custom method in the subdirectory client." diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/__init__.py deleted file mode 100644 index fb55d8ab1df..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/__init__.py +++ /dev/null @@ -1,32 +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=wrong-import-position - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from ._patch import * # pylint: disable=unused-wildcard-import - -from ._client import ApiKeyClient # type: ignore -from ._version import VERSION - -__version__ = VERSION - -try: - from ._patch import __all__ as _patch_all - from ._patch import * -except ImportError: - _patch_all = [] -from ._patch import patch_sdk as _patch_sdk - -__all__ = [ - "ApiKeyClient", -] -__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/authentication-api-key-with-subdir/authentication/apikey/_generated/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_client.py deleted file mode 100644 index 00fdad5a7e1..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_client.py +++ /dev/null @@ -1,95 +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 copy import deepcopy -from typing import Any -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._operations import _ApiKeyClientOperationsMixin -from ._utils.serialization import Deserializer, Serializer - - -class ApiKeyClient(_ApiKeyClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword - """Illustrates clients generated with ApiKey authentication. - - :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 - ) -> None: - _endpoint = "{endpoint}" - self._config = ApiKeyClientConfiguration(credential=credential, endpoint=endpoint, **kwargs) - - _policies = kwargs.pop("policies", None) - if _policies is None: - _policies = [ - policies.RequestIdPolicy(**kwargs), - self._config.headers_policy, - self._config.user_agent_policy, - self._config.proxy_policy, - policies.ContentDecodePolicy(**kwargs), - self._config.redirect_policy, - self._config.retry_policy, - self._config.authentication_policy, - self._config.custom_hook_policy, - self._config.logging_policy, - policies.DistributedTracingPolicy(**kwargs), - policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, - self._config.http_logging_policy, - ] - self._client: PipelineClient = PipelineClient(base_url=_endpoint, policies=_policies, **kwargs) - - self._serialize = Serializer() - self._deserialize = Deserializer() - self._serialize.client_side_validation = False - - def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse: - """Runs the network request through the client's chained policies. - - >>> from azure.core.rest import HttpRequest - >>> request = HttpRequest("GET", "https://www.example.org/") - - >>> response = client.send_request(request) - - - For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request - - :param request: The network request you want to make. Required. - :type request: ~azure.core.rest.HttpRequest - :keyword bool stream: Whether the response payload will be streamed. Defaults to False. - :return: The response of your network call. Does not do error handling on your response. - :rtype: ~azure.core.rest.HttpResponse - """ - - request_copy = deepcopy(request) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - - request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) - return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore - - def close(self) -> None: - self._client.close() - - def __enter__(self) -> Self: - self._client.__enter__() - return self - - def __exit__(self, *exc_details: Any) -> None: - self._client.__exit__(*exc_details) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_configuration.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_configuration.py deleted file mode 100644 index 6ae9ebfa0f3..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_configuration.py +++ /dev/null @@ -1,50 +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 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. - - 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.") - - self.credential = credential - self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "authentication-api-key-with-subdir/{}".format(VERSION)) - self.polling_interval = kwargs.get("polling_interval", 30) - self._configure(**kwargs) - - def _configure(self, **kwargs: Any) -> None: - self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) - self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) - self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) - self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) - self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) - self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) - self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs) - self.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-with-subdir/authentication/apikey/_generated/_operations/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/__init__.py deleted file mode 100644 index 933fcd7d1b5..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/__init__.py +++ /dev/null @@ -1,22 +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=wrong-import-position - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from ._patch import * # pylint: disable=unused-wildcard-import - - -from ._patch import __all__ as _patch_all -from ._patch import * -from ._patch import patch_sdk as _patch_sdk - -__all__ = [] -__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/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_operations.py deleted file mode 100644 index 104d8af49e3..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_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-with-subdir/authentication/apikey/_generated/_operations/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_patch.py deleted file mode 100644 index 8bcb627aa47..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_patch.py +++ /dev/null @@ -1,21 +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. -# -------------------------------------------------------------------------- -"""Customize generated code here. - -Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize -""" -from typing import List - -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level - - -def patch_sdk(): - """Do not remove from this file. - - `patch_sdk` is a last resort escape hatch that allows you to do customizations - you can't accomplish using the techniques described in - https://aka.ms/azsdk/python/dpcodegen/python/customize - """ diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_patch.py deleted file mode 100644 index 8bcb627aa47..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_patch.py +++ /dev/null @@ -1,21 +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. -# -------------------------------------------------------------------------- -"""Customize generated code here. - -Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize -""" -from typing import List - -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level - - -def patch_sdk(): - """Do not remove from this file. - - `patch_sdk` is a last resort escape hatch that allows you to do customizations - you can't accomplish using the techniques described in - https://aka.ms/azsdk/python/dpcodegen/python/customize - """ diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/__init__.py deleted file mode 100644 index 8026245c2ab..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# -------------------------------------------------------------------------- -# 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. -# -------------------------------------------------------------------------- diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/model_base.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/model_base.py deleted file mode 100644 index 49d5c725938..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/model_base.py +++ /dev/null @@ -1,1232 +0,0 @@ -# pylint: disable=too-many-lines -# 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=protected-access, broad-except - -import copy -import calendar -import decimal -import functools -import sys -import logging -import base64 -import re -import typing -import enum -import email.utils -from datetime import datetime, date, time, timedelta, timezone -from json import JSONEncoder -import xml.etree.ElementTree as ET -from collections.abc import MutableMapping -from typing_extensions import Self -import isodate -from azure.core.exceptions import DeserializationError -from azure.core import CaseInsensitiveEnumMeta -from azure.core.pipeline import PipelineResponse -from azure.core.serialization import _Null - -_LOGGER = logging.getLogger(__name__) - -__all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"] - -TZ_UTC = timezone.utc -_T = typing.TypeVar("_T") - - -def _timedelta_as_isostr(td: timedelta) -> str: - """Converts a datetime.timedelta object into an ISO 8601 formatted string, e.g. 'P4DT12H30M05S' - - Function adapted from the Tin Can Python project: https://github.com/RusticiSoftware/TinCanPython - - :param timedelta td: The timedelta to convert - :rtype: str - :return: ISO8601 version of this timedelta - """ - - # Split seconds to larger units - seconds = td.total_seconds() - minutes, seconds = divmod(seconds, 60) - hours, minutes = divmod(minutes, 60) - days, hours = divmod(hours, 24) - - days, hours, minutes = list(map(int, (days, hours, minutes))) - seconds = round(seconds, 6) - - # Build date - date_str = "" - if days: - date_str = "%sD" % days - - if hours or minutes or seconds: - # Build time - time_str = "T" - - # Hours - bigger_exists = date_str or hours - if bigger_exists: - time_str += "{:02}H".format(hours) - - # Minutes - bigger_exists = bigger_exists or minutes - if bigger_exists: - time_str += "{:02}M".format(minutes) - - # Seconds - try: - if seconds.is_integer(): - seconds_string = "{:02}".format(int(seconds)) - else: - # 9 chars long w/ leading 0, 6 digits after decimal - seconds_string = "%09.6f" % seconds - # Remove trailing zeros - seconds_string = seconds_string.rstrip("0") - except AttributeError: # int.is_integer() raises - seconds_string = "{:02}".format(seconds) - - time_str += "{}S".format(seconds_string) - else: - time_str = "" - - return "P" + date_str + time_str - - -def _serialize_bytes(o, format: typing.Optional[str] = None) -> str: - encoded = base64.b64encode(o).decode() - if format == "base64url": - return encoded.strip("=").replace("+", "-").replace("/", "_") - return encoded - - -def _serialize_datetime(o, format: typing.Optional[str] = None): - if hasattr(o, "year") and hasattr(o, "hour"): - if format == "rfc7231": - return email.utils.format_datetime(o, usegmt=True) - if format == "unix-timestamp": - return int(calendar.timegm(o.utctimetuple())) - - # astimezone() fails for naive times in Python 2.7, so make make sure o is aware (tzinfo is set) - if not o.tzinfo: - iso_formatted = o.replace(tzinfo=TZ_UTC).isoformat() - else: - iso_formatted = o.astimezone(TZ_UTC).isoformat() - # Replace the trailing "+00:00" UTC offset with "Z" (RFC 3339: https://www.ietf.org/rfc/rfc3339.txt) - return iso_formatted.replace("+00:00", "Z") - # Next try datetime.date or datetime.time - return o.isoformat() - - -def _is_readonly(p): - try: - return p._visibility == ["read"] - except AttributeError: - return False - - -class SdkJSONEncoder(JSONEncoder): - """A JSON encoder that's capable of serializing datetime objects and bytes.""" - - def __init__(self, *args, exclude_readonly: bool = False, format: typing.Optional[str] = None, **kwargs): - super().__init__(*args, **kwargs) - self.exclude_readonly = exclude_readonly - self.format = format - - def default(self, o): # pylint: disable=too-many-return-statements - if _is_model(o): - if self.exclude_readonly: - readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)] - return {k: v for k, v in o.items() if k not in readonly_props} - return dict(o.items()) - try: - return super(SdkJSONEncoder, self).default(o) - except TypeError: - if isinstance(o, _Null): - return None - if isinstance(o, decimal.Decimal): - return float(o) - if isinstance(o, (bytes, bytearray)): - return _serialize_bytes(o, self.format) - try: - # First try datetime.datetime - return _serialize_datetime(o, self.format) - except AttributeError: - pass - # Last, try datetime.timedelta - try: - return _timedelta_as_isostr(o) - except AttributeError: - # This will be raised when it hits value.total_seconds in the method above - pass - return super(SdkJSONEncoder, self).default(o) - - -_VALID_DATE = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" + r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") -_VALID_RFC7231 = re.compile( - r"(Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s\d{2}\s" - r"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d{4}\s\d{2}:\d{2}:\d{2}\sGMT" -) - - -def _deserialize_datetime(attr: typing.Union[str, datetime]) -> datetime: - """Deserialize ISO-8601 formatted string into Datetime object. - - :param str attr: response string to be deserialized. - :rtype: ~datetime.datetime - :returns: The datetime object from that input - """ - if isinstance(attr, datetime): - # i'm already deserialized - return attr - attr = attr.upper() - match = _VALID_DATE.match(attr) - if not match: - raise ValueError("Invalid datetime string: " + attr) - - check_decimal = attr.split(".") - if len(check_decimal) > 1: - decimal_str = "" - for digit in check_decimal[1]: - if digit.isdigit(): - decimal_str += digit - else: - break - if len(decimal_str) > 6: - attr = attr.replace(decimal_str, decimal_str[0:6]) - - date_obj = isodate.parse_datetime(attr) - test_utc = date_obj.utctimetuple() - if test_utc.tm_year > 9999 or test_utc.tm_year < 1: - raise OverflowError("Hit max or min date") - return date_obj - - -def _deserialize_datetime_rfc7231(attr: typing.Union[str, datetime]) -> datetime: - """Deserialize RFC7231 formatted string into Datetime object. - - :param str attr: response string to be deserialized. - :rtype: ~datetime.datetime - :returns: The datetime object from that input - """ - if isinstance(attr, datetime): - # i'm already deserialized - return attr - match = _VALID_RFC7231.match(attr) - if not match: - raise ValueError("Invalid datetime string: " + attr) - - return email.utils.parsedate_to_datetime(attr) - - -def _deserialize_datetime_unix_timestamp(attr: typing.Union[float, datetime]) -> datetime: - """Deserialize unix timestamp into Datetime object. - - :param str attr: response string to be deserialized. - :rtype: ~datetime.datetime - :returns: The datetime object from that input - """ - if isinstance(attr, datetime): - # i'm already deserialized - return attr - return datetime.fromtimestamp(attr, TZ_UTC) - - -def _deserialize_date(attr: typing.Union[str, date]) -> date: - """Deserialize ISO-8601 formatted string into Date object. - :param str attr: response string to be deserialized. - :rtype: date - :returns: The date object from that input - """ - # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. - if isinstance(attr, date): - return attr - return isodate.parse_date(attr, defaultmonth=None, defaultday=None) # type: ignore - - -def _deserialize_time(attr: typing.Union[str, time]) -> time: - """Deserialize ISO-8601 formatted string into time object. - - :param str attr: response string to be deserialized. - :rtype: datetime.time - :returns: The time object from that input - """ - if isinstance(attr, time): - return attr - return isodate.parse_time(attr) - - -def _deserialize_bytes(attr): - if isinstance(attr, (bytes, bytearray)): - return attr - return bytes(base64.b64decode(attr)) - - -def _deserialize_bytes_base64(attr): - if isinstance(attr, (bytes, bytearray)): - return attr - padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore - attr = attr + padding # type: ignore - encoded = attr.replace("-", "+").replace("_", "/") - return bytes(base64.b64decode(encoded)) - - -def _deserialize_duration(attr): - if isinstance(attr, timedelta): - return attr - return isodate.parse_duration(attr) - - -def _deserialize_decimal(attr): - if isinstance(attr, decimal.Decimal): - return attr - return decimal.Decimal(str(attr)) - - -def _deserialize_int_as_str(attr): - if isinstance(attr, int): - return attr - return int(attr) - - -_DESERIALIZE_MAPPING = { - datetime: _deserialize_datetime, - date: _deserialize_date, - time: _deserialize_time, - bytes: _deserialize_bytes, - bytearray: _deserialize_bytes, - timedelta: _deserialize_duration, - typing.Any: lambda x: x, - decimal.Decimal: _deserialize_decimal, -} - -_DESERIALIZE_MAPPING_WITHFORMAT = { - "rfc3339": _deserialize_datetime, - "rfc7231": _deserialize_datetime_rfc7231, - "unix-timestamp": _deserialize_datetime_unix_timestamp, - "base64": _deserialize_bytes, - "base64url": _deserialize_bytes_base64, -} - - -def get_deserializer(annotation: typing.Any, rf: typing.Optional["_RestField"] = None): - if annotation is int and rf and rf._format == "str": - return _deserialize_int_as_str - if rf and rf._format: - return _DESERIALIZE_MAPPING_WITHFORMAT.get(rf._format) - return _DESERIALIZE_MAPPING.get(annotation) # pyright: ignore - - -def _get_type_alias_type(module_name: str, alias_name: str): - types = { - k: v - for k, v in sys.modules[module_name].__dict__.items() - if isinstance(v, typing._GenericAlias) # type: ignore - } - if alias_name not in types: - return alias_name - return types[alias_name] - - -def _get_model(module_name: str, model_name: str): - models = {k: v for k, v in sys.modules[module_name].__dict__.items() if isinstance(v, type)} - module_end = module_name.rsplit(".", 1)[0] - models.update({k: v for k, v in sys.modules[module_end].__dict__.items() if isinstance(v, type)}) - if isinstance(model_name, str): - model_name = model_name.split(".")[-1] - if model_name not in models: - return model_name - return models[model_name] - - -_UNSET = object() - - -class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: - self._data = data - - def __contains__(self, key: typing.Any) -> bool: - return key in self._data - - def __getitem__(self, key: str) -> typing.Any: - return self._data.__getitem__(key) - - def __setitem__(self, key: str, value: typing.Any) -> None: - self._data.__setitem__(key, value) - - def __delitem__(self, key: str) -> None: - self._data.__delitem__(key) - - def __iter__(self) -> typing.Iterator[typing.Any]: - return self._data.__iter__() - - def __len__(self) -> int: - return self._data.__len__() - - def __ne__(self, other: typing.Any) -> bool: - return not self.__eq__(other) - - def keys(self) -> typing.KeysView[str]: - """ - :returns: a set-like object providing a view on D's keys - :rtype: ~typing.KeysView - """ - return self._data.keys() - - def values(self) -> typing.ValuesView[typing.Any]: - """ - :returns: an object providing a view on D's values - :rtype: ~typing.ValuesView - """ - return self._data.values() - - def items(self) -> typing.ItemsView[str, typing.Any]: - """ - :returns: set-like object providing a view on D's items - :rtype: ~typing.ItemsView - """ - return self._data.items() - - def get(self, key: str, default: typing.Any = None) -> typing.Any: - """ - Get the value for key if key is in the dictionary, else default. - :param str key: The key to look up. - :param any default: The value to return if key is not in the dictionary. Defaults to None - :returns: D[k] if k in D, else d. - :rtype: any - """ - try: - return self[key] - except KeyError: - return default - - @typing.overload - def pop(self, key: str) -> typing.Any: ... # pylint: disable=arguments-differ - - @typing.overload - def pop(self, key: str, default: _T) -> _T: ... # pylint: disable=signature-differs - - @typing.overload - def pop(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs - - def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: - """ - Removes specified key and return the corresponding value. - :param str key: The key to pop. - :param any default: The value to return if key is not in the dictionary - :returns: The value corresponding to the key. - :rtype: any - :raises KeyError: If key is not found and default is not given. - """ - if default is _UNSET: - return self._data.pop(key) - return self._data.pop(key, default) - - def popitem(self) -> typing.Tuple[str, typing.Any]: - """ - Removes and returns some (key, value) pair - :returns: The (key, value) pair. - :rtype: tuple - :raises KeyError: if D is empty. - """ - return self._data.popitem() - - def clear(self) -> None: - """ - Remove all items from D. - """ - self._data.clear() - - def update(self, *args: typing.Any, **kwargs: typing.Any) -> None: # pylint: disable=arguments-differ - """ - Updates D from mapping/iterable E and F. - :param any args: Either a mapping object or an iterable of key-value pairs. - """ - self._data.update(*args, **kwargs) - - @typing.overload - def setdefault(self, key: str, default: None = None) -> None: ... - - @typing.overload - def setdefault(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs - - def setdefault(self, key: str, default: typing.Any = _UNSET) -> typing.Any: - """ - Same as calling D.get(k, d), and setting D[k]=d if k not found - :param str key: The key to look up. - :param any default: The value to set if key is not in the dictionary - :returns: D[k] if k in D, else d. - :rtype: any - """ - if default is _UNSET: - return self._data.setdefault(key) - return self._data.setdefault(key, default) - - def __eq__(self, other: typing.Any) -> bool: - try: - other_model = self.__class__(other) - except Exception: - return False - return self._data == other_model._data - - def __repr__(self) -> str: - return str(self._data) - - -def _is_model(obj: typing.Any) -> bool: - return getattr(obj, "_is_model", False) - - -def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-many-return-statements - if isinstance(o, list): - return [_serialize(x, format) for x in o] - if isinstance(o, dict): - return {k: _serialize(v, format) for k, v in o.items()} - if isinstance(o, set): - return {_serialize(x, format) for x in o} - if isinstance(o, tuple): - return tuple(_serialize(x, format) for x in o) - if isinstance(o, (bytes, bytearray)): - return _serialize_bytes(o, format) - if isinstance(o, decimal.Decimal): - return float(o) - if isinstance(o, enum.Enum): - return o.value - if isinstance(o, int): - if format == "str": - return str(o) - return o - try: - # First try datetime.datetime - return _serialize_datetime(o, format) - except AttributeError: - pass - # Last, try datetime.timedelta - try: - return _timedelta_as_isostr(o) - except AttributeError: - # This will be raised when it hits value.total_seconds in the method above - pass - return o - - -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: - try: - return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) - except StopIteration: - return None - - -def _create_value(rf: typing.Optional["_RestField"], value: typing.Any) -> typing.Any: - if not rf: - return _serialize(value, None) - if rf._is_multipart_file_input: - return value - if rf._is_model: - return _deserialize(rf._type, value) - if isinstance(value, ET.Element): - value = _deserialize(rf._type, value) - return _serialize(value, rf._format) - - -class Model(_MyMutableMapping): - _is_model = True - # label whether current class's _attr_to_rest_field has been calculated - # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() - - def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: - class_name = self.__class__.__name__ - if len(args) > 1: - raise TypeError(f"{class_name}.__init__() takes 2 positional arguments but {len(args) + 1} were given") - dict_to_pass = { - rest_field._rest_name: rest_field._default - for rest_field in self._attr_to_rest_field.values() - if rest_field._default is not _UNSET - } - if args: # pylint: disable=too-many-nested-blocks - if isinstance(args[0], ET.Element): - existed_attr_keys = [] - model_meta = getattr(self, "_xml", {}) - - for rf in self._attr_to_rest_field.values(): - prop_meta = getattr(rf, "_xml", {}) - xml_name = prop_meta.get("name", rf._rest_name) - xml_ns = prop_meta.get("ns", model_meta.get("ns", None)) - if xml_ns: - xml_name = "{" + xml_ns + "}" + xml_name - - # attribute - if prop_meta.get("attribute", False) and args[0].get(xml_name) is not None: - existed_attr_keys.append(xml_name) - dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].get(xml_name)) - continue - - # unwrapped element is array - if prop_meta.get("unwrapped", False): - # unwrapped array could either use prop items meta/prop meta - if prop_meta.get("itemsName"): - xml_name = prop_meta.get("itemsName") - xml_ns = prop_meta.get("itemNs") - if xml_ns: - xml_name = "{" + xml_ns + "}" + xml_name - items = args[0].findall(xml_name) # pyright: ignore - if len(items) > 0: - existed_attr_keys.append(xml_name) - dict_to_pass[rf._rest_name] = _deserialize(rf._type, items) - continue - - # text element is primitive type - if prop_meta.get("text", False): - if args[0].text is not None: - dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].text) - continue - - # wrapped element could be normal property or array, it should only have one element - item = args[0].find(xml_name) - if item is not None: - existed_attr_keys.append(xml_name) - dict_to_pass[rf._rest_name] = _deserialize(rf._type, item) - - # rest thing is additional properties - for e in args[0]: - if e.tag not in existed_attr_keys: - dict_to_pass[e.tag] = _convert_element(e) - else: - dict_to_pass.update( - {k: _create_value(_get_rest_field(self._attr_to_rest_field, k), v) for k, v in args[0].items()} - ) - else: - non_attr_kwargs = [k for k in kwargs if k not in self._attr_to_rest_field] - if non_attr_kwargs: - # actual type errors only throw the first wrong keyword arg they see, so following that. - raise TypeError(f"{class_name}.__init__() got an unexpected keyword argument '{non_attr_kwargs[0]}'") - dict_to_pass.update( - { - self._attr_to_rest_field[k]._rest_name: _create_value(self._attr_to_rest_field[k], v) - for k, v in kwargs.items() - if v is not None - } - ) - super().__init__(dict_to_pass) - - def copy(self) -> "Model": - return Model(self.__dict__) - - def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: - if f"{cls.__module__}.{cls.__qualname__}" not in cls._calculated: - # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', - # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' - mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property - k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") - } - annotations = { - k: v - for mro_class in mros - if hasattr(mro_class, "__annotations__") - for k, v in mro_class.__annotations__.items() - } - for attr, rf in attr_to_rest_field.items(): - rf._module = cls.__module__ - if not rf._type: - rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) - if not rf._rest_name_input: - rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) - cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") - - return super().__new__(cls) - - def __init_subclass__(cls, discriminator: typing.Optional[str] = None) -> None: - for base in cls.__bases__: - if hasattr(base, "__mapping__"): - base.__mapping__[discriminator or cls.__name__] = cls # type: ignore - - @classmethod - def _get_discriminator(cls, exist_discriminators) -> typing.Optional["_RestField"]: - for v in cls.__dict__.values(): - if isinstance(v, _RestField) and v._is_discriminator and v._rest_name not in exist_discriminators: - return v - return None - - @classmethod - def _deserialize(cls, data, exist_discriminators): - if not hasattr(cls, "__mapping__"): - return cls(data) - discriminator = cls._get_discriminator(exist_discriminators) - if discriminator is None: - return cls(data) - exist_discriminators.append(discriminator._rest_name) - if isinstance(data, ET.Element): - model_meta = getattr(cls, "_xml", {}) - prop_meta = getattr(discriminator, "_xml", {}) - xml_name = prop_meta.get("name", discriminator._rest_name) - xml_ns = prop_meta.get("ns", model_meta.get("ns", None)) - if xml_ns: - xml_name = "{" + xml_ns + "}" + xml_name - - if data.get(xml_name) is not None: - discriminator_value = data.get(xml_name) - else: - discriminator_value = data.find(xml_name).text # pyright: ignore - else: - discriminator_value = data.get(discriminator._rest_name) - mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member - return mapped_cls._deserialize(data, exist_discriminators) - - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: - """Return a dict that can be turned into json using json.dump. - - :keyword bool exclude_readonly: Whether to remove the readonly properties. - :returns: A dict JSON compatible object - :rtype: dict - """ - - result = {} - readonly_props = [] - if exclude_readonly: - readonly_props = [p._rest_name for p in self._attr_to_rest_field.values() if _is_readonly(p)] - for k, v in self.items(): - if exclude_readonly and k in readonly_props: # pyright: ignore - continue - is_multipart_file_input = False - try: - is_multipart_file_input = next( - rf for rf in self._attr_to_rest_field.values() if rf._rest_name == k - )._is_multipart_file_input - except StopIteration: - pass - result[k] = v if is_multipart_file_input else Model._as_dict_value(v, exclude_readonly=exclude_readonly) - return result - - @staticmethod - def _as_dict_value(v: typing.Any, exclude_readonly: bool = False) -> typing.Any: - if v is None or isinstance(v, _Null): - return None - if isinstance(v, (list, tuple, set)): - return type(v)(Model._as_dict_value(x, exclude_readonly=exclude_readonly) for x in v) - if isinstance(v, dict): - return {dk: Model._as_dict_value(dv, exclude_readonly=exclude_readonly) for dk, dv in v.items()} - return v.as_dict(exclude_readonly=exclude_readonly) if hasattr(v, "as_dict") else v - - -def _deserialize_model(model_deserializer: typing.Optional[typing.Callable], obj): - if _is_model(obj): - return obj - return _deserialize(model_deserializer, obj) - - -def _deserialize_with_optional(if_obj_deserializer: typing.Optional[typing.Callable], obj): - if obj is None: - return obj - return _deserialize_with_callable(if_obj_deserializer, obj) - - -def _deserialize_with_union(deserializers, obj): - for deserializer in deserializers: - try: - return _deserialize(deserializer, obj) - except DeserializationError: - pass - raise DeserializationError() - - -def _deserialize_dict( - value_deserializer: typing.Optional[typing.Callable], - module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], -): - if obj is None: - return obj - if isinstance(obj, ET.Element): - obj = {child.tag: child for child in obj} - return {k: _deserialize(value_deserializer, v, module) for k, v in obj.items()} - - -def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], - module: typing.Optional[str], - obj, -): - if obj is None: - return obj - return type(obj)(_deserialize(deserializer, entry, module) for entry, deserializer in zip(obj, entry_deserializers)) - - -def _deserialize_sequence( - deserializer: typing.Optional[typing.Callable], - module: typing.Optional[str], - obj, -): - if obj is None: - return obj - if isinstance(obj, ET.Element): - obj = list(obj) - return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) - - -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: - return sorted( - types, - key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), - ) - - -def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-return-statements, too-many-branches - annotation: typing.Any, - module: typing.Optional[str], - rf: typing.Optional["_RestField"] = None, -) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]: - if not annotation: - return None - - # is it a type alias? - if isinstance(annotation, str): - if module is not None: - annotation = _get_type_alias_type(module, annotation) - - # is it a forward ref / in quotes? - if isinstance(annotation, (str, typing.ForwardRef)): - try: - model_name = annotation.__forward_arg__ # type: ignore - except AttributeError: - model_name = annotation - if module is not None: - annotation = _get_model(module, model_name) # type: ignore - - try: - if module and _is_model(annotation): - if rf: - rf._is_model = True - - return functools.partial(_deserialize_model, annotation) # pyright: ignore - except Exception: - pass - - # is it a literal? - try: - if annotation.__origin__ is typing.Literal: # pyright: ignore - return None - except AttributeError: - pass - - # is it optional? - try: - if any(a for a in annotation.__args__ if a == type(None)): # pyright: ignore - if len(annotation.__args__) <= 2: # pyright: ignore - if_obj_deserializer = _get_deserialize_callable_from_annotation( - next(a for a in annotation.__args__ if a != type(None)), module, rf # pyright: ignore - ) - - return functools.partial(_deserialize_with_optional, if_obj_deserializer) - # the type is Optional[Union[...]], we need to remove the None type from the Union - annotation_copy = copy.copy(annotation) - annotation_copy.__args__ = [a for a in annotation_copy.__args__ if a != type(None)] # pyright: ignore - return _get_deserialize_callable_from_annotation(annotation_copy, module, rf) - except AttributeError: - pass - - # is it union? - if getattr(annotation, "__origin__", None) is typing.Union: - # initial ordering is we make `string` the last deserialization option, because it is often them most generic - deserializers = [ - _get_deserialize_callable_from_annotation(arg, module, rf) - for arg in _sorted_annotations(annotation.__args__) # pyright: ignore - ] - - return functools.partial(_deserialize_with_union, deserializers) - - try: - if annotation._name == "Dict": # pyright: ignore - value_deserializer = _get_deserialize_callable_from_annotation( - annotation.__args__[1], module, rf # pyright: ignore - ) - - return functools.partial( - _deserialize_dict, - value_deserializer, - module, - ) - except (AttributeError, IndexError): - pass - try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore - if len(annotation.__args__) > 1: # pyright: ignore - entry_deserializers = [ - _get_deserialize_callable_from_annotation(dt, module, rf) - for dt in annotation.__args__ # pyright: ignore - ] - return functools.partial(_deserialize_multiple_sequence, entry_deserializers, module) - deserializer = _get_deserialize_callable_from_annotation( - annotation.__args__[0], module, rf # pyright: ignore - ) - - return functools.partial(_deserialize_sequence, deserializer, module) - except (TypeError, IndexError, AttributeError, SyntaxError): - pass - - def _deserialize_default( - deserializer, - obj, - ): - if obj is None: - return obj - try: - return _deserialize_with_callable(deserializer, obj) - except Exception: - pass - return obj - - if get_deserializer(annotation, rf): - return functools.partial(_deserialize_default, get_deserializer(annotation, rf)) - - return functools.partial(_deserialize_default, annotation) - - -def _deserialize_with_callable( - deserializer: typing.Optional[typing.Callable[[typing.Any], typing.Any]], - value: typing.Any, -): # pylint: disable=too-many-return-statements - try: - if value is None or isinstance(value, _Null): - return None - if isinstance(value, ET.Element): - if deserializer is str: - return value.text or "" - if deserializer is int: - return int(value.text) if value.text else None - if deserializer is float: - return float(value.text) if value.text else None - if deserializer is bool: - return value.text == "true" if value.text else None - if deserializer is None: - return value - if deserializer in [int, float, bool]: - return deserializer(value) - if isinstance(deserializer, CaseInsensitiveEnumMeta): - try: - return deserializer(value) - except ValueError: - # for unknown value, return raw value - return value - if isinstance(deserializer, type) and issubclass(deserializer, Model): - return deserializer._deserialize(value, []) - return typing.cast(typing.Callable[[typing.Any], typing.Any], deserializer)(value) - except Exception as e: - raise DeserializationError() from e - - -def _deserialize( - deserializer: typing.Any, - value: typing.Any, - module: typing.Optional[str] = None, - rf: typing.Optional["_RestField"] = None, - format: typing.Optional[str] = None, -) -> typing.Any: - if isinstance(value, PipelineResponse): - value = value.http_response.json() - if rf is None and format: - rf = _RestField(format=format) - if not isinstance(deserializer, functools.partial): - deserializer = _get_deserialize_callable_from_annotation(deserializer, module, rf) - return _deserialize_with_callable(deserializer, value) - - -def _failsafe_deserialize( - deserializer: typing.Any, - value: typing.Any, - module: typing.Optional[str] = None, - rf: typing.Optional["_RestField"] = None, - format: typing.Optional[str] = None, -) -> typing.Any: - try: - return _deserialize(deserializer, value, module, rf, format) - except DeserializationError: - _LOGGER.warning( - "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True - ) - return None - - -def _failsafe_deserialize_xml( - deserializer: typing.Any, - value: typing.Any, -) -> typing.Any: - try: - return _deserialize_xml(deserializer, value) - except DeserializationError: - _LOGGER.warning( - "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True - ) - return None - - -class _RestField: - def __init__( - self, - *, - name: typing.Optional[str] = None, - type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, - default: typing.Any = _UNSET, - format: typing.Optional[str] = None, - is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, - ): - self._type = type - self._rest_name_input = name - self._module: typing.Optional[str] = None - self._is_discriminator = is_discriminator - self._visibility = visibility - self._is_model = False - self._default = default - self._format = format - self._is_multipart_file_input = is_multipart_file_input - self._xml = xml if xml is not None else {} - - @property - def _class_type(self) -> typing.Any: - return getattr(self._type, "args", [None])[0] - - @property - def _rest_name(self) -> str: - if self._rest_name_input is None: - raise ValueError("Rest name was never set") - return self._rest_name_input - - def __get__(self, obj: Model, type=None): # pylint: disable=redefined-builtin - # by this point, type and rest_name will have a value bc we default - # them in __new__ of the Model class - item = obj.get(self._rest_name) - if item is None: - return item - if self._is_model: - return item - return _deserialize(self._type, _serialize(item, self._format), rf=self) - - def __set__(self, obj: Model, value) -> None: - if value is None: - # we want to wipe out entries if users set attr to None - try: - obj.__delitem__(self._rest_name) - except KeyError: - pass - return - if self._is_model: - if not _is_model(value): - value = _deserialize(self._type, value) - obj.__setitem__(self._rest_name, value) - return - obj.__setitem__(self._rest_name, _serialize(value, self._format)) - - def _get_deserialize_callable_from_annotation( - self, annotation: typing.Any - ) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]: - return _get_deserialize_callable_from_annotation(annotation, self._module, self) - - -def rest_field( - *, - name: typing.Optional[str] = None, - type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - default: typing.Any = _UNSET, - format: typing.Optional[str] = None, - is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, -) -> typing.Any: - return _RestField( - name=name, - type=type, - visibility=visibility, - default=default, - format=format, - is_multipart_file_input=is_multipart_file_input, - xml=xml, - ) - - -def rest_discriminator( - *, - name: typing.Optional[str] = None, - type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, -) -> typing.Any: - return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) - - -def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: - """Serialize a model to XML. - - :param Model model: The model to serialize. - :param bool exclude_readonly: Whether to exclude readonly properties. - :returns: The XML representation of the model. - :rtype: str - """ - return ET.tostring(_get_element(model, exclude_readonly), encoding="unicode") # type: ignore - - -def _get_element( - o: typing.Any, - exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, - wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: - if _is_model(o): - model_meta = getattr(o, "_xml", {}) - - # if prop is a model, then use the prop element directly, else generate a wrapper of model - if wrapped_element is None: - wrapped_element = _create_xml_element( - model_meta.get("name", o.__class__.__name__), - model_meta.get("prefix"), - model_meta.get("ns"), - ) - - readonly_props = [] - if exclude_readonly: - readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)] - - for k, v in o.items(): - # do not serialize readonly properties - if exclude_readonly and k in readonly_props: - continue - - prop_rest_field = _get_rest_field(o._attr_to_rest_field, k) - if prop_rest_field: - prop_meta = getattr(prop_rest_field, "_xml").copy() - # use the wire name as xml name if no specific name is set - if prop_meta.get("name") is None: - prop_meta["name"] = k - else: - # additional properties will not have rest field, use the wire name as xml name - prop_meta = {"name": k} - - # if no ns for prop, use model's - if prop_meta.get("ns") is None and model_meta.get("ns"): - prop_meta["ns"] = model_meta.get("ns") - prop_meta["prefix"] = model_meta.get("prefix") - - if prop_meta.get("unwrapped", False): - # unwrapped could only set on array - wrapped_element.extend(_get_element(v, exclude_readonly, prop_meta)) - elif prop_meta.get("text", False): - # text could only set on primitive type - wrapped_element.text = _get_primitive_type_value(v) - elif prop_meta.get("attribute", False): - xml_name = prop_meta.get("name", k) - if prop_meta.get("ns"): - ET.register_namespace(prop_meta.get("prefix"), prop_meta.get("ns")) # pyright: ignore - xml_name = "{" + prop_meta.get("ns") + "}" + xml_name # pyright: ignore - # attribute should be primitive type - wrapped_element.set(xml_name, _get_primitive_type_value(v)) - else: - # other wrapped prop element - wrapped_element.append(_get_wrapped_element(v, exclude_readonly, prop_meta)) - return wrapped_element - if isinstance(o, list): - return [_get_element(x, exclude_readonly, parent_meta) for x in o] # type: ignore - if isinstance(o, dict): - result = [] - for k, v in o.items(): - result.append( - _get_wrapped_element( - v, - exclude_readonly, - { - "name": k, - "ns": parent_meta.get("ns") if parent_meta else None, - "prefix": parent_meta.get("prefix") if parent_meta else None, - }, - ) - ) - return result - - # primitive case need to create element based on parent_meta - if parent_meta: - return _get_wrapped_element( - o, - exclude_readonly, - { - "name": parent_meta.get("itemsName", parent_meta.get("name")), - "prefix": parent_meta.get("itemsPrefix", parent_meta.get("prefix")), - "ns": parent_meta.get("itemsNs", parent_meta.get("ns")), - }, - ) - - raise ValueError("Could not serialize value into xml: " + o) - - -def _get_wrapped_element( - v: typing.Any, - exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], -) -> ET.Element: - wrapped_element = _create_xml_element( - meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None - ) - if isinstance(v, (dict, list)): - wrapped_element.extend(_get_element(v, exclude_readonly, meta)) - elif _is_model(v): - _get_element(v, exclude_readonly, meta, wrapped_element) - else: - wrapped_element.text = _get_primitive_type_value(v) - return wrapped_element - - -def _get_primitive_type_value(v) -> str: - if v is True: - return "true" - if v is False: - return "false" - if isinstance(v, _Null): - return "" - return str(v) - - -def _create_xml_element(tag, prefix=None, ns=None): - if prefix and ns: - ET.register_namespace(prefix, ns) - if ns: - return ET.Element("{" + ns + "}" + tag) - return ET.Element(tag) - - -def _deserialize_xml( - deserializer: typing.Any, - value: str, -) -> typing.Any: - element = ET.fromstring(value) # nosec - return _deserialize(deserializer, element) - - -def _convert_element(e: ET.Element): - # dict case - if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} - for child in e: - if dict_result.get(child.tag) is not None: - if isinstance(dict_result[child.tag], list): - dict_result[child.tag].append(_convert_element(child)) - else: - dict_result[child.tag] = [dict_result[child.tag], _convert_element(child)] - else: - dict_result[child.tag] = _convert_element(child) - dict_result.update(e.attrib) - return dict_result - # array case - if len(e) > 0: - array_result: typing.List[typing.Any] = [] - for child in e: - array_result.append(_convert_element(child)) - return array_result - # primitive case - return e.text diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/serialization.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/serialization.py deleted file mode 100644 index eb86ea23c96..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/serialization.py +++ /dev/null @@ -1,2032 +0,0 @@ -# pylint: disable=line-too-long,useless-suppression,too-many-lines -# 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. -# -------------------------------------------------------------------------- - -# pyright: reportUnnecessaryTypeIgnoreComment=false - -from base64 import b64decode, b64encode -import calendar -import datetime -import decimal -import email -from enum import Enum -import json -import logging -import re -import sys -import codecs -from typing import ( - Dict, - Any, - cast, - Optional, - Union, - AnyStr, - IO, - Mapping, - Callable, - MutableMapping, - List, -) - -try: - from urllib import quote # type: ignore -except ImportError: - from urllib.parse import quote -import xml.etree.ElementTree as ET - -import isodate # type: ignore -from typing_extensions import Self - -from azure.core.exceptions import DeserializationError, SerializationError -from azure.core.serialization import NULL as CoreNull - -_BOM = codecs.BOM_UTF8.decode(encoding="utf-8") - -JSON = MutableMapping[str, Any] - - -class RawDeserializer: - - # Accept "text" because we're open minded people... - JSON_REGEXP = re.compile(r"^(application|text)/([a-z+.]+\+)?json$") - - # Name used in context - CONTEXT_NAME = "deserialized_data" - - @classmethod - def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type: Optional[str] = None) -> Any: - """Decode data according to content-type. - - Accept a stream of data as well, but will be load at once in memory for now. - - If no content-type, will return the string version (not bytes, not stream) - - :param data: Input, could be bytes or stream (will be decoded with UTF8) or text - :type data: str or bytes or IO - :param str content_type: The content type. - :return: The deserialized data. - :rtype: object - """ - if hasattr(data, "read"): - # Assume a stream - data = cast(IO, data).read() - - if isinstance(data, bytes): - data_as_str = data.decode(encoding="utf-8-sig") - else: - # Explain to mypy the correct type. - data_as_str = cast(str, data) - - # Remove Byte Order Mark if present in string - data_as_str = data_as_str.lstrip(_BOM) - - if content_type is None: - return data - - if cls.JSON_REGEXP.match(content_type): - try: - return json.loads(data_as_str) - except ValueError as err: - raise DeserializationError("JSON is invalid: {}".format(err), err) from err - elif "xml" in (content_type or []): - try: - - try: - if isinstance(data, unicode): # type: ignore - # If I'm Python 2.7 and unicode XML will scream if I try a "fromstring" on unicode string - data_as_str = data_as_str.encode(encoding="utf-8") # type: ignore - except NameError: - pass - - return ET.fromstring(data_as_str) # nosec - except ET.ParseError as err: - # It might be because the server has an issue, and returned JSON with - # content-type XML.... - # So let's try a JSON load, and if it's still broken - # let's flow the initial exception - def _json_attemp(data): - try: - return True, json.loads(data) - except ValueError: - return False, None # Don't care about this one - - success, json_result = _json_attemp(data) - if success: - return json_result - # If i'm here, it's not JSON, it's not XML, let's scream - # and raise the last context in this block (the XML exception) - # The function hack is because Py2.7 messes up with exception - # context otherwise. - _LOGGER.critical("Wasn't XML not JSON, failing") - raise DeserializationError("XML is invalid") from err - elif content_type.startswith("text/"): - return data_as_str - raise DeserializationError("Cannot deserialize content-type: {}".format(content_type)) - - @classmethod - def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], headers: Mapping) -> Any: - """Deserialize from HTTP response. - - Use bytes and headers to NOT use any requests/aiohttp or whatever - specific implementation. - Headers will tested for "content-type" - - :param bytes body_bytes: The body of the response. - :param dict headers: The headers of the response. - :returns: The deserialized data. - :rtype: object - """ - # Try to use content-type from headers if available - content_type = None - if "content-type" in headers: - content_type = headers["content-type"].split(";")[0].strip().lower() - # Ouch, this server did not declare what it sent... - # Let's guess it's JSON... - # Also, since Autorest was considering that an empty body was a valid JSON, - # need that test as well.... - else: - content_type = "application/json" - - if body_bytes: - return cls.deserialize_from_text(body_bytes, content_type) - return None - - -_LOGGER = logging.getLogger(__name__) - -try: - _long_type = long # type: ignore -except NameError: - _long_type = int - -TZ_UTC = datetime.timezone.utc - -_FLATTEN = re.compile(r"(? None: - self.additional_properties: Optional[Dict[str, Any]] = {} - for k in kwargs: # pylint: disable=consider-using-dict-items - if k not in self._attribute_map: - _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) - elif k in self._validation and self._validation[k].get("readonly", False): - _LOGGER.warning("Readonly attribute %s will be ignored in class %s", k, self.__class__) - else: - setattr(self, k, kwargs[k]) - - def __eq__(self, other: Any) -> bool: - """Compare objects by comparing all attributes. - - :param object other: The object to compare - :returns: True if objects are equal - :rtype: bool - """ - if isinstance(other, self.__class__): - return self.__dict__ == other.__dict__ - return False - - def __ne__(self, other: Any) -> bool: - """Compare objects by comparing all attributes. - - :param object other: The object to compare - :returns: True if objects are not equal - :rtype: bool - """ - return not self.__eq__(other) - - def __str__(self) -> str: - return str(self.__dict__) - - @classmethod - def enable_additional_properties_sending(cls) -> None: - cls._attribute_map["additional_properties"] = {"key": "", "type": "{object}"} - - @classmethod - def is_xml_model(cls) -> bool: - try: - cls._xml_map # type: ignore - except AttributeError: - return False - return True - - @classmethod - def _create_xml_node(cls): - """Create XML node. - - :returns: The XML node - :rtype: xml.etree.ElementTree.Element - """ - try: - xml_map = cls._xml_map # type: ignore - except AttributeError: - xml_map = {} - - return _create_xml_node(xml_map.get("name", cls.__name__), xml_map.get("prefix", None), xml_map.get("ns", None)) - - def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: - """Return the JSON that would be sent to server from this model. - - This is an alias to `as_dict(full_restapi_key_transformer, keep_readonly=False)`. - - If you want XML serialization, you can pass the kwargs is_xml=True. - - :param bool keep_readonly: If you want to serialize the readonly attributes - :returns: A dict JSON compatible object - :rtype: dict - """ - serializer = Serializer(self._infer_class_models()) - return serializer._serialize( # type: ignore # pylint: disable=protected-access - self, keep_readonly=keep_readonly, **kwargs - ) - - def as_dict( - self, - keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, - **kwargs: Any - ) -> JSON: - """Return a dict that can be serialized using json.dump. - - Advanced usage might optionally use a callback as parameter: - - .. code::python - - def my_key_transformer(key, attr_desc, value): - return key - - Key is the attribute name used in Python. Attr_desc - is a dict of metadata. Currently contains 'type' with the - msrest type and 'key' with the RestAPI encoded key. - Value is the current value in this object. - - The string returned will be used to serialize the key. - If the return type is a list, this is considered hierarchical - result dict. - - See the three examples in this file: - - - attribute_transformer - - full_restapi_key_transformer - - last_restapi_key_transformer - - If you want XML serialization, you can pass the kwargs is_xml=True. - - :param bool keep_readonly: If you want to serialize the readonly attributes - :param function key_transformer: A key transformer function. - :returns: A dict JSON compatible object - :rtype: dict - """ - serializer = Serializer(self._infer_class_models()) - return serializer._serialize( # type: ignore # pylint: disable=protected-access - self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs - ) - - @classmethod - def _infer_class_models(cls): - try: - str_models = cls.__module__.rsplit(".", 1)[0] - models = sys.modules[str_models] - client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} - if cls.__name__ not in client_models: - raise ValueError("Not Autorest generated code") - except Exception: # pylint: disable=broad-exception-caught - # Assume it's not Autorest generated (tests?). Add ourselves as dependencies. - client_models = {cls.__name__: cls} - return client_models - - @classmethod - def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: - """Parse a str using the RestAPI syntax and return a model. - - :param str data: A str using RestAPI structure. JSON by default. - :param str content_type: JSON by default, set application/xml if XML. - :returns: An instance of this model - :raises DeserializationError: if something went wrong - :rtype: Self - """ - deserializer = Deserializer(cls._infer_class_models()) - return deserializer(cls.__name__, data, content_type=content_type) # type: ignore - - @classmethod - def from_dict( - cls, - data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, - content_type: Optional[str] = None, - ) -> Self: - """Parse a dict using given key extractor return a model. - - By default consider key - extractors (rest_key_case_insensitive_extractor, attribute_key_case_insensitive_extractor - and last_rest_key_case_insensitive_extractor) - - :param dict data: A dict using RestAPI structure - :param function key_extractors: A key extractor function. - :param str content_type: JSON by default, set application/xml if XML. - :returns: An instance of this model - :raises DeserializationError: if something went wrong - :rtype: Self - """ - deserializer = Deserializer(cls._infer_class_models()) - deserializer.key_extractors = ( # type: ignore - [ # type: ignore - attribute_key_case_insensitive_extractor, - rest_key_case_insensitive_extractor, - last_rest_key_case_insensitive_extractor, - ] - if key_extractors is None - else key_extractors - ) - return deserializer(cls.__name__, data, content_type=content_type) # type: ignore - - @classmethod - def _flatten_subtype(cls, key, objects): - if "_subtype_map" not in cls.__dict__: - return {} - result = dict(cls._subtype_map[key]) - for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access - return result - - @classmethod - def _classify(cls, response, objects): - """Check the class _subtype_map for any child classes. - We want to ignore any inherited _subtype_maps. - - :param dict response: The initial data - :param dict objects: The class objects - :returns: The class to be used - :rtype: class - """ - for subtype_key in cls.__dict__.get("_subtype_map", {}).keys(): - subtype_value = None - - if not isinstance(response, ET.Element): - rest_api_response_key = cls._get_rest_key_parts(subtype_key)[-1] - subtype_value = response.get(rest_api_response_key, None) or response.get(subtype_key, None) - else: - subtype_value = xml_key_extractor(subtype_key, cls._attribute_map[subtype_key], response) - if subtype_value: - # Try to match base class. Can be class name only - # (bug to fix in Autorest to support x-ms-discriminator-name) - if cls.__name__ == subtype_value: - return cls - flatten_mapping_type = cls._flatten_subtype(subtype_key, objects) - try: - return objects[flatten_mapping_type[subtype_value]] # type: ignore - except KeyError: - _LOGGER.warning( - "Subtype value %s has no mapping, use base class %s.", - subtype_value, - cls.__name__, - ) - break - else: - _LOGGER.warning("Discriminator %s is absent or null, use base class %s.", subtype_key, cls.__name__) - break - return cls - - @classmethod - def _get_rest_key_parts(cls, attr_key): - """Get the RestAPI key of this attr, split it and decode part - :param str attr_key: Attribute key must be in attribute_map. - :returns: A list of RestAPI part - :rtype: list - """ - rest_split_key = _FLATTEN.split(cls._attribute_map[attr_key]["key"]) - return [_decode_attribute_map_key(key_part) for key_part in rest_split_key] - - -def _decode_attribute_map_key(key): - """This decode a key in an _attribute_map to the actual key we want to look at - inside the received data. - - :param str key: A key string from the generated code - :returns: The decoded key - :rtype: str - """ - return key.replace("\\.", ".") - - -class Serializer: # pylint: disable=too-many-public-methods - """Request object model serializer.""" - - basic_types = {str: "str", int: "int", bool: "bool", float: "float"} - - _xml_basic_types_serializers = {"bool": lambda x: str(x).lower()} - days = {0: "Mon", 1: "Tue", 2: "Wed", 3: "Thu", 4: "Fri", 5: "Sat", 6: "Sun"} - months = { - 1: "Jan", - 2: "Feb", - 3: "Mar", - 4: "Apr", - 5: "May", - 6: "Jun", - 7: "Jul", - 8: "Aug", - 9: "Sep", - 10: "Oct", - 11: "Nov", - 12: "Dec", - } - validation = { - "min_length": lambda x, y: len(x) < y, - "max_length": lambda x, y: len(x) > y, - "minimum": lambda x, y: x < y, - "maximum": lambda x, y: x > y, - "minimum_ex": lambda x, y: x <= y, - "maximum_ex": lambda x, y: x >= y, - "min_items": lambda x, y: len(x) < y, - "max_items": lambda x, y: len(x) > y, - "pattern": lambda x, y: not re.match(y, x, re.UNICODE), - "unique": lambda x, y: len(x) != len(set(x)), - "multiple": lambda x, y: x % y != 0, - } - - def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: - self.serialize_type = { - "iso-8601": Serializer.serialize_iso, - "rfc-1123": Serializer.serialize_rfc, - "unix-time": Serializer.serialize_unix, - "duration": Serializer.serialize_duration, - "date": Serializer.serialize_date, - "time": Serializer.serialize_time, - "decimal": Serializer.serialize_decimal, - "long": Serializer.serialize_long, - "bytearray": Serializer.serialize_bytearray, - "base64": Serializer.serialize_base64, - "object": self.serialize_object, - "[]": self.serialize_iter, - "{}": self.serialize_dict, - } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} - self.key_transformer = full_restapi_key_transformer - self.client_side_validation = True - - def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, too-many-statements, too-many-locals - self, target_obj, data_type=None, **kwargs - ): - """Serialize data into a string according to type. - - :param object target_obj: The data to be serialized. - :param str data_type: The type to be serialized from. - :rtype: str, dict - :raises SerializationError: if serialization fails. - :returns: The serialized data. - """ - key_transformer = kwargs.get("key_transformer", self.key_transformer) - keep_readonly = kwargs.get("keep_readonly", False) - if target_obj is None: - return None - - attr_name = None - class_name = target_obj.__class__.__name__ - - if data_type: - return self.serialize_data(target_obj, data_type, **kwargs) - - if not hasattr(target_obj, "_attribute_map"): - data_type = type(target_obj).__name__ - if data_type in self.basic_types.values(): - return self.serialize_data(target_obj, data_type, **kwargs) - - # Force "is_xml" kwargs if we detect a XML model - try: - is_xml_model_serialization = kwargs["is_xml"] - except KeyError: - is_xml_model_serialization = kwargs.setdefault("is_xml", target_obj.is_xml_model()) - - serialized = {} - if is_xml_model_serialization: - serialized = target_obj._create_xml_node() # pylint: disable=protected-access - try: - attributes = target_obj._attribute_map # pylint: disable=protected-access - for attr, attr_desc in attributes.items(): - attr_name = attr - if not keep_readonly and target_obj._validation.get( # pylint: disable=protected-access - attr_name, {} - ).get("readonly", False): - continue - - if attr_name == "additional_properties" and attr_desc["key"] == "": - if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) - continue - try: - - orig_attr = getattr(target_obj, attr) - if is_xml_model_serialization: - pass # Don't provide "transformer" for XML for now. Keep "orig_attr" - else: # JSON - keys, orig_attr = key_transformer(attr, attr_desc.copy(), orig_attr) - keys = keys if isinstance(keys, list) else [keys] - - kwargs["serialization_ctxt"] = attr_desc - new_attr = self.serialize_data(orig_attr, attr_desc["type"], **kwargs) - - if is_xml_model_serialization: - xml_desc = attr_desc.get("xml", {}) - xml_name = xml_desc.get("name", attr_desc["key"]) - xml_prefix = xml_desc.get("prefix", None) - xml_ns = xml_desc.get("ns", None) - if xml_desc.get("attr", False): - if xml_ns: - ET.register_namespace(xml_prefix, xml_ns) - xml_name = "{{{}}}{}".format(xml_ns, xml_name) - serialized.set(xml_name, new_attr) # type: ignore - continue - if xml_desc.get("text", False): - serialized.text = new_attr # type: ignore - continue - if isinstance(new_attr, list): - serialized.extend(new_attr) # type: ignore - elif isinstance(new_attr, ET.Element): - # If the down XML has no XML/Name, - # we MUST replace the tag with the local tag. But keeping the namespaces. - if "name" not in getattr(orig_attr, "_xml_map", {}): - splitted_tag = new_attr.tag.split("}") - if len(splitted_tag) == 2: # Namespace - new_attr.tag = "}".join([splitted_tag[0], xml_name]) - else: - new_attr.tag = xml_name - serialized.append(new_attr) # type: ignore - else: # That's a basic type - # Integrate namespace if necessary - local_node = _create_xml_node(xml_name, xml_prefix, xml_ns) - local_node.text = str(new_attr) - serialized.append(local_node) # type: ignore - else: # JSON - for k in reversed(keys): # type: ignore - new_attr = {k: new_attr} - - _new_attr = new_attr - _serialized = serialized - for k in keys: # type: ignore - if k not in _serialized: - _serialized.update(_new_attr) # type: ignore - _new_attr = _new_attr[k] # type: ignore - _serialized = _serialized[k] - except ValueError as err: - if isinstance(err, SerializationError): - raise - - except (AttributeError, KeyError, TypeError) as err: - msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj)) - raise SerializationError(msg) from err - return serialized - - def body(self, data, data_type, **kwargs): - """Serialize data intended for a request body. - - :param object data: The data to be serialized. - :param str data_type: The type to be serialized from. - :rtype: dict - :raises SerializationError: if serialization fails. - :raises ValueError: if data is None - :returns: The serialized request body - """ - - # Just in case this is a dict - internal_data_type_str = data_type.strip("[]{}") - internal_data_type = self.dependencies.get(internal_data_type_str, None) - try: - is_xml_model_serialization = kwargs["is_xml"] - except KeyError: - if internal_data_type and issubclass(internal_data_type, Model): - is_xml_model_serialization = kwargs.setdefault("is_xml", internal_data_type.is_xml_model()) - else: - is_xml_model_serialization = False - if internal_data_type and not isinstance(internal_data_type, Enum): - try: - deserializer = Deserializer(self.dependencies) - # Since it's on serialization, it's almost sure that format is not JSON REST - # We're not able to deal with additional properties for now. - deserializer.additional_properties_detection = False - if is_xml_model_serialization: - deserializer.key_extractors = [ # type: ignore - attribute_key_case_insensitive_extractor, - ] - else: - deserializer.key_extractors = [ - rest_key_case_insensitive_extractor, - attribute_key_case_insensitive_extractor, - last_rest_key_case_insensitive_extractor, - ] - data = deserializer._deserialize(data_type, data) # pylint: disable=protected-access - except DeserializationError as err: - raise SerializationError("Unable to build a model: " + str(err)) from err - - return self._serialize(data, data_type, **kwargs) - - def url(self, name, data, data_type, **kwargs): - """Serialize data intended for a URL path. - - :param str name: The name of the URL path parameter. - :param object data: The data to be serialized. - :param str data_type: The type to be serialized from. - :rtype: str - :returns: The serialized URL path - :raises TypeError: if serialization fails. - :raises ValueError: if data is None - """ - try: - output = self.serialize_data(data, data_type, **kwargs) - if data_type == "bool": - output = json.dumps(output) - - if kwargs.get("skip_quote") is True: - output = str(output) - output = output.replace("{", quote("{")).replace("}", quote("}")) - else: - output = quote(str(output), safe="") - except SerializationError as exc: - raise TypeError("{} must be type {}.".format(name, data_type)) from exc - return output - - def query(self, name, data, data_type, **kwargs): - """Serialize data intended for a URL query. - - :param str name: The name of the query parameter. - :param object data: The data to be serialized. - :param str data_type: The type to be serialized from. - :rtype: str, list - :raises TypeError: if serialization fails. - :raises ValueError: if data is None - :returns: The serialized query parameter - """ - try: - # Treat the list aside, since we don't want to encode the div separator - if data_type.startswith("["): - internal_data_type = data_type[1:-1] - do_quote = not kwargs.get("skip_quote", False) - return self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs) - - # Not a list, regular serialization - output = self.serialize_data(data, data_type, **kwargs) - if data_type == "bool": - output = json.dumps(output) - if kwargs.get("skip_quote") is True: - output = str(output) - else: - output = quote(str(output), safe="") - except SerializationError as exc: - raise TypeError("{} must be type {}.".format(name, data_type)) from exc - return str(output) - - def header(self, name, data, data_type, **kwargs): - """Serialize data intended for a request header. - - :param str name: The name of the header. - :param object data: The data to be serialized. - :param str data_type: The type to be serialized from. - :rtype: str - :raises TypeError: if serialization fails. - :raises ValueError: if data is None - :returns: The serialized header - """ - try: - if data_type in ["[str]"]: - data = ["" if d is None else d for d in data] - - output = self.serialize_data(data, data_type, **kwargs) - if data_type == "bool": - output = json.dumps(output) - except SerializationError as exc: - raise TypeError("{} must be type {}.".format(name, data_type)) from exc - return str(output) - - def serialize_data(self, data, data_type, **kwargs): - """Serialize generic data according to supplied data type. - - :param object data: The data to be serialized. - :param str data_type: The type to be serialized from. - :raises AttributeError: if required data is None. - :raises ValueError: if data is None - :raises SerializationError: if serialization fails. - :returns: The serialized data. - :rtype: str, int, float, bool, dict, list - """ - if data is None: - raise ValueError("No value for given attribute") - - try: - if data is CoreNull: - return None - if data_type in self.basic_types.values(): - return self.serialize_basic(data, data_type, **kwargs) - - if data_type in self.serialize_type: - return self.serialize_type[data_type](data, **kwargs) - - # If dependencies is empty, try with current data class - # It has to be a subclass of Enum anyway - enum_type = self.dependencies.get(data_type, data.__class__) - if issubclass(enum_type, Enum): - return Serializer.serialize_enum(data, enum_obj=enum_type) - - iter_type = data_type[0] + data_type[-1] - if iter_type in self.serialize_type: - return self.serialize_type[iter_type](data, data_type[1:-1], **kwargs) - - except (ValueError, TypeError) as err: - msg = "Unable to serialize value: {!r} as type: {!r}." - raise SerializationError(msg.format(data, data_type)) from err - return self._serialize(data, **kwargs) - - @classmethod - def _get_custom_serializers(cls, data_type, **kwargs): # pylint: disable=inconsistent-return-statements - custom_serializer = kwargs.get("basic_types_serializers", {}).get(data_type) - if custom_serializer: - return custom_serializer - if kwargs.get("is_xml", False): - return cls._xml_basic_types_serializers.get(data_type) - - @classmethod - def serialize_basic(cls, data, data_type, **kwargs): - """Serialize basic builting data type. - Serializes objects to str, int, float or bool. - - Possible kwargs: - - basic_types_serializers dict[str, callable] : If set, use the callable as serializer - - is_xml bool : If set, use xml_basic_types_serializers - - :param obj data: Object to be serialized. - :param str data_type: Type of object in the iterable. - :rtype: str, int, float, bool - :return: serialized object - """ - custom_serializer = cls._get_custom_serializers(data_type, **kwargs) - if custom_serializer: - return custom_serializer(data) - if data_type == "str": - return cls.serialize_unicode(data) - return eval(data_type)(data) # nosec # pylint: disable=eval-used - - @classmethod - def serialize_unicode(cls, data): - """Special handling for serializing unicode strings in Py2. - Encode to UTF-8 if unicode, otherwise handle as a str. - - :param str data: Object to be serialized. - :rtype: str - :return: serialized object - """ - try: # If I received an enum, return its value - return data.value - except AttributeError: - pass - - try: - if isinstance(data, unicode): # type: ignore - # Don't change it, JSON and XML ElementTree are totally able - # to serialize correctly u'' strings - return data - except NameError: - return str(data) - return str(data) - - def serialize_iter(self, data, iter_type, div=None, **kwargs): - """Serialize iterable. - - Supported kwargs: - - serialization_ctxt dict : The current entry of _attribute_map, or same format. - serialization_ctxt['type'] should be same as data_type. - - is_xml bool : If set, serialize as XML - - :param list data: Object to be serialized. - :param str iter_type: Type of object in the iterable. - :param str div: If set, this str will be used to combine the elements - in the iterable into a combined string. Default is 'None'. - Defaults to False. - :rtype: list, str - :return: serialized iterable - """ - if isinstance(data, str): - raise SerializationError("Refuse str type as a valid iter type.") - - serialization_ctxt = kwargs.get("serialization_ctxt", {}) - is_xml = kwargs.get("is_xml", False) - - serialized = [] - for d in data: - try: - serialized.append(self.serialize_data(d, iter_type, **kwargs)) - except ValueError as err: - if isinstance(err, SerializationError): - raise - serialized.append(None) - - if kwargs.get("do_quote", False): - serialized = ["" if s is None else quote(str(s), safe="") for s in serialized] - - if div: - serialized = ["" if s is None else str(s) for s in serialized] - serialized = div.join(serialized) - - if "xml" in serialization_ctxt or is_xml: - # XML serialization is more complicated - xml_desc = serialization_ctxt.get("xml", {}) - xml_name = xml_desc.get("name") - if not xml_name: - xml_name = serialization_ctxt["key"] - - # Create a wrap node if necessary (use the fact that Element and list have "append") - is_wrapped = xml_desc.get("wrapped", False) - node_name = xml_desc.get("itemsName", xml_name) - if is_wrapped: - final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) - else: - final_result = [] - # All list elements to "local_node" - for el in serialized: - if isinstance(el, ET.Element): - el_node = el - else: - el_node = _create_xml_node(node_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) - if el is not None: # Otherwise it writes "None" :-p - el_node.text = str(el) - final_result.append(el_node) - return final_result - return serialized - - def serialize_dict(self, attr, dict_type, **kwargs): - """Serialize a dictionary of objects. - - :param dict attr: Object to be serialized. - :param str dict_type: Type of object in the dictionary. - :rtype: dict - :return: serialized dictionary - """ - serialization_ctxt = kwargs.get("serialization_ctxt", {}) - serialized = {} - for key, value in attr.items(): - try: - serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs) - except ValueError as err: - if isinstance(err, SerializationError): - raise - serialized[self.serialize_unicode(key)] = None - - if "xml" in serialization_ctxt: - # XML serialization is more complicated - xml_desc = serialization_ctxt["xml"] - xml_name = xml_desc["name"] - - final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) - for key, value in serialized.items(): - ET.SubElement(final_result, key).text = value - return final_result - - return serialized - - def serialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements - """Serialize a generic object. - This will be handled as a dictionary. If object passed in is not - a basic type (str, int, float, dict, list) it will simply be - cast to str. - - :param dict attr: Object to be serialized. - :rtype: dict or str - :return: serialized object - """ - if attr is None: - return None - if isinstance(attr, ET.Element): - return attr - obj_type = type(attr) - if obj_type in self.basic_types: - return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs) - if obj_type is _long_type: - return self.serialize_long(attr) - if obj_type is str: - return self.serialize_unicode(attr) - if obj_type is datetime.datetime: - return self.serialize_iso(attr) - if obj_type is datetime.date: - return self.serialize_date(attr) - if obj_type is datetime.time: - return self.serialize_time(attr) - if obj_type is datetime.timedelta: - return self.serialize_duration(attr) - if obj_type is decimal.Decimal: - return self.serialize_decimal(attr) - - # If it's a model or I know this dependency, serialize as a Model - if obj_type in self.dependencies.values() or isinstance(attr, Model): - return self._serialize(attr) - - if obj_type == dict: - serialized = {} - for key, value in attr.items(): - try: - serialized[self.serialize_unicode(key)] = self.serialize_object(value, **kwargs) - except ValueError: - serialized[self.serialize_unicode(key)] = None - return serialized - - if obj_type == list: - serialized = [] - for obj in attr: - try: - serialized.append(self.serialize_object(obj, **kwargs)) - except ValueError: - pass - return serialized - return str(attr) - - @staticmethod - def serialize_enum(attr, enum_obj=None): - try: - result = attr.value - except AttributeError: - result = attr - try: - enum_obj(result) # type: ignore - return result - except ValueError as exc: - for enum_value in enum_obj: # type: ignore - if enum_value.value.lower() == str(attr).lower(): - return enum_value.value - error = "{!r} is not valid value for enum {!r}" - raise SerializationError(error.format(attr, enum_obj)) from exc - - @staticmethod - def serialize_bytearray(attr, **kwargs): # pylint: disable=unused-argument - """Serialize bytearray into base-64 string. - - :param str attr: Object to be serialized. - :rtype: str - :return: serialized base64 - """ - return b64encode(attr).decode() - - @staticmethod - def serialize_base64(attr, **kwargs): # pylint: disable=unused-argument - """Serialize str into base-64 string. - - :param str attr: Object to be serialized. - :rtype: str - :return: serialized base64 - """ - encoded = b64encode(attr).decode("ascii") - return encoded.strip("=").replace("+", "-").replace("/", "_") - - @staticmethod - def serialize_decimal(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Decimal object to float. - - :param decimal attr: Object to be serialized. - :rtype: float - :return: serialized decimal - """ - return float(attr) - - @staticmethod - def serialize_long(attr, **kwargs): # pylint: disable=unused-argument - """Serialize long (Py2) or int (Py3). - - :param int attr: Object to be serialized. - :rtype: int/long - :return: serialized long - """ - return _long_type(attr) - - @staticmethod - def serialize_date(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Date object into ISO-8601 formatted string. - - :param Date attr: Object to be serialized. - :rtype: str - :return: serialized date - """ - if isinstance(attr, str): - attr = isodate.parse_date(attr) - t = "{:04}-{:02}-{:02}".format(attr.year, attr.month, attr.day) - return t - - @staticmethod - def serialize_time(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Time object into ISO-8601 formatted string. - - :param datetime.time attr: Object to be serialized. - :rtype: str - :return: serialized time - """ - if isinstance(attr, str): - attr = isodate.parse_time(attr) - t = "{:02}:{:02}:{:02}".format(attr.hour, attr.minute, attr.second) - if attr.microsecond: - t += ".{:02}".format(attr.microsecond) - return t - - @staticmethod - def serialize_duration(attr, **kwargs): # pylint: disable=unused-argument - """Serialize TimeDelta object into ISO-8601 formatted string. - - :param TimeDelta attr: Object to be serialized. - :rtype: str - :return: serialized duration - """ - if isinstance(attr, str): - attr = isodate.parse_duration(attr) - return isodate.duration_isoformat(attr) - - @staticmethod - def serialize_rfc(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Datetime object into RFC-1123 formatted string. - - :param Datetime attr: Object to be serialized. - :rtype: str - :raises TypeError: if format invalid. - :return: serialized rfc - """ - try: - if not attr.tzinfo: - _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") - utc = attr.utctimetuple() - except AttributeError as exc: - raise TypeError("RFC1123 object must be valid Datetime object.") from exc - - return "{}, {:02} {} {:04} {:02}:{:02}:{:02} GMT".format( - Serializer.days[utc.tm_wday], - utc.tm_mday, - Serializer.months[utc.tm_mon], - utc.tm_year, - utc.tm_hour, - utc.tm_min, - utc.tm_sec, - ) - - @staticmethod - def serialize_iso(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Datetime object into ISO-8601 formatted string. - - :param Datetime attr: Object to be serialized. - :rtype: str - :raises SerializationError: if format invalid. - :return: serialized iso - """ - if isinstance(attr, str): - attr = isodate.parse_datetime(attr) - try: - if not attr.tzinfo: - _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") - utc = attr.utctimetuple() - if utc.tm_year > 9999 or utc.tm_year < 1: - raise OverflowError("Hit max or min date") - - microseconds = str(attr.microsecond).rjust(6, "0").rstrip("0").ljust(3, "0") - if microseconds: - microseconds = "." + microseconds - date = "{:04}-{:02}-{:02}T{:02}:{:02}:{:02}".format( - utc.tm_year, utc.tm_mon, utc.tm_mday, utc.tm_hour, utc.tm_min, utc.tm_sec - ) - return date + microseconds + "Z" - except (ValueError, OverflowError) as err: - msg = "Unable to serialize datetime object." - raise SerializationError(msg) from err - except AttributeError as err: - msg = "ISO-8601 object must be valid Datetime object." - raise TypeError(msg) from err - - @staticmethod - def serialize_unix(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Datetime object into IntTime format. - This is represented as seconds. - - :param Datetime attr: Object to be serialized. - :rtype: int - :raises SerializationError: if format invalid - :return: serialied unix - """ - if isinstance(attr, int): - return attr - try: - if not attr.tzinfo: - _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") - return int(calendar.timegm(attr.utctimetuple())) - except AttributeError as exc: - raise TypeError("Unix time object must be valid Datetime object.") from exc - - -def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument - key = attr_desc["key"] - working_data = data - - while "." in key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) - if len(dict_keys) == 1: - key = _decode_attribute_map_key(dict_keys[0]) - break - working_key = _decode_attribute_map_key(dict_keys[0]) - working_data = working_data.get(working_key, data) - if working_data is None: - # If at any point while following flatten JSON path see None, it means - # that all properties under are None as well - return None - key = ".".join(dict_keys[1:]) - - return working_data.get(key) - - -def rest_key_case_insensitive_extractor( # pylint: disable=unused-argument, inconsistent-return-statements - attr, attr_desc, data -): - key = attr_desc["key"] - working_data = data - - while "." in key: - dict_keys = _FLATTEN.split(key) - if len(dict_keys) == 1: - key = _decode_attribute_map_key(dict_keys[0]) - break - working_key = _decode_attribute_map_key(dict_keys[0]) - working_data = attribute_key_case_insensitive_extractor(working_key, None, working_data) - if working_data is None: - # If at any point while following flatten JSON path see None, it means - # that all properties under are None as well - return None - key = ".".join(dict_keys[1:]) - - if working_data: - return attribute_key_case_insensitive_extractor(key, None, working_data) - - -def last_rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument - """Extract the attribute in "data" based on the last part of the JSON path key. - - :param str attr: The attribute to extract - :param dict attr_desc: The attribute description - :param dict data: The data to extract from - :rtype: object - :returns: The extracted attribute - """ - key = attr_desc["key"] - dict_keys = _FLATTEN.split(key) - return attribute_key_extractor(dict_keys[-1], None, data) - - -def last_rest_key_case_insensitive_extractor(attr, attr_desc, data): # pylint: disable=unused-argument - """Extract the attribute in "data" based on the last part of the JSON path key. - - This is the case insensitive version of "last_rest_key_extractor" - :param str attr: The attribute to extract - :param dict attr_desc: The attribute description - :param dict data: The data to extract from - :rtype: object - :returns: The extracted attribute - """ - key = attr_desc["key"] - dict_keys = _FLATTEN.split(key) - return attribute_key_case_insensitive_extractor(dict_keys[-1], None, data) - - -def attribute_key_extractor(attr, _, data): - return data.get(attr) - - -def attribute_key_case_insensitive_extractor(attr, _, data): - found_key = None - lower_attr = attr.lower() - for key in data: - if lower_attr == key.lower(): - found_key = key - break - - return data.get(found_key) - - -def _extract_name_from_internal_type(internal_type): - """Given an internal type XML description, extract correct XML name with namespace. - - :param dict internal_type: An model type - :rtype: tuple - :returns: A tuple XML name + namespace dict - """ - internal_type_xml_map = getattr(internal_type, "_xml_map", {}) - xml_name = internal_type_xml_map.get("name", internal_type.__name__) - xml_ns = internal_type_xml_map.get("ns", None) - if xml_ns: - xml_name = "{{{}}}{}".format(xml_ns, xml_name) - return xml_name - - -def xml_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument,too-many-return-statements - if isinstance(data, dict): - return None - - # Test if this model is XML ready first - if not isinstance(data, ET.Element): - return None - - xml_desc = attr_desc.get("xml", {}) - xml_name = xml_desc.get("name", attr_desc["key"]) - - # Look for a children - is_iter_type = attr_desc["type"].startswith("[") - is_wrapped = xml_desc.get("wrapped", False) - internal_type = attr_desc.get("internalType", None) - internal_type_xml_map = getattr(internal_type, "_xml_map", {}) - - # Integrate namespace if necessary - xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None)) - if xml_ns: - xml_name = "{{{}}}{}".format(xml_ns, xml_name) - - # If it's an attribute, that's simple - if xml_desc.get("attr", False): - return data.get(xml_name) - - # If it's x-ms-text, that's simple too - if xml_desc.get("text", False): - return data.text - - # Scenario where I take the local name: - # - Wrapped node - # - Internal type is an enum (considered basic types) - # - Internal type has no XML/Name node - if is_wrapped or (internal_type and (issubclass(internal_type, Enum) or "name" not in internal_type_xml_map)): - children = data.findall(xml_name) - # If internal type has a local name and it's not a list, I use that name - elif not is_iter_type and internal_type and "name" in internal_type_xml_map: - xml_name = _extract_name_from_internal_type(internal_type) - children = data.findall(xml_name) - # That's an array - else: - if internal_type: # Complex type, ignore itemsName and use the complex type name - items_name = _extract_name_from_internal_type(internal_type) - else: - items_name = xml_desc.get("itemsName", xml_name) - children = data.findall(items_name) - - if len(children) == 0: - if is_iter_type: - if is_wrapped: - return None # is_wrapped no node, we want None - return [] # not wrapped, assume empty list - return None # Assume it's not there, maybe an optional node. - - # If is_iter_type and not wrapped, return all found children - if is_iter_type: - if not is_wrapped: - return children - # Iter and wrapped, should have found one node only (the wrap one) - if len(children) != 1: - raise DeserializationError( - "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( - xml_name - ) - ) - return list(children[0]) # Might be empty list and that's ok. - - # Here it's not a itertype, we should have found one element only or empty - if len(children) > 1: - raise DeserializationError("Find several XML '{}' where it was not expected".format(xml_name)) - return children[0] - - -class Deserializer: - """Response object model deserializer. - - :param dict classes: Class type dictionary for deserializing complex types. - :ivar list key_extractors: Ordered list of extractors to be used by this deserializer. - """ - - basic_types = {str: "str", int: "int", bool: "bool", float: "float"} - - valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") - - def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: - self.deserialize_type = { - "iso-8601": Deserializer.deserialize_iso, - "rfc-1123": Deserializer.deserialize_rfc, - "unix-time": Deserializer.deserialize_unix, - "duration": Deserializer.deserialize_duration, - "date": Deserializer.deserialize_date, - "time": Deserializer.deserialize_time, - "decimal": Deserializer.deserialize_decimal, - "long": Deserializer.deserialize_long, - "bytearray": Deserializer.deserialize_bytearray, - "base64": Deserializer.deserialize_base64, - "object": self.deserialize_object, - "[]": self.deserialize_iter, - "{}": self.deserialize_dict, - } - self.deserialize_expected_types = { - "duration": (isodate.Duration, datetime.timedelta), - "iso-8601": (datetime.datetime), - } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} - self.key_extractors = [rest_key_extractor, xml_key_extractor] - # Additional properties only works if the "rest_key_extractor" is used to - # extract the keys. Making it to work whatever the key extractor is too much - # complicated, with no real scenario for now. - # So adding a flag to disable additional properties detection. This flag should be - # used if your expect the deserialization to NOT come from a JSON REST syntax. - # Otherwise, result are unexpected - self.additional_properties_detection = True - - def __call__(self, target_obj, response_data, content_type=None): - """Call the deserializer to process a REST response. - - :param str target_obj: Target data type to deserialize to. - :param requests.Response response_data: REST response object. - :param str content_type: Swagger "produces" if available. - :raises DeserializationError: if deserialization fails. - :return: Deserialized object. - :rtype: object - """ - data = self._unpack_content(response_data, content_type) - return self._deserialize(target_obj, data) - - def _deserialize(self, target_obj, data): # pylint: disable=inconsistent-return-statements - """Call the deserializer on a model. - - Data needs to be already deserialized as JSON or XML ElementTree - - :param str target_obj: Target data type to deserialize to. - :param object data: Object to deserialize. - :raises DeserializationError: if deserialization fails. - :return: Deserialized object. - :rtype: object - """ - # This is already a model, go recursive just in case - if hasattr(data, "_attribute_map"): - constants = [name for name, config in getattr(data, "_validation", {}).items() if config.get("constant")] - try: - for attr, mapconfig in data._attribute_map.items(): # pylint: disable=protected-access - if attr in constants: - continue - value = getattr(data, attr) - if value is None: - continue - local_type = mapconfig["type"] - internal_data_type = local_type.strip("[]{}") - if internal_data_type not in self.dependencies or isinstance(internal_data_type, Enum): - continue - setattr(data, attr, self._deserialize(local_type, value)) - return data - except AttributeError: - return - - response, class_name = self._classify_target(target_obj, data) - - if isinstance(response, str): - return self.deserialize_data(data, response) - if isinstance(response, type) and issubclass(response, Enum): - return self.deserialize_enum(data, response) - - if data is None or data is CoreNull: - return data - try: - attributes = response._attribute_map # type: ignore # pylint: disable=protected-access - d_attrs = {} - for attr, attr_desc in attributes.items(): - # Check empty string. If it's not empty, someone has a real "additionalProperties"... - if attr == "additional_properties" and attr_desc["key"] == "": - continue - raw_value = None - # Enhance attr_desc with some dynamic data - attr_desc = attr_desc.copy() # Do a copy, do not change the real one - internal_data_type = attr_desc["type"].strip("[]{}") - if internal_data_type in self.dependencies: - attr_desc["internalType"] = self.dependencies[internal_data_type] - - for key_extractor in self.key_extractors: - found_value = key_extractor(attr, attr_desc, data) - if found_value is not None: - if raw_value is not None and raw_value != found_value: - msg = ( - "Ignoring extracted value '%s' from %s for key '%s'" - " (duplicate extraction, follow extractors order)" - ) - _LOGGER.warning(msg, found_value, key_extractor, attr) - continue - raw_value = found_value - - value = self.deserialize_data(raw_value, attr_desc["type"]) - d_attrs[attr] = value - except (AttributeError, TypeError, KeyError) as err: - msg = "Unable to deserialize to object: " + class_name # type: ignore - raise DeserializationError(msg) from err - additional_properties = self._build_additional_properties(attributes, data) - return self._instantiate_model(response, d_attrs, additional_properties) - - def _build_additional_properties(self, attribute_map, data): - if not self.additional_properties_detection: - return None - if "additional_properties" in attribute_map and attribute_map.get("additional_properties", {}).get("key") != "": - # Check empty string. If it's not empty, someone has a real "additionalProperties" - return None - if isinstance(data, ET.Element): - data = {el.tag: el.text for el in data} - - known_keys = { - _decode_attribute_map_key(_FLATTEN.split(desc["key"])[0]) - for desc in attribute_map.values() - if desc["key"] != "" - } - present_keys = set(data.keys()) - missing_keys = present_keys - known_keys - return {key: data[key] for key in missing_keys} - - def _classify_target(self, target, data): - """Check to see whether the deserialization target object can - be classified into a subclass. - Once classification has been determined, initialize object. - - :param str target: The target object type to deserialize to. - :param str/dict data: The response data to deserialize. - :return: The classified target object and its class name. - :rtype: tuple - """ - if target is None: - return None, None - - if isinstance(target, str): - try: - target = self.dependencies[target] - except KeyError: - return target, target - - try: - target = target._classify(data, self.dependencies) # type: ignore # pylint: disable=protected-access - except AttributeError: - pass # Target is not a Model, no classify - return target, target.__class__.__name__ # type: ignore - - def failsafe_deserialize(self, target_obj, data, content_type=None): - """Ignores any errors encountered in deserialization, - and falls back to not deserializing the object. Recommended - for use in error deserialization, as we want to return the - HttpResponseError to users, and not have them deal with - a deserialization error. - - :param str target_obj: The target object type to deserialize to. - :param str/dict data: The response data to deserialize. - :param str content_type: Swagger "produces" if available. - :return: Deserialized object. - :rtype: object - """ - try: - return self(target_obj, data, content_type=content_type) - except: # pylint: disable=bare-except - _LOGGER.debug( - "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True - ) - return None - - @staticmethod - def _unpack_content(raw_data, content_type=None): - """Extract the correct structure for deserialization. - - If raw_data is a PipelineResponse, try to extract the result of RawDeserializer. - if we can't, raise. Your Pipeline should have a RawDeserializer. - - If not a pipeline response and raw_data is bytes or string, use content-type - to decode it. If no content-type, try JSON. - - If raw_data is something else, bypass all logic and return it directly. - - :param obj raw_data: Data to be processed. - :param str content_type: How to parse if raw_data is a string/bytes. - :raises JSONDecodeError: If JSON is requested and parsing is impossible. - :raises UnicodeDecodeError: If bytes is not UTF8 - :rtype: object - :return: Unpacked content. - """ - # Assume this is enough to detect a Pipeline Response without importing it - context = getattr(raw_data, "context", {}) - if context: - if RawDeserializer.CONTEXT_NAME in context: - return context[RawDeserializer.CONTEXT_NAME] - raise ValueError("This pipeline didn't have the RawDeserializer policy; can't deserialize") - - # Assume this is enough to recognize universal_http.ClientResponse without importing it - if hasattr(raw_data, "body"): - return RawDeserializer.deserialize_from_http_generics(raw_data.text(), raw_data.headers) - - # Assume this enough to recognize requests.Response without importing it. - if hasattr(raw_data, "_content_consumed"): - return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers) - - if isinstance(raw_data, (str, bytes)) or hasattr(raw_data, "read"): - return RawDeserializer.deserialize_from_text(raw_data, content_type) # type: ignore - return raw_data - - def _instantiate_model(self, response, attrs, additional_properties=None): - """Instantiate a response model passing in deserialized args. - - :param Response response: The response model class. - :param dict attrs: The deserialized response attributes. - :param dict additional_properties: Additional properties to be set. - :rtype: Response - :return: The instantiated response model. - """ - if callable(response): - subtype = getattr(response, "_subtype_map", {}) - try: - readonly = [ - k - for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore - if v.get("readonly") - ] - const = [ - k - for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore - if v.get("constant") - ] - kwargs = {k: v for k, v in attrs.items() if k not in subtype and k not in readonly + const} - response_obj = response(**kwargs) - for attr in readonly: - setattr(response_obj, attr, attrs.get(attr)) - if additional_properties: - response_obj.additional_properties = additional_properties # type: ignore - return response_obj - except TypeError as err: - msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) # type: ignore - raise DeserializationError(msg + str(err)) from err - else: - try: - for attr, value in attrs.items(): - setattr(response, attr, value) - return response - except Exception as exp: - msg = "Unable to populate response model. " - msg += "Type: {}, Error: {}".format(type(response), exp) - raise DeserializationError(msg) from exp - - def deserialize_data(self, data, data_type): # pylint: disable=too-many-return-statements - """Process data for deserialization according to data type. - - :param str data: The response string to be deserialized. - :param str data_type: The type to deserialize to. - :raises DeserializationError: if deserialization fails. - :return: Deserialized object. - :rtype: object - """ - if data is None: - return data - - try: - if not data_type: - return data - if data_type in self.basic_types.values(): - return self.deserialize_basic(data, data_type) - if data_type in self.deserialize_type: - if isinstance(data, self.deserialize_expected_types.get(data_type, tuple())): - return data - - is_a_text_parsing_type = lambda x: x not in [ # pylint: disable=unnecessary-lambda-assignment - "object", - "[]", - r"{}", - ] - if isinstance(data, ET.Element) and is_a_text_parsing_type(data_type) and not data.text: - return None - data_val = self.deserialize_type[data_type](data) - return data_val - - iter_type = data_type[0] + data_type[-1] - if iter_type in self.deserialize_type: - return self.deserialize_type[iter_type](data, data_type[1:-1]) - - obj_type = self.dependencies[data_type] - if issubclass(obj_type, Enum): - if isinstance(data, ET.Element): - data = data.text - return self.deserialize_enum(data, obj_type) - - except (ValueError, TypeError, AttributeError) as err: - msg = "Unable to deserialize response data." - msg += " Data: {}, {}".format(data, data_type) - raise DeserializationError(msg) from err - return self._deserialize(obj_type, data) - - def deserialize_iter(self, attr, iter_type): - """Deserialize an iterable. - - :param list attr: Iterable to be deserialized. - :param str iter_type: The type of object in the iterable. - :return: Deserialized iterable. - :rtype: list - """ - if attr is None: - return None - if isinstance(attr, ET.Element): # If I receive an element here, get the children - attr = list(attr) - if not isinstance(attr, (list, set)): - raise DeserializationError("Cannot deserialize as [{}] an object of type {}".format(iter_type, type(attr))) - return [self.deserialize_data(a, iter_type) for a in attr] - - def deserialize_dict(self, attr, dict_type): - """Deserialize a dictionary. - - :param dict/list attr: Dictionary to be deserialized. Also accepts - a list of key, value pairs. - :param str dict_type: The object type of the items in the dictionary. - :return: Deserialized dictionary. - :rtype: dict - """ - if isinstance(attr, list): - return {x["key"]: self.deserialize_data(x["value"], dict_type) for x in attr} - - if isinstance(attr, ET.Element): - # Transform value into {"Key": "value"} - attr = {el.tag: el.text for el in attr} - return {k: self.deserialize_data(v, dict_type) for k, v in attr.items()} - - def deserialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements - """Deserialize a generic object. - This will be handled as a dictionary. - - :param dict attr: Dictionary to be deserialized. - :return: Deserialized object. - :rtype: dict - :raises TypeError: if non-builtin datatype encountered. - """ - if attr is None: - return None - if isinstance(attr, ET.Element): - # Do no recurse on XML, just return the tree as-is - return attr - if isinstance(attr, str): - return self.deserialize_basic(attr, "str") - obj_type = type(attr) - if obj_type in self.basic_types: - return self.deserialize_basic(attr, self.basic_types[obj_type]) - if obj_type is _long_type: - return self.deserialize_long(attr) - - if obj_type == dict: - deserialized = {} - for key, value in attr.items(): - try: - deserialized[key] = self.deserialize_object(value, **kwargs) - except ValueError: - deserialized[key] = None - return deserialized - - if obj_type == list: - deserialized = [] - for obj in attr: - try: - deserialized.append(self.deserialize_object(obj, **kwargs)) - except ValueError: - pass - return deserialized - - error = "Cannot deserialize generic object with type: " - raise TypeError(error + str(obj_type)) - - def deserialize_basic(self, attr, data_type): # pylint: disable=too-many-return-statements - """Deserialize basic builtin data type from string. - Will attempt to convert to str, int, float and bool. - This function will also accept '1', '0', 'true' and 'false' as - valid bool values. - - :param str attr: response string to be deserialized. - :param str data_type: deserialization data type. - :return: Deserialized basic type. - :rtype: str, int, float or bool - :raises TypeError: if string format is not valid. - """ - # If we're here, data is supposed to be a basic type. - # If it's still an XML node, take the text - if isinstance(attr, ET.Element): - attr = attr.text - if not attr: - if data_type == "str": - # None or '', node is empty string. - return "" - # None or '', node with a strong type is None. - # Don't try to model "empty bool" or "empty int" - return None - - if data_type == "bool": - if attr in [True, False, 1, 0]: - return bool(attr) - if isinstance(attr, str): - if attr.lower() in ["true", "1"]: - return True - if attr.lower() in ["false", "0"]: - return False - raise TypeError("Invalid boolean value: {}".format(attr)) - - if data_type == "str": - return self.deserialize_unicode(attr) - return eval(data_type)(attr) # nosec # pylint: disable=eval-used - - @staticmethod - def deserialize_unicode(data): - """Preserve unicode objects in Python 2, otherwise return data - as a string. - - :param str data: response string to be deserialized. - :return: Deserialized string. - :rtype: str or unicode - """ - # We might be here because we have an enum modeled as string, - # and we try to deserialize a partial dict with enum inside - if isinstance(data, Enum): - return data - - # Consider this is real string - try: - if isinstance(data, unicode): # type: ignore - return data - except NameError: - return str(data) - return str(data) - - @staticmethod - def deserialize_enum(data, enum_obj): - """Deserialize string into enum object. - - If the string is not a valid enum value it will be returned as-is - and a warning will be logged. - - :param str data: Response string to be deserialized. If this value is - None or invalid it will be returned as-is. - :param Enum enum_obj: Enum object to deserialize to. - :return: Deserialized enum object. - :rtype: Enum - """ - if isinstance(data, enum_obj) or data is None: - return data - if isinstance(data, Enum): - data = data.value - if isinstance(data, int): - # Workaround. We might consider remove it in the future. - try: - return list(enum_obj.__members__.values())[data] - except IndexError as exc: - error = "{!r} is not a valid index for enum {!r}" - raise DeserializationError(error.format(data, enum_obj)) from exc - try: - return enum_obj(str(data)) - except ValueError: - for enum_value in enum_obj: - if enum_value.value.lower() == str(data).lower(): - return enum_value - # We don't fail anymore for unknown value, we deserialize as a string - _LOGGER.warning("Deserializer is not able to find %s as valid enum in %s", data, enum_obj) - return Deserializer.deserialize_unicode(data) - - @staticmethod - def deserialize_bytearray(attr): - """Deserialize string into bytearray. - - :param str attr: response string to be deserialized. - :return: Deserialized bytearray - :rtype: bytearray - :raises TypeError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - return bytearray(b64decode(attr)) # type: ignore - - @staticmethod - def deserialize_base64(attr): - """Deserialize base64 encoded string into string. - - :param str attr: response string to be deserialized. - :return: Deserialized base64 string - :rtype: bytearray - :raises TypeError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore - attr = attr + padding # type: ignore - encoded = attr.replace("-", "+").replace("_", "/") - return b64decode(encoded) - - @staticmethod - def deserialize_decimal(attr): - """Deserialize string into Decimal object. - - :param str attr: response string to be deserialized. - :return: Deserialized decimal - :raises DeserializationError: if string format invalid. - :rtype: decimal - """ - if isinstance(attr, ET.Element): - attr = attr.text - try: - return decimal.Decimal(str(attr)) # type: ignore - except decimal.DecimalException as err: - msg = "Invalid decimal {}".format(attr) - raise DeserializationError(msg) from err - - @staticmethod - def deserialize_long(attr): - """Deserialize string into long (Py2) or int (Py3). - - :param str attr: response string to be deserialized. - :return: Deserialized int - :rtype: long or int - :raises ValueError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - return _long_type(attr) # type: ignore - - @staticmethod - def deserialize_duration(attr): - """Deserialize ISO-8601 formatted string into TimeDelta object. - - :param str attr: response string to be deserialized. - :return: Deserialized duration - :rtype: TimeDelta - :raises DeserializationError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - try: - duration = isodate.parse_duration(attr) - except (ValueError, OverflowError, AttributeError) as err: - msg = "Cannot deserialize duration object." - raise DeserializationError(msg) from err - return duration - - @staticmethod - def deserialize_date(attr): - """Deserialize ISO-8601 formatted string into Date object. - - :param str attr: response string to be deserialized. - :return: Deserialized date - :rtype: Date - :raises DeserializationError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore - raise DeserializationError("Date must have only digits and -. Received: %s" % attr) - # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. - return isodate.parse_date(attr, defaultmonth=0, defaultday=0) - - @staticmethod - def deserialize_time(attr): - """Deserialize ISO-8601 formatted string into time object. - - :param str attr: response string to be deserialized. - :return: Deserialized time - :rtype: datetime.time - :raises DeserializationError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore - raise DeserializationError("Date must have only digits and -. Received: %s" % attr) - return isodate.parse_time(attr) - - @staticmethod - def deserialize_rfc(attr): - """Deserialize RFC-1123 formatted string into Datetime object. - - :param str attr: response string to be deserialized. - :return: Deserialized RFC datetime - :rtype: Datetime - :raises DeserializationError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - try: - parsed_date = email.utils.parsedate_tz(attr) # type: ignore - date_obj = datetime.datetime( - *parsed_date[:6], tzinfo=datetime.timezone(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60)) - ) - if not date_obj.tzinfo: - date_obj = date_obj.astimezone(tz=TZ_UTC) - except ValueError as err: - msg = "Cannot deserialize to rfc datetime object." - raise DeserializationError(msg) from err - return date_obj - - @staticmethod - def deserialize_iso(attr): - """Deserialize ISO-8601 formatted string into Datetime object. - - :param str attr: response string to be deserialized. - :return: Deserialized ISO datetime - :rtype: Datetime - :raises DeserializationError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - try: - attr = attr.upper() # type: ignore - match = Deserializer.valid_date.match(attr) - if not match: - raise ValueError("Invalid datetime string: " + attr) - - check_decimal = attr.split(".") - if len(check_decimal) > 1: - decimal_str = "" - for digit in check_decimal[1]: - if digit.isdigit(): - decimal_str += digit - else: - break - if len(decimal_str) > 6: - attr = attr.replace(decimal_str, decimal_str[0:6]) - - date_obj = isodate.parse_datetime(attr) - test_utc = date_obj.utctimetuple() - if test_utc.tm_year > 9999 or test_utc.tm_year < 1: - raise OverflowError("Hit max or min date") - except (ValueError, OverflowError, AttributeError) as err: - msg = "Cannot deserialize datetime object." - raise DeserializationError(msg) from err - return date_obj - - @staticmethod - def deserialize_unix(attr): - """Serialize Datetime object into IntTime format. - This is represented as seconds. - - :param int attr: Object to be serialized. - :return: Deserialized datetime - :rtype: Datetime - :raises DeserializationError: if format invalid - """ - if isinstance(attr, ET.Element): - attr = int(attr.text) # type: ignore - try: - attr = int(attr) - date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC) - except ValueError as err: - msg = "Cannot deserialize to unix datetime object." - raise DeserializationError(msg) from err - return date_obj diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/utils.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/utils.py deleted file mode 100644 index 35c9c836f85..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/utils.py +++ /dev/null @@ -1,25 +0,0 @@ -# -------------------------------------------------------------------------- -# 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 abc import ABC -from typing import Generic, TYPE_CHECKING, TypeVar - -if TYPE_CHECKING: - from .serialization import Deserializer, Serializer - - -TClient = TypeVar("TClient") -TConfig = TypeVar("TConfig") - - -class ClientMixinABC(ABC, Generic[TClient, TConfig]): - """DO NOT use this class. It is for internal typing use only.""" - - _client: TClient - _config: TConfig - _serialize: "Serializer" - _deserialize: "Deserializer" diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/__init__.py deleted file mode 100644 index a2bfcc451fb..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/__init__.py +++ /dev/null @@ -1,29 +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=wrong-import-position - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from ._patch import * # pylint: disable=unused-wildcard-import - -from ._client import ApiKeyClient # type: ignore - -try: - from ._patch import __all__ as _patch_all - from ._patch import * -except ImportError: - _patch_all = [] -from ._patch import patch_sdk as _patch_sdk - -__all__ = [ - "ApiKeyClient", -] -__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/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_client.py deleted file mode 100644 index 606037dfe6b..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_client.py +++ /dev/null @@ -1,97 +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 copy import deepcopy -from typing import Any, Awaitable -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._operations import _ApiKeyClientOperationsMixin - - -class ApiKeyClient(_ApiKeyClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword - """Illustrates clients generated with ApiKey authentication. - - :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 - ) -> None: - _endpoint = "{endpoint}" - self._config = ApiKeyClientConfiguration(credential=credential, endpoint=endpoint, **kwargs) - - _policies = kwargs.pop("policies", None) - if _policies is None: - _policies = [ - policies.RequestIdPolicy(**kwargs), - self._config.headers_policy, - self._config.user_agent_policy, - self._config.proxy_policy, - policies.ContentDecodePolicy(**kwargs), - self._config.redirect_policy, - self._config.retry_policy, - self._config.authentication_policy, - self._config.custom_hook_policy, - self._config.logging_policy, - policies.DistributedTracingPolicy(**kwargs), - policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, - self._config.http_logging_policy, - ] - self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=_endpoint, policies=_policies, **kwargs) - - self._serialize = Serializer() - self._deserialize = Deserializer() - self._serialize.client_side_validation = False - - def send_request( - self, request: HttpRequest, *, stream: bool = False, **kwargs: Any - ) -> Awaitable[AsyncHttpResponse]: - """Runs the network request through the client's chained policies. - - >>> from azure.core.rest import HttpRequest - >>> request = HttpRequest("GET", "https://www.example.org/") - - >>> response = await client.send_request(request) - - - For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request - - :param request: The network request you want to make. Required. - :type request: ~azure.core.rest.HttpRequest - :keyword bool stream: Whether the response payload will be streamed. Defaults to False. - :return: The response of your network call. Does not do error handling on your response. - :rtype: ~azure.core.rest.AsyncHttpResponse - """ - - request_copy = deepcopy(request) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - - request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) - return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore - - async def close(self) -> None: - await self._client.close() - - async def __aenter__(self) -> Self: - await self._client.__aenter__() - return self - - async def __aexit__(self, *exc_details: Any) -> None: - await self._client.__aexit__(*exc_details) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_configuration.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_configuration.py deleted file mode 100644 index 33598014bf6..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_configuration.py +++ /dev/null @@ -1,50 +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 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. - - 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.") - - self.credential = credential - self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "authentication-api-key-with-subdir/{}".format(VERSION)) - self.polling_interval = kwargs.get("polling_interval", 30) - self._configure(**kwargs) - - def _configure(self, **kwargs: Any) -> None: - self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) - self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) - self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) - self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) - self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) - self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) - self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs) - self.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-with-subdir/authentication/apikey/_generated/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/__init__.py deleted file mode 100644 index 933fcd7d1b5..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/__init__.py +++ /dev/null @@ -1,22 +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=wrong-import-position - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from ._patch import * # pylint: disable=unused-wildcard-import - - -from ._patch import __all__ as _patch_all -from ._patch import * -from ._patch import patch_sdk as _patch_sdk - -__all__ = [] -__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/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_operations.py deleted file mode 100644 index 52a900f805b..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_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-with-subdir/authentication/apikey/_generated/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_patch.py deleted file mode 100644 index 8bcb627aa47..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_patch.py +++ /dev/null @@ -1,21 +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. -# -------------------------------------------------------------------------- -"""Customize generated code here. - -Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize -""" -from typing import List - -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level - - -def patch_sdk(): - """Do not remove from this file. - - `patch_sdk` is a last resort escape hatch that allows you to do customizations - you can't accomplish using the techniques described in - https://aka.ms/azsdk/python/dpcodegen/python/customize - """ diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_patch.py deleted file mode 100644 index 8bcb627aa47..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_patch.py +++ /dev/null @@ -1,21 +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. -# -------------------------------------------------------------------------- -"""Customize generated code here. - -Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize -""" -from typing import List - -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level - - -def patch_sdk(): - """Do not remove from this file. - - `patch_sdk` is a last resort escape hatch that allows you to do customizations - you can't accomplish using the techniques described in - https://aka.ms/azsdk/python/dpcodegen/python/customize - """ diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/apiview-properties.json b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/apiview-properties.json deleted file mode 100644 index b762ef4e8f0..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/apiview-properties.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "CrossLanguagePackageId": "Authentication.ApiKey", - "CrossLanguageDefinitionId": { - "authentication.apikey.models.InvalidAuth": "Authentication.ApiKey.InvalidAuth", - "authentication.apikey.ApiKeyClient.valid": "Authentication.ApiKey.valid", - "authentication.apikey.aio.ApiKeyClient.valid": "Authentication.ApiKey.valid", - "authentication.apikey.ApiKeyClient.invalid": "Authentication.ApiKey.invalid", - "authentication.apikey.aio.ApiKeyClient.invalid": "Authentication.ApiKey.invalid" - } -} \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/conftest.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/conftest.py deleted file mode 100644 index 8082748a92a..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/conftest.py +++ /dev/null @@ -1,35 +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. -# -------------------------------------------------------------------------- -import os -import pytest -from dotenv import load_dotenv -from devtools_testutils import ( - test_proxy, - add_general_regex_sanitizer, - add_body_key_sanitizer, - add_header_regex_sanitizer, -) - -load_dotenv() - - -# 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") - - add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]") - add_header_regex_sanitizer(key="Cookie", value="cookie;") - add_body_key_sanitizer(json_path="$..access_token", value="access_token") diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/test_api_key.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/test_api_key.py deleted file mode 100644 index 2916e7b9498..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/test_api_key.py +++ /dev/null @@ -1,31 +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. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils import recorded_by_proxy -from testpreparer import ApiKeyClientTestBase, ApiKeyPreparer - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestApiKey(ApiKeyClientTestBase): - @ApiKeyPreparer() - @recorded_by_proxy - def test_valid(self, apikey_endpoint): - client = self.create_client(endpoint=apikey_endpoint) - response = client.valid() - - # please add some check logic here by yourself - # ... - - @ApiKeyPreparer() - @recorded_by_proxy - def test_invalid(self, apikey_endpoint): - client = self.create_client(endpoint=apikey_endpoint) - response = client.invalid() - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/test_api_key_async.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/test_api_key_async.py deleted file mode 100644 index 214be1ee608..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/test_api_key_async.py +++ /dev/null @@ -1,32 +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. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils.aio import recorded_by_proxy_async -from testpreparer import ApiKeyPreparer -from testpreparer_async import ApiKeyClientTestBaseAsync - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestApiKeyAsync(ApiKeyClientTestBaseAsync): - @ApiKeyPreparer() - @recorded_by_proxy_async - async def test_valid(self, apikey_endpoint): - client = self.create_async_client(endpoint=apikey_endpoint) - response = await client.valid() - - # please add some check logic here by yourself - # ... - - @ApiKeyPreparer() - @recorded_by_proxy_async - async def test_invalid(self, apikey_endpoint): - client = self.create_async_client(endpoint=apikey_endpoint) - response = await client.invalid() - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/testpreparer.py deleted file mode 100644 index 5af4c923ab1..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/testpreparer.py +++ /dev/null @@ -1,24 +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 authentication.apikey import ApiKeyClient -from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer -import functools - - -class ApiKeyClientTestBase(AzureRecordedTestCase): - - def create_client(self, endpoint): - credential = self.get_credential(ApiKeyClient) - return self.create_client_from_credential( - ApiKeyClient, - credential=credential, - endpoint=endpoint, - ) - - -ApiKeyPreparer = functools.partial(PowerShellPreparer, "apikey", apikey_endpoint="https://fake_apikey_endpoint.com") diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/testpreparer_async.py deleted file mode 100644 index 09c26f3fe60..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/generated_tests/testpreparer_async.py +++ /dev/null @@ -1,20 +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 authentication.apikey.aio import ApiKeyClient -from devtools_testutils import AzureRecordedTestCase - - -class ApiKeyClientTestBaseAsync(AzureRecordedTestCase): - - def create_async_client(self, endpoint): - credential = self.get_credential(ApiKeyClient, is_async=True) - return self.create_client_from_credential( - ApiKeyClient, - credential=credential, - endpoint=endpoint, - ) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/__init__.py deleted file mode 100644 index afdf5ab4e36..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/__init__.py +++ /dev/null @@ -1,27 +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=wrong-import-position - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from ._patch import * # pylint: disable=unused-wildcard-import - - -from ._models import ( # type: ignore - InvalidAuth, -) -from ._patch import __all__ as _patch_all -from ._patch import * -from ._patch import patch_sdk as _patch_sdk - -__all__ = [ - "InvalidAuth", -] -__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/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_models.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_models.py deleted file mode 100644 index b695706d2dd..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_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-with-subdir/authentication/apikey/_generated/models/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_patch.py deleted file mode 100644 index 8bcb627aa47..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_patch.py +++ /dev/null @@ -1,21 +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. -# -------------------------------------------------------------------------- -"""Customize generated code here. - -Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize -""" -from typing import List - -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level - - -def patch_sdk(): - """Do not remove from this file. - - `patch_sdk` is a last resort escape hatch that allows you to do customizations - you can't accomplish using the techniques described in - https://aka.ms/azsdk/python/dpcodegen/python/customize - """ diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_version.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_version.py deleted file mode 100644 index be71c81bd28..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/_version.py +++ /dev/null @@ -1,9 +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. -# -------------------------------------------------------------------------- - -VERSION = "1.0.0b1" diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/__init__.py deleted file mode 100644 index 05103a06495..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/__init__.py +++ /dev/null @@ -1,9 +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 ._client import CustomizedApiKeyClient - -__all__ = ["CustomizedApiKeyClient"] diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py deleted file mode 100644 index 9afa30756f0..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py +++ /dev/null @@ -1,21 +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 .._generated.aio import ApiKeyClient - - -class CustomizedApiKeyClient(ApiKeyClient): - - def custom_method(self) -> str: - """ - A custom method that does something specific. - - :param param1: A string parameter. - :param param2: An integer parameter. - :return: A string result. - """ - # Custom logic here - return "This is a custom method in the subdirectory client." diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/py.typed b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/py.typed deleted file mode 100644 index e5aff4f83af..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/authentication/apikey/py.typed +++ /dev/null @@ -1 +0,0 @@ -# Marker file for PEP 561. \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/setup.py b/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/setup.py deleted file mode 100644 index f2a51d6a432..00000000000 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-with-subdir/setup.py +++ /dev/null @@ -1,61 +0,0 @@ -# coding=utf-8 - - -import os -import re -from setuptools import setup, find_packages - - -PACKAGE_NAME = "authentication-api-key-with-subdir" -PACKAGE_PPRINT_NAME = "Authentication Api Key With Subdir" -PACKAGE_NAMESPACE = "authentication.apikey" - -# a.b.c => a/b/c -package_folder_path = PACKAGE_NAMESPACE.replace(".", "/") - -# Version extraction inspired from 'requests' -with open(os.path.join(package_folder_path, "_version.py"), "r") as fd: - version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1) - -if not version: - raise RuntimeError("Cannot find version information") - - -setup( - name=PACKAGE_NAME, - version=version, - description=" {} Client Library for Python".format(PACKAGE_PPRINT_NAME), - long_description=open("README.md", "r").read(), - long_description_content_type="text/markdown", - license="MIT License", - author="", - classifiers=[ - "Development Status :: 4 - Beta", - "Programming Language :: Python", - "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "License :: OSI Approved :: MIT License", - ], - zip_safe=False, - packages=find_packages( - exclude=[ - "tests", - # Exclude packages that will be covered by PEP420 or nspkg - "authentication", - ] - ), - include_package_data=True, - package_data={ - "authentication.apikey": ["py.typed"], - }, - install_requires=[ - "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", - "typing-extensions>=4.6.0", - ], - python_requires=">=3.9", -) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_operations.py index 104d8af49e3..e04e5527efc 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_operations.py @@ -20,7 +20,6 @@ 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 @@ -43,17 +42,10 @@ def build_api_key_valid_request(**kwargs: Any) -> HttpRequest: 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) + return HttpRequest(method="GET", url=_url, **kwargs) class _ApiKeyClientOperationsMixin( diff --git a/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py index 40dd4aa36dd..66ff3016a7b 100644 --- a/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py @@ -20,7 +20,6 @@ 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 CustomClientConfiguration @@ -43,17 +42,10 @@ def build_custom_valid_request(**kwargs: Any) -> HttpRequest: def build_custom_invalid_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - # Construct URL _url = "/authentication/http/custom/invalid" - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) + return HttpRequest(method="GET", url=_url, **kwargs) class _CustomClientOperationsMixin( diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-override/specs/azure/clientgenerator/core/override/models/_models.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-override/specs/azure/clientgenerator/core/override/models/_models.py index 12e4530731a..d871f7c1571 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-override/specs/azure/clientgenerator/core/override/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-override/specs/azure/clientgenerator/core/override/models/_models.py @@ -5,9 +5,41 @@ # 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 .._utils.model_base import Model as _Model +from typing import Any, Mapping, overload + +from .._utils.model_base import Model as _Model, rest_field class GroupParametersOptions(_Model): - """GroupParametersOptions.""" + """GroupParametersOptions. + + :ivar param1: Required. + :vartype param1: str + :ivar param2: Required. + :vartype param2: str + """ + + param1: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) + """Required.""" + param2: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) + """Required.""" + + @overload + def __init__( + self, + *, + param1: str, + param2: 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/azure-core-basic/specs/azure/core/basic/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_operations/_operations.py index 08efd4facb9..a8f22988306 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_operations/_operations.py @@ -164,12 +164,9 @@ def build_basic_list_request( def build_basic_delete_request(id: int, **kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-12-01-preview")) - accept = _headers.pop("Accept", "application/json") - # Construct URL _url = "/azure/core/basic/users/{id}" path_format_arguments = { @@ -181,10 +178,7 @@ def build_basic_delete_request(id: int, **kwargs: Any) -> HttpRequest: # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) + return HttpRequest(method="DELETE", url=_url, params=_params, **kwargs) def build_basic_export_request(id: int, *, format: str, **kwargs: Any) -> HttpRequest: diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/azure/resourcemanager/commonproperties/models/_models.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/azure/resourcemanager/commonproperties/models/_models.py index d70afed1b73..e9d6eced60e 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/azure/resourcemanager/commonproperties/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/azure/resourcemanager/commonproperties/models/_models.py @@ -212,8 +212,6 @@ class ConfidentialResource(TrackedResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str - :ivar name: The name of the resource. - :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -227,12 +225,16 @@ class ConfidentialResource(TrackedResource): :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.commonproperties.models.ConfidentialResourceProperties + :ivar name: The name of the ConfidentialResource. Required. + :vartype name: str """ properties: Optional["_models.ConfidentialResourceProperties"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" + name: str = rest_field(visibility=["read"]) + """The name of the ConfidentialResource. Required.""" @overload def __init__( @@ -399,8 +401,6 @@ class ManagedIdentityTrackedResource(TrackedResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str - :ivar name: The name of the resource. - :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -414,6 +414,8 @@ class ManagedIdentityTrackedResource(TrackedResource): :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.commonproperties.models.ManagedIdentityTrackedResourceProperties + :ivar name: arm resource name for path. Required. + :vartype name: str :ivar identity: The managed service identities assigned to this resource. :vartype identity: ~azure.resourcemanager.commonproperties.models.ManagedServiceIdentity """ @@ -422,6 +424,8 @@ class ManagedIdentityTrackedResource(TrackedResource): visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" + name: str = rest_field(visibility=["read"]) + """arm resource name for path. Required.""" identity: Optional["_models.ManagedServiceIdentity"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_error_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_error_operations.py index 427f508b084..3b1a2ae4b72 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_error_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_error_operations.py @@ -37,8 +37,8 @@ def test_error_create_for_user_defined_error(self, resource_group): confidential_resource_name="str", resource={ "location": "str", - "id": "str", "name": "str", + "id": "str", "properties": {"provisioningState": "str", "username": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_error_operations_async.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_error_operations_async.py index ceedb3682f1..ed14d356ed5 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_error_operations_async.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_error_operations_async.py @@ -38,8 +38,8 @@ async def test_error_create_for_user_defined_error(self, resource_group): confidential_resource_name="str", resource={ "location": "str", - "id": "str", "name": "str", + "id": "str", "properties": {"provisioningState": "str", "username": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_managed_identity_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_managed_identity_operations.py index 92226f4ed8f..e932d9d4c80 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_managed_identity_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_managed_identity_operations.py @@ -37,6 +37,7 @@ def test_managed_identity_create_with_system_assigned(self, resource_group): managed_identity_tracked_resource_name="str", resource={ "location": "str", + "name": "str", "id": "str", "identity": { "type": "str", @@ -44,7 +45,6 @@ def test_managed_identity_create_with_system_assigned(self, resource_group): "tenantId": "str", "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, }, - "name": "str", "properties": {"provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -70,6 +70,7 @@ def test_managed_identity_update_with_user_assigned_and_system_assigned(self, re managed_identity_tracked_resource_name="str", properties={ "location": "str", + "name": "str", "id": "str", "identity": { "type": "str", @@ -77,7 +78,6 @@ def test_managed_identity_update_with_user_assigned_and_system_assigned(self, re "tenantId": "str", "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, }, - "name": "str", "properties": {"provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_managed_identity_operations_async.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_managed_identity_operations_async.py index 5b0776d5e57..46b2b00d356 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_managed_identity_operations_async.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_managed_identity_operations_async.py @@ -38,6 +38,7 @@ async def test_managed_identity_create_with_system_assigned(self, resource_group managed_identity_tracked_resource_name="str", resource={ "location": "str", + "name": "str", "id": "str", "identity": { "type": "str", @@ -45,7 +46,6 @@ async def test_managed_identity_create_with_system_assigned(self, resource_group "tenantId": "str", "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, }, - "name": "str", "properties": {"provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -71,6 +71,7 @@ async def test_managed_identity_update_with_user_assigned_and_system_assigned(se managed_identity_tracked_resource_name="str", properties={ "location": "str", + "name": "str", "id": "str", "identity": { "type": "str", @@ -78,7 +79,6 @@ async def test_managed_identity_update_with_user_assigned_and_system_assigned(se "tenantId": "str", "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, }, - "name": "str", "properties": {"provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/_models.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/_models.py index 3ec1d43d865..1bbc271a7b8 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/_models.py @@ -522,8 +522,6 @@ class Order(TrackedResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str - :ivar name: The name of the resource. - :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -536,12 +534,16 @@ class Order(TrackedResource): :vartype location: str :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.operationtemplates.models.OrderProperties + :ivar name: The name of the Order. Required. + :vartype name: str """ properties: Optional["_models.OrderProperties"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" + name: str = rest_field(visibility=["read"]) + """The name of the Order. Required.""" @overload def __init__( @@ -675,8 +677,6 @@ class Widget(TrackedResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str - :ivar name: The name of the resource. - :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -689,12 +689,16 @@ class Widget(TrackedResource): :vartype location: str :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.operationtemplates.models.WidgetProperties + :ivar name: The name of the Widget. Required. + :vartype name: str """ properties: Optional["_models.WidgetProperties"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" + name: str = rest_field(visibility=["read"]) + """The name of the Widget. Required.""" @overload def __init__( diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/operations/_operations.py index 385a7ea8502..489b9f2bd68 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/operations/_operations.py @@ -188,12 +188,9 @@ def build_lro_export_request( def build_lro_delete_request( resource_group_name: str, order_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-12-01-preview")) - accept = _headers.pop("Accept", "application/json") - # Construct URL _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.OperationTemplates/orders/{orderName}" path_format_arguments = { @@ -207,10 +204,7 @@ def build_lro_delete_request( # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) + return HttpRequest(method="DELETE", url=_url, params=_params, **kwargs) def build_optional_body_get_request( diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/generated_tests/test_operation_templates_lro_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/generated_tests/test_operation_templates_lro_operations.py index 4dd9bfcf656..56938986a7d 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/generated_tests/test_operation_templates_lro_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/generated_tests/test_operation_templates_lro_operations.py @@ -26,8 +26,8 @@ def test_lro_begin_create_or_replace(self, resource_group): order_name="str", resource={ "location": "str", - "id": "str", "name": "str", + "id": "str", "properties": {"amount": 0, "productId": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/generated_tests/test_operation_templates_lro_operations_async.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/generated_tests/test_operation_templates_lro_operations_async.py index 4d27a056ccf..f1bb03dbfa3 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/generated_tests/test_operation_templates_lro_operations_async.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/generated_tests/test_operation_templates_lro_operations_async.py @@ -28,8 +28,8 @@ async def test_lro_begin_create_or_replace(self, resource_group): order_name="str", resource={ "location": "str", - "id": "str", "name": "str", + "id": "str", "properties": {"amount": 0, "productId": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/azure/resourcemanager/resources/models/_models.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/azure/resourcemanager/resources/models/_models.py index 59578127d90..03c2d5052f1 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/azure/resourcemanager/resources/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/azure/resourcemanager/resources/models/_models.py @@ -141,8 +141,6 @@ class ExtensionsResource(ExtensionResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str - :ivar name: The name of the resource. - :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -151,12 +149,16 @@ class ExtensionsResource(ExtensionResource): :vartype system_data: ~azure.resourcemanager.resources.models.SystemData :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.resources.models.ExtensionsResourceProperties + :ivar name: The name of the ExtensionsResource. Required. + :vartype name: str """ properties: Optional["_models.ExtensionsResourceProperties"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" + name: str = rest_field(visibility=["read"]) + """The name of the ExtensionsResource. Required.""" @overload def __init__( @@ -236,8 +238,6 @@ class LocationResource(ProxyResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str - :ivar name: The name of the resource. - :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -246,12 +246,16 @@ class LocationResource(ProxyResource): :vartype system_data: ~azure.resourcemanager.resources.models.SystemData :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.resources.models.LocationResourceProperties + :ivar name: The name of the LocationResource. Required. + :vartype name: str """ properties: Optional["_models.LocationResourceProperties"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" + name: str = rest_field(visibility=["read"]) + """The name of the LocationResource. Required.""" @overload def __init__( @@ -313,8 +317,6 @@ class NestedProxyResource(ProxyResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str - :ivar name: The name of the resource. - :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -323,12 +325,16 @@ class NestedProxyResource(ProxyResource): :vartype system_data: ~azure.resourcemanager.resources.models.SystemData :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.resources.models.NestedProxyResourceProperties + :ivar name: Name of the nested resource. Required. + :vartype name: str """ properties: Optional["_models.NestedProxyResourceProperties"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" + name: str = rest_field(visibility=["read"]) + """Name of the nested resource. Required.""" @overload def __init__( @@ -468,8 +474,6 @@ class SingletonTrackedResource(TrackedResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str - :ivar name: The name of the resource. - :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -482,12 +486,16 @@ class SingletonTrackedResource(TrackedResource): :vartype location: str :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.resources.models.SingletonTrackedResourceProperties + :ivar name: The name of the SingletonTrackedResource. Required. + :vartype name: str """ properties: Optional["_models.SingletonTrackedResourceProperties"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" + name: str = rest_field(visibility=["read"]) + """The name of the SingletonTrackedResource. Required.""" @overload def __init__( @@ -619,8 +627,6 @@ class TopLevelTrackedResource(TrackedResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str - :ivar name: The name of the resource. - :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -633,12 +639,16 @@ class TopLevelTrackedResource(TrackedResource): :vartype location: str :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.resources.models.TopLevelTrackedResourceProperties + :ivar name: arm resource name for path. Required. + :vartype name: str """ properties: Optional["_models.TopLevelTrackedResourceProperties"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" + name: str = rest_field(visibility=["read"]) + """arm resource name for path. Required.""" @overload def __init__( diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/azure/resourcemanager/resources/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/azure/resourcemanager/resources/operations/_operations.py index 869561404aa..eb0a214656b 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/azure/resourcemanager/resources/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/azure/resourcemanager/resources/operations/_operations.py @@ -144,12 +144,9 @@ def build_top_level_update_request( def build_top_level_delete_request( resource_group_name: str, top_level_tracked_resource_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-12-01-preview")) - accept = _headers.pop("Accept", "application/json") - # Construct URL _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}" path_format_arguments = { @@ -165,10 +162,7 @@ def build_top_level_delete_request( # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) + return HttpRequest(method="DELETE", url=_url, params=_params, **kwargs) def build_top_level_list_by_resource_group_request( # pylint: disable=name-too-long @@ -232,8 +226,6 @@ def build_top_level_action_sync_request( content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-12-01-preview")) - accept = _headers.pop("Accept", "application/json") - # Construct URL _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/actionSync" path_format_arguments = { @@ -252,7 +244,6 @@ def build_top_level_action_sync_request( # Construct headers if content_type is not None: _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) @@ -375,12 +366,9 @@ def build_nested_delete_request( subscription_id: str, **kwargs: Any ) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-12-01-preview")) - accept = _headers.pop("Accept", "application/json") - # Construct URL _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}" path_format_arguments = { @@ -397,10 +385,7 @@ def build_nested_delete_request( # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) + return HttpRequest(method="DELETE", url=_url, params=_params, **kwargs) def build_nested_list_by_top_level_tracked_resource_request( # pylint: disable=name-too-long @@ -635,12 +620,9 @@ def build_extensions_resources_update_request( # pylint: disable=name-too-long def build_extensions_resources_delete_request( # pylint: disable=name-too-long resource_uri: str, extensions_resource_name: str, **kwargs: Any ) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-12-01-preview")) - accept = _headers.pop("Accept", "application/json") - # Construct URL _url = "/{resourceUri}/providers/Azure.ResourceManager.Resources/extensionsResources/{extensionsResourceName}" path_format_arguments = { @@ -653,10 +635,7 @@ def build_extensions_resources_delete_request( # pylint: disable=name-too-long # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) + return HttpRequest(method="DELETE", url=_url, params=_params, **kwargs) def build_extensions_resources_list_by_scope_request( # pylint: disable=name-too-long @@ -778,12 +757,9 @@ def build_location_resources_update_request( def build_location_resources_delete_request( location: str, location_resource_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-12-01-preview")) - accept = _headers.pop("Accept", "application/json") - # Construct URL _url = "/subscriptions/{subscriptionId}/providers/Azure.ResourceManager.Resources/locations/{location}/locationResources/{locationResourceName}" path_format_arguments = { @@ -797,10 +773,7 @@ def build_location_resources_delete_request( # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) + return HttpRequest(method="DELETE", url=_url, params=_params, **kwargs) def build_location_resources_list_by_location_request( # pylint: disable=name-too-long diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_extensions_resources_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_extensions_resources_operations.py index b37e097a361..d4af1caccf6 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_extensions_resources_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_extensions_resources_operations.py @@ -36,8 +36,8 @@ def test_extensions_resources_begin_create_or_update(self, resource_group): resource_uri="str", extensions_resource_name="str", resource={ - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -61,8 +61,8 @@ def test_extensions_resources_update(self, resource_group): resource_uri="str", extensions_resource_name="str", properties={ - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_extensions_resources_operations_async.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_extensions_resources_operations_async.py index 88a33f4800d..ce12b232631 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_extensions_resources_operations_async.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_extensions_resources_operations_async.py @@ -38,8 +38,8 @@ async def test_extensions_resources_begin_create_or_update(self, resource_group) resource_uri="str", extensions_resource_name="str", resource={ - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -64,8 +64,8 @@ async def test_extensions_resources_update(self, resource_group): resource_uri="str", extensions_resource_name="str", properties={ - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_location_resources_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_location_resources_operations.py index 41965ddabba..d1d254411b2 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_location_resources_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_location_resources_operations.py @@ -36,8 +36,8 @@ def test_location_resources_create_or_update(self, resource_group): location="str", location_resource_name="str", resource={ - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -61,8 +61,8 @@ def test_location_resources_update(self, resource_group): location="str", location_resource_name="str", properties={ - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_location_resources_operations_async.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_location_resources_operations_async.py index 493b2a11fd8..7b3f253eeac 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_location_resources_operations_async.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_location_resources_operations_async.py @@ -37,8 +37,8 @@ async def test_location_resources_create_or_update(self, resource_group): location="str", location_resource_name="str", resource={ - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -62,8 +62,8 @@ async def test_location_resources_update(self, resource_group): location="str", location_resource_name="str", properties={ - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_nested_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_nested_operations.py index b60fadc33d8..b1dbf9d87ae 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_nested_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_nested_operations.py @@ -38,8 +38,8 @@ def test_nested_begin_create_or_replace(self, resource_group): top_level_tracked_resource_name="str", nexted_proxy_resource_name="str", resource={ - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -64,8 +64,8 @@ def test_nested_begin_update(self, resource_group): top_level_tracked_resource_name="str", nexted_proxy_resource_name="str", properties={ - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_nested_operations_async.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_nested_operations_async.py index bb86a6ff911..6c8f724f73c 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_nested_operations_async.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_nested_operations_async.py @@ -40,8 +40,8 @@ async def test_nested_begin_create_or_replace(self, resource_group): top_level_tracked_resource_name="str", nexted_proxy_resource_name="str", resource={ - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -68,8 +68,8 @@ async def test_nested_begin_update(self, resource_group): top_level_tracked_resource_name="str", nexted_proxy_resource_name="str", properties={ - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_singleton_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_singleton_operations.py index bef8b7bbe35..5d460d4789f 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_singleton_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_singleton_operations.py @@ -35,8 +35,8 @@ def test_singleton_begin_create_or_update(self, resource_group): resource_group_name=resource_group.name, resource={ "location": "str", - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -61,8 +61,8 @@ def test_singleton_update(self, resource_group): resource_group_name=resource_group.name, properties={ "location": "str", - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_singleton_operations_async.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_singleton_operations_async.py index dc973f54204..b5325b135d7 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_singleton_operations_async.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_singleton_operations_async.py @@ -37,8 +37,8 @@ async def test_singleton_begin_create_or_update(self, resource_group): resource_group_name=resource_group.name, resource={ "location": "str", - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -64,8 +64,8 @@ async def test_singleton_update(self, resource_group): resource_group_name=resource_group.name, properties={ "location": "str", - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_top_level_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_top_level_operations.py index 8c685fd5000..cc2e9b22fe5 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_top_level_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_top_level_operations.py @@ -37,8 +37,8 @@ def test_top_level_begin_create_or_replace(self, resource_group): top_level_tracked_resource_name="str", resource={ "location": "str", - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -64,8 +64,8 @@ def test_top_level_begin_update(self, resource_group): top_level_tracked_resource_name="str", properties={ "location": "str", - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_top_level_operations_async.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_top_level_operations_async.py index c3cec3db79a..45294d2d27c 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_top_level_operations_async.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_top_level_operations_async.py @@ -39,8 +39,8 @@ async def test_top_level_begin_create_or_replace(self, resource_group): top_level_tracked_resource_name="str", resource={ "location": "str", - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -68,8 +68,8 @@ async def test_top_level_begin_update(self, resource_group): top_level_tracked_resource_name="str", properties={ "location": "str", - "id": "str", "name": "str", + "id": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/headasbooleanfalse/generated_tests/test_visibility.py b/packages/typespec-python/test/azure/generated/headasbooleanfalse/generated_tests/test_visibility.py index 8752fa205bf..a7cf96b179f 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleanfalse/generated_tests/test_visibility.py +++ b/packages/typespec-python/test/azure/generated/headasbooleanfalse/generated_tests/test_visibility.py @@ -17,7 +17,7 @@ class TestVisibility(VisibilityClientTestBase): def test_get_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.get_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -29,7 +29,7 @@ def test_get_model(self, visibility_endpoint): def test_head_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.head_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -41,7 +41,7 @@ def test_head_model(self, visibility_endpoint): def test_put_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.put_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -52,7 +52,7 @@ def test_put_model(self, visibility_endpoint): def test_patch_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.patch_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -63,7 +63,7 @@ def test_patch_model(self, visibility_endpoint): def test_post_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.post_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -74,7 +74,7 @@ def test_post_model(self, visibility_endpoint): def test_delete_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.delete_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself diff --git a/packages/typespec-python/test/azure/generated/headasbooleanfalse/generated_tests/test_visibility_async.py b/packages/typespec-python/test/azure/generated/headasbooleanfalse/generated_tests/test_visibility_async.py index 191024e0c9f..8ddd7f23ca0 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleanfalse/generated_tests/test_visibility_async.py +++ b/packages/typespec-python/test/azure/generated/headasbooleanfalse/generated_tests/test_visibility_async.py @@ -18,7 +18,7 @@ class TestVisibilityAsync(VisibilityClientTestBaseAsync): async def test_get_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.get_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -30,7 +30,7 @@ async def test_get_model(self, visibility_endpoint): async def test_head_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.head_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -42,7 +42,7 @@ async def test_head_model(self, visibility_endpoint): async def test_put_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.put_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -53,7 +53,7 @@ async def test_put_model(self, visibility_endpoint): async def test_patch_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.patch_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -64,7 +64,7 @@ async def test_patch_model(self, visibility_endpoint): async def test_post_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.post_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -75,7 +75,7 @@ async def test_post_model(self, visibility_endpoint): async def test_delete_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.delete_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself diff --git a/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py b/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py index e4b8dcd1fd4..a87780911d8 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py +++ b/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py @@ -32,6 +32,8 @@ class VisibilityModel(_Model): :ivar read_prop: Required string, illustrating a readonly property. Required. :vartype read_prop: str + :ivar query_prop: Required int32, illustrating a query property. Required. + :vartype query_prop: int :ivar create_prop: Required string[], illustrating a create property. Required. :vartype create_prop: list[str] :ivar update_prop: Required int32[], illustrating a update property. Required. @@ -42,6 +44,8 @@ class VisibilityModel(_Model): read_prop: str = rest_field(name="readProp", visibility=["read"]) """Required string, illustrating a readonly property. Required.""" + query_prop: int = rest_field(name="queryProp", visibility=["query"]) + """Required int32, illustrating a query property. Required.""" create_prop: List[str] = rest_field(name="createProp", visibility=["create"]) """Required string[], illustrating a create property. Required.""" update_prop: List[int] = rest_field(name="updateProp", visibility=["update"]) @@ -53,6 +57,7 @@ class VisibilityModel(_Model): def __init__( self, *, + query_prop: int, create_prop: List[str], update_prop: List[int], delete_prop: bool, diff --git a/packages/typespec-python/test/azure/generated/headasbooleantrue/generated_tests/test_visibility.py b/packages/typespec-python/test/azure/generated/headasbooleantrue/generated_tests/test_visibility.py index 8752fa205bf..a7cf96b179f 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleantrue/generated_tests/test_visibility.py +++ b/packages/typespec-python/test/azure/generated/headasbooleantrue/generated_tests/test_visibility.py @@ -17,7 +17,7 @@ class TestVisibility(VisibilityClientTestBase): def test_get_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.get_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -29,7 +29,7 @@ def test_get_model(self, visibility_endpoint): def test_head_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.head_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -41,7 +41,7 @@ def test_head_model(self, visibility_endpoint): def test_put_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.put_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -52,7 +52,7 @@ def test_put_model(self, visibility_endpoint): def test_patch_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.patch_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -63,7 +63,7 @@ def test_patch_model(self, visibility_endpoint): def test_post_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.post_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -74,7 +74,7 @@ def test_post_model(self, visibility_endpoint): def test_delete_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.delete_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself diff --git a/packages/typespec-python/test/azure/generated/headasbooleantrue/generated_tests/test_visibility_async.py b/packages/typespec-python/test/azure/generated/headasbooleantrue/generated_tests/test_visibility_async.py index 191024e0c9f..8ddd7f23ca0 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleantrue/generated_tests/test_visibility_async.py +++ b/packages/typespec-python/test/azure/generated/headasbooleantrue/generated_tests/test_visibility_async.py @@ -18,7 +18,7 @@ class TestVisibilityAsync(VisibilityClientTestBaseAsync): async def test_get_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.get_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -30,7 +30,7 @@ async def test_get_model(self, visibility_endpoint): async def test_head_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.head_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -42,7 +42,7 @@ async def test_head_model(self, visibility_endpoint): async def test_put_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.put_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -53,7 +53,7 @@ async def test_put_model(self, visibility_endpoint): async def test_patch_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.patch_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -64,7 +64,7 @@ async def test_patch_model(self, visibility_endpoint): async def test_post_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.post_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -75,7 +75,7 @@ async def test_post_model(self, visibility_endpoint): async def test_delete_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.delete_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself diff --git a/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/models/_models.py b/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/models/_models.py index e4b8dcd1fd4..a87780911d8 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/models/_models.py +++ b/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/models/_models.py @@ -32,6 +32,8 @@ class VisibilityModel(_Model): :ivar read_prop: Required string, illustrating a readonly property. Required. :vartype read_prop: str + :ivar query_prop: Required int32, illustrating a query property. Required. + :vartype query_prop: int :ivar create_prop: Required string[], illustrating a create property. Required. :vartype create_prop: list[str] :ivar update_prop: Required int32[], illustrating a update property. Required. @@ -42,6 +44,8 @@ class VisibilityModel(_Model): read_prop: str = rest_field(name="readProp", visibility=["read"]) """Required string, illustrating a readonly property. Required.""" + query_prop: int = rest_field(name="queryProp", visibility=["query"]) + """Required int32, illustrating a query property. Required.""" create_prop: List[str] = rest_field(name="createProp", visibility=["create"]) """Required string[], illustrating a create property. Required.""" update_prop: List[int] = rest_field(name="updateProp", visibility=["update"]) @@ -53,6 +57,7 @@ class VisibilityModel(_Model): def __init__( self, *, + query_prop: int, create_prop: List[str], update_prop: List[int], delete_prop: bool, diff --git a/packages/typespec-python/test/azure/generated/typetest-model-visibility/generated_tests/test_visibility.py b/packages/typespec-python/test/azure/generated/typetest-model-visibility/generated_tests/test_visibility.py index 8752fa205bf..a7cf96b179f 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-visibility/generated_tests/test_visibility.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-visibility/generated_tests/test_visibility.py @@ -17,7 +17,7 @@ class TestVisibility(VisibilityClientTestBase): def test_get_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.get_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -29,7 +29,7 @@ def test_get_model(self, visibility_endpoint): def test_head_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.head_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -41,7 +41,7 @@ def test_head_model(self, visibility_endpoint): def test_put_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.put_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -52,7 +52,7 @@ def test_put_model(self, visibility_endpoint): def test_patch_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.patch_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -63,7 +63,7 @@ def test_patch_model(self, visibility_endpoint): def test_post_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.post_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -74,7 +74,7 @@ def test_post_model(self, visibility_endpoint): def test_delete_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.delete_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself diff --git a/packages/typespec-python/test/azure/generated/typetest-model-visibility/generated_tests/test_visibility_async.py b/packages/typespec-python/test/azure/generated/typetest-model-visibility/generated_tests/test_visibility_async.py index 191024e0c9f..8ddd7f23ca0 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-visibility/generated_tests/test_visibility_async.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-visibility/generated_tests/test_visibility_async.py @@ -18,7 +18,7 @@ class TestVisibilityAsync(VisibilityClientTestBaseAsync): async def test_get_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.get_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -30,7 +30,7 @@ async def test_get_model(self, visibility_endpoint): async def test_head_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.head_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -42,7 +42,7 @@ async def test_head_model(self, visibility_endpoint): async def test_put_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.put_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -53,7 +53,7 @@ async def test_put_model(self, visibility_endpoint): async def test_patch_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.patch_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -64,7 +64,7 @@ async def test_patch_model(self, visibility_endpoint): async def test_post_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.post_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -75,7 +75,7 @@ async def test_post_model(self, visibility_endpoint): async def test_delete_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.delete_model( - input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself diff --git a/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py index e4b8dcd1fd4..a87780911d8 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py @@ -32,6 +32,8 @@ class VisibilityModel(_Model): :ivar read_prop: Required string, illustrating a readonly property. Required. :vartype read_prop: str + :ivar query_prop: Required int32, illustrating a query property. Required. + :vartype query_prop: int :ivar create_prop: Required string[], illustrating a create property. Required. :vartype create_prop: list[str] :ivar update_prop: Required int32[], illustrating a update property. Required. @@ -42,6 +44,8 @@ class VisibilityModel(_Model): read_prop: str = rest_field(name="readProp", visibility=["read"]) """Required string, illustrating a readonly property. Required.""" + query_prop: int = rest_field(name="queryProp", visibility=["query"]) + """Required int32, illustrating a query property. Required.""" create_prop: List[str] = rest_field(name="createProp", visibility=["create"]) """Required string[], illustrating a create property. Required.""" update_prop: List[int] = rest_field(name="updateProp", visibility=["update"]) @@ -53,6 +57,7 @@ class VisibilityModel(_Model): def __init__( self, *, + query_prop: int, create_prop: List[str], update_prop: List[int], delete_prop: bool, From fb0797d0ee0ac34830db1ab7ddfe076c9b14c094 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 4 Aug 2025 12:22:12 -0400 Subject: [PATCH 14/34] generating without packaging files --- .../typespec-python/scripts/eng/regenerate.ts | 4 +- .../authentication/__init__.py | 0 .../authentication/api/__init__.py | 1 + .../authentication/api/key/__init__.py | 1 + .../api/key/subdir/_generated/__init__.py | 32 + .../api/key/subdir/_generated/_client.py | 95 + .../key/subdir/_generated/_configuration.py | 50 + .../subdir/_generated/_operations/__init__.py | 23 + .../_generated/_operations/_operations.py | 144 ++ .../subdir/_generated/_operations/_patch.py | 21 + .../api/key/subdir/_generated/_patch.py | 21 + .../key/subdir/_generated/_utils}/__init__.py | 11 +- .../subdir/_generated/_utils/model_base.py | 1232 ++++++++++ .../subdir/_generated/_utils/serialization.py | 2032 +++++++++++++++++ .../api/key/subdir/_generated/_utils/utils.py | 25 + .../api/key/subdir/_generated/aio/__init__.py | 29 + .../api/key/subdir/_generated/aio/_client.py | 97 + .../subdir/_generated/aio/_configuration.py | 50 + .../_generated/aio/_operations/__init__.py | 23 + .../_generated/aio/_operations/_operations.py | 128 ++ .../_generated/aio/_operations/_patch.py | 21 + .../api/key/subdir/_generated/aio/_patch.py | 21 + .../subdir/_generated/apiview-properties.json | 10 + .../_generated/generated_tests/conftest.py | 35 + .../generated_tests/test_api_key.py | 31 + .../generated_tests/test_api_key_async.py | 32 + .../generated_tests/testpreparer.py | 24 + .../generated_tests/testpreparer_async.py | 20 + .../key/subdir/_generated/models/__init__.py | 27 + .../key/subdir/_generated/models/_models.py | 40 + .../key/subdir/_generated/models/_patch.py | 21 + .../api/key/subdir/_version.py} | 13 +- .../authentication/api/key/subdir}/py.typed | 0 .../test/azure/requirements.txt | 2 +- .../authentication/__init__.py | 1 + .../authentication/api/__init__.py | 1 + .../authentication/api/key/__init__.py | 1 + .../api/key/subdir}/_generated/__init__.py | 0 .../api/key/subdir}/_generated/_client.py | 2 +- .../key/subdir}/_generated/_configuration.py | 2 +- .../_generated/_operations/__init__.py | 1 + .../_generated/_operations/_operations.py | 10 +- .../subdir}/_generated/_operations/_patch.py | 0 .../api/key/subdir}/_generated/_patch.py | 0 .../key/subdir}/_generated/_utils/__init__.py | 0 .../subdir}/_generated/_utils/model_base.py | 0 .../_generated/_utils/serialization.py | 0 .../key/subdir}/_generated/_utils/utils.py | 0 .../key/subdir}/_generated/aio/__init__.py | 0 .../api/key/subdir}/_generated/aio/_client.py | 2 +- .../subdir}/_generated/aio/_configuration.py | 2 +- .../_generated/aio/_operations/__init__.py | 1 + .../_generated/aio/_operations/_operations.py | 0 .../_generated/aio/_operations/_patch.py | 0 .../api/key/subdir}/_generated/aio/_patch.py | 0 .../key/subdir}/_generated/models/__init__.py | 0 .../key/subdir}/_generated/models/_models.py | 0 .../key/subdir}/_generated/models/_patch.py | 0 .../api/key/subdir}/_version.py | 0 .../authentication/api/key/subdir/py.typed | 1 + .../CHANGELOG.md | 0 .../MANIFEST.in | 6 - .../README.md | 30 - .../authentication/apikey/_client.py | 21 - .../authentication/apikey/aio/_client.py | 21 - .../setup.py | 61 - .../apikey/_operations/_operations.py | 10 +- .../test/unbranded/requirements.txt | 2 +- 68 files changed, 4312 insertions(+), 179 deletions(-) rename packages/typespec-python/test/{unbranded/generated/authentication-api-key-with-subdir => azure/generated/authentication-api-key-subdir}/authentication/__init__.py (100%) create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_client.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_configuration.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_patch.py rename packages/typespec-python/test/{unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio => azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils}/__init__.py (58%) create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/model_base.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/serialization.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/utils.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_client.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_configuration.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_operations.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/apiview-properties.json create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/conftest.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/test_api_key.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/test_api_key_async.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/testpreparer.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/testpreparer_async.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_models.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_patch.py rename packages/typespec-python/test/{unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/__init__.py => azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_version.py} (54%) rename packages/typespec-python/test/{unbranded/generated/authentication-api-key-with-subdir/authentication/apikey => azure/generated/authentication-api-key-subdir/authentication/api/key/subdir}/py.typed (100%) create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/__init__.py rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/__init__.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/_client.py (98%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/_configuration.py (98%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/_operations/__init__.py (79%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/_operations/_operations.py (92%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/_operations/_patch.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/_patch.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/_utils/__init__.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/_utils/model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/_utils/serialization.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/_utils/utils.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/aio/__init__.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/aio/_client.py (98%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/aio/_configuration.py (98%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/aio/_operations/__init__.py (79%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/aio/_operations/_operations.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/aio/_operations/_patch.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/aio/_patch.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/models/__init__.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/models/_models.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_generated/models/_patch.py (100%) rename packages/typespec-python/test/unbranded/generated/{authentication-api-key-with-subdir/authentication/apikey => authentication-api-key-subdir/authentication/api/key/subdir}/_version.py (100%) create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/py.typed delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/CHANGELOG.md delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/MANIFEST.in delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/README.md delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py delete mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/setup.py diff --git a/packages/typespec-python/scripts/eng/regenerate.ts b/packages/typespec-python/scripts/eng/regenerate.ts index 916d567cbbe..eb2cbdc8a47 100644 --- a/packages/typespec-python/scripts/eng/regenerate.ts +++ b/packages/typespec-python/scripts/eng/regenerate.ts @@ -135,10 +135,10 @@ const EMITTER_OPTIONS: Record | Record None: + _endpoint = "{endpoint}" + self._config = ApiKeyClientConfiguration(credential=credential, endpoint=endpoint, **kwargs) + + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + policies.RequestIdPolicy(**kwargs), + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + self._config.redirect_policy, + self._config.retry_policy, + self._config.authentication_policy, + self._config.custom_hook_policy, + self._config.logging_policy, + policies.DistributedTracingPolicy(**kwargs), + policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, + self._config.http_logging_policy, + ] + self._client: PipelineClient = PipelineClient(base_url=_endpoint, policies=_policies, **kwargs) + + self._serialize = Serializer() + self._deserialize = Deserializer() + self._serialize.client_side_validation = False + + def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse: + """Runs the network request through the client's chained policies. + + >>> from azure.core.rest import HttpRequest + >>> request = HttpRequest("GET", "https://www.example.org/") + + >>> response = client.send_request(request) + + + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request + + :param request: The network request you want to make. Required. + :type request: ~azure.core.rest.HttpRequest + :keyword bool stream: Whether the response payload will be streamed. Defaults to False. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~azure.core.rest.HttpResponse + """ + + request_copy = deepcopy(request) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + + request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + def close(self) -> None: + self._client.close() + + def __enter__(self) -> Self: + self._client.__enter__() + return self + + def __exit__(self, *exc_details: Any) -> None: + self._client.__exit__(*exc_details) 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/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_configuration.py new file mode 100644 index 00000000000..c94cbf4cd58 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_configuration.py @@ -0,0 +1,50 @@ +# 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 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. + + 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.") + + self.credential = credential + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "authentication-api-key-subdir/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) + self._configure(**kwargs) + + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs) + self.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/_operations/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/__init__.py new file mode 100644 index 00000000000..90f96a75199 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/__init__.py @@ -0,0 +1,23 @@ +# 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=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._operations import _ApiKeyClientOperationsMixin # type: ignore # pylint: disable=unused-import + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [] +__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/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 new file mode 100644 index 00000000000..e04e5527efc --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py @@ -0,0 +1,144 @@ +# 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 .. 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: + # Construct URL + _url = "/authentication/api-key/invalid" + + return HttpRequest(method="GET", url=_url, **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/_operations/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_patch.py @@ -0,0 +1,21 @@ +# 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. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ 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/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_patch.py @@ -0,0 +1,21 @@ +# 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. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/__init__.py similarity index 58% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/__init__.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/__init__.py index 05103a06495..8026245c2ab 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/__init__.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/__init__.py @@ -1,9 +1,6 @@ -# ------------------------------------------------------------------------- +# -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. +# 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 ._client import CustomizedApiKeyClient - -__all__ = ["CustomizedApiKeyClient"] 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/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/model_base.py new file mode 100644 index 00000000000..49d5c725938 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/model_base.py @@ -0,0 +1,1232 @@ +# pylint: disable=too-many-lines +# 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=protected-access, broad-except + +import copy +import calendar +import decimal +import functools +import sys +import logging +import base64 +import re +import typing +import enum +import email.utils +from datetime import datetime, date, time, timedelta, timezone +from json import JSONEncoder +import xml.etree.ElementTree as ET +from collections.abc import MutableMapping +from typing_extensions import Self +import isodate +from azure.core.exceptions import DeserializationError +from azure.core import CaseInsensitiveEnumMeta +from azure.core.pipeline import PipelineResponse +from azure.core.serialization import _Null + +_LOGGER = logging.getLogger(__name__) + +__all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"] + +TZ_UTC = timezone.utc +_T = typing.TypeVar("_T") + + +def _timedelta_as_isostr(td: timedelta) -> str: + """Converts a datetime.timedelta object into an ISO 8601 formatted string, e.g. 'P4DT12H30M05S' + + Function adapted from the Tin Can Python project: https://github.com/RusticiSoftware/TinCanPython + + :param timedelta td: The timedelta to convert + :rtype: str + :return: ISO8601 version of this timedelta + """ + + # Split seconds to larger units + seconds = td.total_seconds() + minutes, seconds = divmod(seconds, 60) + hours, minutes = divmod(minutes, 60) + days, hours = divmod(hours, 24) + + days, hours, minutes = list(map(int, (days, hours, minutes))) + seconds = round(seconds, 6) + + # Build date + date_str = "" + if days: + date_str = "%sD" % days + + if hours or minutes or seconds: + # Build time + time_str = "T" + + # Hours + bigger_exists = date_str or hours + if bigger_exists: + time_str += "{:02}H".format(hours) + + # Minutes + bigger_exists = bigger_exists or minutes + if bigger_exists: + time_str += "{:02}M".format(minutes) + + # Seconds + try: + if seconds.is_integer(): + seconds_string = "{:02}".format(int(seconds)) + else: + # 9 chars long w/ leading 0, 6 digits after decimal + seconds_string = "%09.6f" % seconds + # Remove trailing zeros + seconds_string = seconds_string.rstrip("0") + except AttributeError: # int.is_integer() raises + seconds_string = "{:02}".format(seconds) + + time_str += "{}S".format(seconds_string) + else: + time_str = "" + + return "P" + date_str + time_str + + +def _serialize_bytes(o, format: typing.Optional[str] = None) -> str: + encoded = base64.b64encode(o).decode() + if format == "base64url": + return encoded.strip("=").replace("+", "-").replace("/", "_") + return encoded + + +def _serialize_datetime(o, format: typing.Optional[str] = None): + if hasattr(o, "year") and hasattr(o, "hour"): + if format == "rfc7231": + return email.utils.format_datetime(o, usegmt=True) + if format == "unix-timestamp": + return int(calendar.timegm(o.utctimetuple())) + + # astimezone() fails for naive times in Python 2.7, so make make sure o is aware (tzinfo is set) + if not o.tzinfo: + iso_formatted = o.replace(tzinfo=TZ_UTC).isoformat() + else: + iso_formatted = o.astimezone(TZ_UTC).isoformat() + # Replace the trailing "+00:00" UTC offset with "Z" (RFC 3339: https://www.ietf.org/rfc/rfc3339.txt) + return iso_formatted.replace("+00:00", "Z") + # Next try datetime.date or datetime.time + return o.isoformat() + + +def _is_readonly(p): + try: + return p._visibility == ["read"] + except AttributeError: + return False + + +class SdkJSONEncoder(JSONEncoder): + """A JSON encoder that's capable of serializing datetime objects and bytes.""" + + def __init__(self, *args, exclude_readonly: bool = False, format: typing.Optional[str] = None, **kwargs): + super().__init__(*args, **kwargs) + self.exclude_readonly = exclude_readonly + self.format = format + + def default(self, o): # pylint: disable=too-many-return-statements + if _is_model(o): + if self.exclude_readonly: + readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)] + return {k: v for k, v in o.items() if k not in readonly_props} + return dict(o.items()) + try: + return super(SdkJSONEncoder, self).default(o) + except TypeError: + if isinstance(o, _Null): + return None + if isinstance(o, decimal.Decimal): + return float(o) + if isinstance(o, (bytes, bytearray)): + return _serialize_bytes(o, self.format) + try: + # First try datetime.datetime + return _serialize_datetime(o, self.format) + except AttributeError: + pass + # Last, try datetime.timedelta + try: + return _timedelta_as_isostr(o) + except AttributeError: + # This will be raised when it hits value.total_seconds in the method above + pass + return super(SdkJSONEncoder, self).default(o) + + +_VALID_DATE = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" + r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") +_VALID_RFC7231 = re.compile( + r"(Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s\d{2}\s" + r"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d{4}\s\d{2}:\d{2}:\d{2}\sGMT" +) + + +def _deserialize_datetime(attr: typing.Union[str, datetime]) -> datetime: + """Deserialize ISO-8601 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :rtype: ~datetime.datetime + :returns: The datetime object from that input + """ + if isinstance(attr, datetime): + # i'm already deserialized + return attr + attr = attr.upper() + match = _VALID_DATE.match(attr) + if not match: + raise ValueError("Invalid datetime string: " + attr) + + check_decimal = attr.split(".") + if len(check_decimal) > 1: + decimal_str = "" + for digit in check_decimal[1]: + if digit.isdigit(): + decimal_str += digit + else: + break + if len(decimal_str) > 6: + attr = attr.replace(decimal_str, decimal_str[0:6]) + + date_obj = isodate.parse_datetime(attr) + test_utc = date_obj.utctimetuple() + if test_utc.tm_year > 9999 or test_utc.tm_year < 1: + raise OverflowError("Hit max or min date") + return date_obj + + +def _deserialize_datetime_rfc7231(attr: typing.Union[str, datetime]) -> datetime: + """Deserialize RFC7231 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :rtype: ~datetime.datetime + :returns: The datetime object from that input + """ + if isinstance(attr, datetime): + # i'm already deserialized + return attr + match = _VALID_RFC7231.match(attr) + if not match: + raise ValueError("Invalid datetime string: " + attr) + + return email.utils.parsedate_to_datetime(attr) + + +def _deserialize_datetime_unix_timestamp(attr: typing.Union[float, datetime]) -> datetime: + """Deserialize unix timestamp into Datetime object. + + :param str attr: response string to be deserialized. + :rtype: ~datetime.datetime + :returns: The datetime object from that input + """ + if isinstance(attr, datetime): + # i'm already deserialized + return attr + return datetime.fromtimestamp(attr, TZ_UTC) + + +def _deserialize_date(attr: typing.Union[str, date]) -> date: + """Deserialize ISO-8601 formatted string into Date object. + :param str attr: response string to be deserialized. + :rtype: date + :returns: The date object from that input + """ + # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. + if isinstance(attr, date): + return attr + return isodate.parse_date(attr, defaultmonth=None, defaultday=None) # type: ignore + + +def _deserialize_time(attr: typing.Union[str, time]) -> time: + """Deserialize ISO-8601 formatted string into time object. + + :param str attr: response string to be deserialized. + :rtype: datetime.time + :returns: The time object from that input + """ + if isinstance(attr, time): + return attr + return isodate.parse_time(attr) + + +def _deserialize_bytes(attr): + if isinstance(attr, (bytes, bytearray)): + return attr + return bytes(base64.b64decode(attr)) + + +def _deserialize_bytes_base64(attr): + if isinstance(attr, (bytes, bytearray)): + return attr + padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore + attr = attr + padding # type: ignore + encoded = attr.replace("-", "+").replace("_", "/") + return bytes(base64.b64decode(encoded)) + + +def _deserialize_duration(attr): + if isinstance(attr, timedelta): + return attr + return isodate.parse_duration(attr) + + +def _deserialize_decimal(attr): + if isinstance(attr, decimal.Decimal): + return attr + return decimal.Decimal(str(attr)) + + +def _deserialize_int_as_str(attr): + if isinstance(attr, int): + return attr + return int(attr) + + +_DESERIALIZE_MAPPING = { + datetime: _deserialize_datetime, + date: _deserialize_date, + time: _deserialize_time, + bytes: _deserialize_bytes, + bytearray: _deserialize_bytes, + timedelta: _deserialize_duration, + typing.Any: lambda x: x, + decimal.Decimal: _deserialize_decimal, +} + +_DESERIALIZE_MAPPING_WITHFORMAT = { + "rfc3339": _deserialize_datetime, + "rfc7231": _deserialize_datetime_rfc7231, + "unix-timestamp": _deserialize_datetime_unix_timestamp, + "base64": _deserialize_bytes, + "base64url": _deserialize_bytes_base64, +} + + +def get_deserializer(annotation: typing.Any, rf: typing.Optional["_RestField"] = None): + if annotation is int and rf and rf._format == "str": + return _deserialize_int_as_str + if rf and rf._format: + return _DESERIALIZE_MAPPING_WITHFORMAT.get(rf._format) + return _DESERIALIZE_MAPPING.get(annotation) # pyright: ignore + + +def _get_type_alias_type(module_name: str, alias_name: str): + types = { + k: v + for k, v in sys.modules[module_name].__dict__.items() + if isinstance(v, typing._GenericAlias) # type: ignore + } + if alias_name not in types: + return alias_name + return types[alias_name] + + +def _get_model(module_name: str, model_name: str): + models = {k: v for k, v in sys.modules[module_name].__dict__.items() if isinstance(v, type)} + module_end = module_name.rsplit(".", 1)[0] + models.update({k: v for k, v in sys.modules[module_end].__dict__.items() if isinstance(v, type)}) + if isinstance(model_name, str): + model_name = model_name.split(".")[-1] + if model_name not in models: + return model_name + return models[model_name] + + +_UNSET = object() + + +class _MyMutableMapping(MutableMapping[str, typing.Any]): + def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + self._data = data + + def __contains__(self, key: typing.Any) -> bool: + return key in self._data + + def __getitem__(self, key: str) -> typing.Any: + return self._data.__getitem__(key) + + def __setitem__(self, key: str, value: typing.Any) -> None: + self._data.__setitem__(key, value) + + def __delitem__(self, key: str) -> None: + self._data.__delitem__(key) + + def __iter__(self) -> typing.Iterator[typing.Any]: + return self._data.__iter__() + + def __len__(self) -> int: + return self._data.__len__() + + def __ne__(self, other: typing.Any) -> bool: + return not self.__eq__(other) + + def keys(self) -> typing.KeysView[str]: + """ + :returns: a set-like object providing a view on D's keys + :rtype: ~typing.KeysView + """ + return self._data.keys() + + def values(self) -> typing.ValuesView[typing.Any]: + """ + :returns: an object providing a view on D's values + :rtype: ~typing.ValuesView + """ + return self._data.values() + + def items(self) -> typing.ItemsView[str, typing.Any]: + """ + :returns: set-like object providing a view on D's items + :rtype: ~typing.ItemsView + """ + return self._data.items() + + def get(self, key: str, default: typing.Any = None) -> typing.Any: + """ + Get the value for key if key is in the dictionary, else default. + :param str key: The key to look up. + :param any default: The value to return if key is not in the dictionary. Defaults to None + :returns: D[k] if k in D, else d. + :rtype: any + """ + try: + return self[key] + except KeyError: + return default + + @typing.overload + def pop(self, key: str) -> typing.Any: ... # pylint: disable=arguments-differ + + @typing.overload + def pop(self, key: str, default: _T) -> _T: ... # pylint: disable=signature-differs + + @typing.overload + def pop(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs + + def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: + """ + Removes specified key and return the corresponding value. + :param str key: The key to pop. + :param any default: The value to return if key is not in the dictionary + :returns: The value corresponding to the key. + :rtype: any + :raises KeyError: If key is not found and default is not given. + """ + if default is _UNSET: + return self._data.pop(key) + return self._data.pop(key, default) + + def popitem(self) -> typing.Tuple[str, typing.Any]: + """ + Removes and returns some (key, value) pair + :returns: The (key, value) pair. + :rtype: tuple + :raises KeyError: if D is empty. + """ + return self._data.popitem() + + def clear(self) -> None: + """ + Remove all items from D. + """ + self._data.clear() + + def update(self, *args: typing.Any, **kwargs: typing.Any) -> None: # pylint: disable=arguments-differ + """ + Updates D from mapping/iterable E and F. + :param any args: Either a mapping object or an iterable of key-value pairs. + """ + self._data.update(*args, **kwargs) + + @typing.overload + def setdefault(self, key: str, default: None = None) -> None: ... + + @typing.overload + def setdefault(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs + + def setdefault(self, key: str, default: typing.Any = _UNSET) -> typing.Any: + """ + Same as calling D.get(k, d), and setting D[k]=d if k not found + :param str key: The key to look up. + :param any default: The value to set if key is not in the dictionary + :returns: D[k] if k in D, else d. + :rtype: any + """ + if default is _UNSET: + return self._data.setdefault(key) + return self._data.setdefault(key, default) + + def __eq__(self, other: typing.Any) -> bool: + try: + other_model = self.__class__(other) + except Exception: + return False + return self._data == other_model._data + + def __repr__(self) -> str: + return str(self._data) + + +def _is_model(obj: typing.Any) -> bool: + return getattr(obj, "_is_model", False) + + +def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-many-return-statements + if isinstance(o, list): + return [_serialize(x, format) for x in o] + if isinstance(o, dict): + return {k: _serialize(v, format) for k, v in o.items()} + if isinstance(o, set): + return {_serialize(x, format) for x in o} + if isinstance(o, tuple): + return tuple(_serialize(x, format) for x in o) + if isinstance(o, (bytes, bytearray)): + return _serialize_bytes(o, format) + if isinstance(o, decimal.Decimal): + return float(o) + if isinstance(o, enum.Enum): + return o.value + if isinstance(o, int): + if format == "str": + return str(o) + return o + try: + # First try datetime.datetime + return _serialize_datetime(o, format) + except AttributeError: + pass + # Last, try datetime.timedelta + try: + return _timedelta_as_isostr(o) + except AttributeError: + # This will be raised when it hits value.total_seconds in the method above + pass + return o + + +def _get_rest_field( + attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str +) -> typing.Optional["_RestField"]: + try: + return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) + except StopIteration: + return None + + +def _create_value(rf: typing.Optional["_RestField"], value: typing.Any) -> typing.Any: + if not rf: + return _serialize(value, None) + if rf._is_multipart_file_input: + return value + if rf._is_model: + return _deserialize(rf._type, value) + if isinstance(value, ET.Element): + value = _deserialize(rf._type, value) + return _serialize(value, rf._format) + + +class Model(_MyMutableMapping): + _is_model = True + # label whether current class's _attr_to_rest_field has been calculated + # could not see _attr_to_rest_field directly because subclass inherits it from parent class + _calculated: typing.Set[str] = set() + + def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: + class_name = self.__class__.__name__ + if len(args) > 1: + raise TypeError(f"{class_name}.__init__() takes 2 positional arguments but {len(args) + 1} were given") + dict_to_pass = { + rest_field._rest_name: rest_field._default + for rest_field in self._attr_to_rest_field.values() + if rest_field._default is not _UNSET + } + if args: # pylint: disable=too-many-nested-blocks + if isinstance(args[0], ET.Element): + existed_attr_keys = [] + model_meta = getattr(self, "_xml", {}) + + for rf in self._attr_to_rest_field.values(): + prop_meta = getattr(rf, "_xml", {}) + xml_name = prop_meta.get("name", rf._rest_name) + xml_ns = prop_meta.get("ns", model_meta.get("ns", None)) + if xml_ns: + xml_name = "{" + xml_ns + "}" + xml_name + + # attribute + if prop_meta.get("attribute", False) and args[0].get(xml_name) is not None: + existed_attr_keys.append(xml_name) + dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].get(xml_name)) + continue + + # unwrapped element is array + if prop_meta.get("unwrapped", False): + # unwrapped array could either use prop items meta/prop meta + if prop_meta.get("itemsName"): + xml_name = prop_meta.get("itemsName") + xml_ns = prop_meta.get("itemNs") + if xml_ns: + xml_name = "{" + xml_ns + "}" + xml_name + items = args[0].findall(xml_name) # pyright: ignore + if len(items) > 0: + existed_attr_keys.append(xml_name) + dict_to_pass[rf._rest_name] = _deserialize(rf._type, items) + continue + + # text element is primitive type + if prop_meta.get("text", False): + if args[0].text is not None: + dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].text) + continue + + # wrapped element could be normal property or array, it should only have one element + item = args[0].find(xml_name) + if item is not None: + existed_attr_keys.append(xml_name) + dict_to_pass[rf._rest_name] = _deserialize(rf._type, item) + + # rest thing is additional properties + for e in args[0]: + if e.tag not in existed_attr_keys: + dict_to_pass[e.tag] = _convert_element(e) + else: + dict_to_pass.update( + {k: _create_value(_get_rest_field(self._attr_to_rest_field, k), v) for k, v in args[0].items()} + ) + else: + non_attr_kwargs = [k for k in kwargs if k not in self._attr_to_rest_field] + if non_attr_kwargs: + # actual type errors only throw the first wrong keyword arg they see, so following that. + raise TypeError(f"{class_name}.__init__() got an unexpected keyword argument '{non_attr_kwargs[0]}'") + dict_to_pass.update( + { + self._attr_to_rest_field[k]._rest_name: _create_value(self._attr_to_rest_field[k], v) + for k, v in kwargs.items() + if v is not None + } + ) + super().__init__(dict_to_pass) + + def copy(self) -> "Model": + return Model(self.__dict__) + + def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: + if f"{cls.__module__}.{cls.__qualname__}" not in cls._calculated: + # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', + # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' + mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order + attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") + } + annotations = { + k: v + for mro_class in mros + if hasattr(mro_class, "__annotations__") + for k, v in mro_class.__annotations__.items() + } + for attr, rf in attr_to_rest_field.items(): + rf._module = cls.__module__ + if not rf._type: + rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) + if not rf._rest_name_input: + rf._rest_name_input = attr + cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") + + return super().__new__(cls) + + def __init_subclass__(cls, discriminator: typing.Optional[str] = None) -> None: + for base in cls.__bases__: + if hasattr(base, "__mapping__"): + base.__mapping__[discriminator or cls.__name__] = cls # type: ignore + + @classmethod + def _get_discriminator(cls, exist_discriminators) -> typing.Optional["_RestField"]: + for v in cls.__dict__.values(): + if isinstance(v, _RestField) and v._is_discriminator and v._rest_name not in exist_discriminators: + return v + return None + + @classmethod + def _deserialize(cls, data, exist_discriminators): + if not hasattr(cls, "__mapping__"): + return cls(data) + discriminator = cls._get_discriminator(exist_discriminators) + if discriminator is None: + return cls(data) + exist_discriminators.append(discriminator._rest_name) + if isinstance(data, ET.Element): + model_meta = getattr(cls, "_xml", {}) + prop_meta = getattr(discriminator, "_xml", {}) + xml_name = prop_meta.get("name", discriminator._rest_name) + xml_ns = prop_meta.get("ns", model_meta.get("ns", None)) + if xml_ns: + xml_name = "{" + xml_ns + "}" + xml_name + + if data.get(xml_name) is not None: + discriminator_value = data.get(xml_name) + else: + discriminator_value = data.find(xml_name).text # pyright: ignore + else: + discriminator_value = data.get(discriminator._rest_name) + mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member + return mapped_cls._deserialize(data, exist_discriminators) + + def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + """Return a dict that can be turned into json using json.dump. + + :keyword bool exclude_readonly: Whether to remove the readonly properties. + :returns: A dict JSON compatible object + :rtype: dict + """ + + result = {} + readonly_props = [] + if exclude_readonly: + readonly_props = [p._rest_name for p in self._attr_to_rest_field.values() if _is_readonly(p)] + for k, v in self.items(): + if exclude_readonly and k in readonly_props: # pyright: ignore + continue + is_multipart_file_input = False + try: + is_multipart_file_input = next( + rf for rf in self._attr_to_rest_field.values() if rf._rest_name == k + )._is_multipart_file_input + except StopIteration: + pass + result[k] = v if is_multipart_file_input else Model._as_dict_value(v, exclude_readonly=exclude_readonly) + return result + + @staticmethod + def _as_dict_value(v: typing.Any, exclude_readonly: bool = False) -> typing.Any: + if v is None or isinstance(v, _Null): + return None + if isinstance(v, (list, tuple, set)): + return type(v)(Model._as_dict_value(x, exclude_readonly=exclude_readonly) for x in v) + if isinstance(v, dict): + return {dk: Model._as_dict_value(dv, exclude_readonly=exclude_readonly) for dk, dv in v.items()} + return v.as_dict(exclude_readonly=exclude_readonly) if hasattr(v, "as_dict") else v + + +def _deserialize_model(model_deserializer: typing.Optional[typing.Callable], obj): + if _is_model(obj): + return obj + return _deserialize(model_deserializer, obj) + + +def _deserialize_with_optional(if_obj_deserializer: typing.Optional[typing.Callable], obj): + if obj is None: + return obj + return _deserialize_with_callable(if_obj_deserializer, obj) + + +def _deserialize_with_union(deserializers, obj): + for deserializer in deserializers: + try: + return _deserialize(deserializer, obj) + except DeserializationError: + pass + raise DeserializationError() + + +def _deserialize_dict( + value_deserializer: typing.Optional[typing.Callable], + module: typing.Optional[str], + obj: typing.Dict[typing.Any, typing.Any], +): + if obj is None: + return obj + if isinstance(obj, ET.Element): + obj = {child.tag: child for child in obj} + return {k: _deserialize(value_deserializer, v, module) for k, v in obj.items()} + + +def _deserialize_multiple_sequence( + entry_deserializers: typing.List[typing.Optional[typing.Callable]], + module: typing.Optional[str], + obj, +): + if obj is None: + return obj + return type(obj)(_deserialize(deserializer, entry, module) for entry, deserializer in zip(obj, entry_deserializers)) + + +def _deserialize_sequence( + deserializer: typing.Optional[typing.Callable], + module: typing.Optional[str], + obj, +): + if obj is None: + return obj + if isinstance(obj, ET.Element): + obj = list(obj) + return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) + + +def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: + return sorted( + types, + key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), + ) + + +def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-return-statements, too-many-branches + annotation: typing.Any, + module: typing.Optional[str], + rf: typing.Optional["_RestField"] = None, +) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]: + if not annotation: + return None + + # is it a type alias? + if isinstance(annotation, str): + if module is not None: + annotation = _get_type_alias_type(module, annotation) + + # is it a forward ref / in quotes? + if isinstance(annotation, (str, typing.ForwardRef)): + try: + model_name = annotation.__forward_arg__ # type: ignore + except AttributeError: + model_name = annotation + if module is not None: + annotation = _get_model(module, model_name) # type: ignore + + try: + if module and _is_model(annotation): + if rf: + rf._is_model = True + + return functools.partial(_deserialize_model, annotation) # pyright: ignore + except Exception: + pass + + # is it a literal? + try: + if annotation.__origin__ is typing.Literal: # pyright: ignore + return None + except AttributeError: + pass + + # is it optional? + try: + if any(a for a in annotation.__args__ if a == type(None)): # pyright: ignore + if len(annotation.__args__) <= 2: # pyright: ignore + if_obj_deserializer = _get_deserialize_callable_from_annotation( + next(a for a in annotation.__args__ if a != type(None)), module, rf # pyright: ignore + ) + + return functools.partial(_deserialize_with_optional, if_obj_deserializer) + # the type is Optional[Union[...]], we need to remove the None type from the Union + annotation_copy = copy.copy(annotation) + annotation_copy.__args__ = [a for a in annotation_copy.__args__ if a != type(None)] # pyright: ignore + return _get_deserialize_callable_from_annotation(annotation_copy, module, rf) + except AttributeError: + pass + + # is it union? + if getattr(annotation, "__origin__", None) is typing.Union: + # initial ordering is we make `string` the last deserialization option, because it is often them most generic + deserializers = [ + _get_deserialize_callable_from_annotation(arg, module, rf) + for arg in _sorted_annotations(annotation.__args__) # pyright: ignore + ] + + return functools.partial(_deserialize_with_union, deserializers) + + try: + if annotation._name == "Dict": # pyright: ignore + value_deserializer = _get_deserialize_callable_from_annotation( + annotation.__args__[1], module, rf # pyright: ignore + ) + + return functools.partial( + _deserialize_dict, + value_deserializer, + module, + ) + except (AttributeError, IndexError): + pass + try: + if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if len(annotation.__args__) > 1: # pyright: ignore + entry_deserializers = [ + _get_deserialize_callable_from_annotation(dt, module, rf) + for dt in annotation.__args__ # pyright: ignore + ] + return functools.partial(_deserialize_multiple_sequence, entry_deserializers, module) + deserializer = _get_deserialize_callable_from_annotation( + annotation.__args__[0], module, rf # pyright: ignore + ) + + return functools.partial(_deserialize_sequence, deserializer, module) + except (TypeError, IndexError, AttributeError, SyntaxError): + pass + + def _deserialize_default( + deserializer, + obj, + ): + if obj is None: + return obj + try: + return _deserialize_with_callable(deserializer, obj) + except Exception: + pass + return obj + + if get_deserializer(annotation, rf): + return functools.partial(_deserialize_default, get_deserializer(annotation, rf)) + + return functools.partial(_deserialize_default, annotation) + + +def _deserialize_with_callable( + deserializer: typing.Optional[typing.Callable[[typing.Any], typing.Any]], + value: typing.Any, +): # pylint: disable=too-many-return-statements + try: + if value is None or isinstance(value, _Null): + return None + if isinstance(value, ET.Element): + if deserializer is str: + return value.text or "" + if deserializer is int: + return int(value.text) if value.text else None + if deserializer is float: + return float(value.text) if value.text else None + if deserializer is bool: + return value.text == "true" if value.text else None + if deserializer is None: + return value + if deserializer in [int, float, bool]: + return deserializer(value) + if isinstance(deserializer, CaseInsensitiveEnumMeta): + try: + return deserializer(value) + except ValueError: + # for unknown value, return raw value + return value + if isinstance(deserializer, type) and issubclass(deserializer, Model): + return deserializer._deserialize(value, []) + return typing.cast(typing.Callable[[typing.Any], typing.Any], deserializer)(value) + except Exception as e: + raise DeserializationError() from e + + +def _deserialize( + deserializer: typing.Any, + value: typing.Any, + module: typing.Optional[str] = None, + rf: typing.Optional["_RestField"] = None, + format: typing.Optional[str] = None, +) -> typing.Any: + if isinstance(value, PipelineResponse): + value = value.http_response.json() + if rf is None and format: + rf = _RestField(format=format) + if not isinstance(deserializer, functools.partial): + deserializer = _get_deserialize_callable_from_annotation(deserializer, module, rf) + return _deserialize_with_callable(deserializer, value) + + +def _failsafe_deserialize( + deserializer: typing.Any, + value: typing.Any, + module: typing.Optional[str] = None, + rf: typing.Optional["_RestField"] = None, + format: typing.Optional[str] = None, +) -> typing.Any: + try: + return _deserialize(deserializer, value, module, rf, format) + except DeserializationError: + _LOGGER.warning( + "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True + ) + return None + + +def _failsafe_deserialize_xml( + deserializer: typing.Any, + value: typing.Any, +) -> typing.Any: + try: + return _deserialize_xml(deserializer, value) + except DeserializationError: + _LOGGER.warning( + "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True + ) + return None + + +class _RestField: + def __init__( + self, + *, + name: typing.Optional[str] = None, + type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin + is_discriminator: bool = False, + visibility: typing.Optional[typing.List[str]] = None, + default: typing.Any = _UNSET, + format: typing.Optional[str] = None, + is_multipart_file_input: bool = False, + xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + ): + self._type = type + self._rest_name_input = name + self._module: typing.Optional[str] = None + self._is_discriminator = is_discriminator + self._visibility = visibility + self._is_model = False + self._default = default + self._format = format + self._is_multipart_file_input = is_multipart_file_input + self._xml = xml if xml is not None else {} + + @property + def _class_type(self) -> typing.Any: + return getattr(self._type, "args", [None])[0] + + @property + def _rest_name(self) -> str: + if self._rest_name_input is None: + raise ValueError("Rest name was never set") + return self._rest_name_input + + def __get__(self, obj: Model, type=None): # pylint: disable=redefined-builtin + # by this point, type and rest_name will have a value bc we default + # them in __new__ of the Model class + item = obj.get(self._rest_name) + if item is None: + return item + if self._is_model: + return item + return _deserialize(self._type, _serialize(item, self._format), rf=self) + + def __set__(self, obj: Model, value) -> None: + if value is None: + # we want to wipe out entries if users set attr to None + try: + obj.__delitem__(self._rest_name) + except KeyError: + pass + return + if self._is_model: + if not _is_model(value): + value = _deserialize(self._type, value) + obj.__setitem__(self._rest_name, value) + return + obj.__setitem__(self._rest_name, _serialize(value, self._format)) + + def _get_deserialize_callable_from_annotation( + self, annotation: typing.Any + ) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]: + return _get_deserialize_callable_from_annotation(annotation, self._module, self) + + +def rest_field( + *, + name: typing.Optional[str] = None, + type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin + visibility: typing.Optional[typing.List[str]] = None, + default: typing.Any = _UNSET, + format: typing.Optional[str] = None, + is_multipart_file_input: bool = False, + xml: typing.Optional[typing.Dict[str, typing.Any]] = None, +) -> typing.Any: + return _RestField( + name=name, + type=type, + visibility=visibility, + default=default, + format=format, + is_multipart_file_input=is_multipart_file_input, + xml=xml, + ) + + +def rest_discriminator( + *, + name: typing.Optional[str] = None, + type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin + visibility: typing.Optional[typing.List[str]] = None, + xml: typing.Optional[typing.Dict[str, typing.Any]] = None, +) -> typing.Any: + return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) + + +def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: + """Serialize a model to XML. + + :param Model model: The model to serialize. + :param bool exclude_readonly: Whether to exclude readonly properties. + :returns: The XML representation of the model. + :rtype: str + """ + return ET.tostring(_get_element(model, exclude_readonly), encoding="unicode") # type: ignore + + +def _get_element( + o: typing.Any, + exclude_readonly: bool = False, + parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + wrapped_element: typing.Optional[ET.Element] = None, +) -> typing.Union[ET.Element, typing.List[ET.Element]]: + if _is_model(o): + model_meta = getattr(o, "_xml", {}) + + # if prop is a model, then use the prop element directly, else generate a wrapper of model + if wrapped_element is None: + wrapped_element = _create_xml_element( + model_meta.get("name", o.__class__.__name__), + model_meta.get("prefix"), + model_meta.get("ns"), + ) + + readonly_props = [] + if exclude_readonly: + readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)] + + for k, v in o.items(): + # do not serialize readonly properties + if exclude_readonly and k in readonly_props: + continue + + prop_rest_field = _get_rest_field(o._attr_to_rest_field, k) + if prop_rest_field: + prop_meta = getattr(prop_rest_field, "_xml").copy() + # use the wire name as xml name if no specific name is set + if prop_meta.get("name") is None: + prop_meta["name"] = k + else: + # additional properties will not have rest field, use the wire name as xml name + prop_meta = {"name": k} + + # if no ns for prop, use model's + if prop_meta.get("ns") is None and model_meta.get("ns"): + prop_meta["ns"] = model_meta.get("ns") + prop_meta["prefix"] = model_meta.get("prefix") + + if prop_meta.get("unwrapped", False): + # unwrapped could only set on array + wrapped_element.extend(_get_element(v, exclude_readonly, prop_meta)) + elif prop_meta.get("text", False): + # text could only set on primitive type + wrapped_element.text = _get_primitive_type_value(v) + elif prop_meta.get("attribute", False): + xml_name = prop_meta.get("name", k) + if prop_meta.get("ns"): + ET.register_namespace(prop_meta.get("prefix"), prop_meta.get("ns")) # pyright: ignore + xml_name = "{" + prop_meta.get("ns") + "}" + xml_name # pyright: ignore + # attribute should be primitive type + wrapped_element.set(xml_name, _get_primitive_type_value(v)) + else: + # other wrapped prop element + wrapped_element.append(_get_wrapped_element(v, exclude_readonly, prop_meta)) + return wrapped_element + if isinstance(o, list): + return [_get_element(x, exclude_readonly, parent_meta) for x in o] # type: ignore + if isinstance(o, dict): + result = [] + for k, v in o.items(): + result.append( + _get_wrapped_element( + v, + exclude_readonly, + { + "name": k, + "ns": parent_meta.get("ns") if parent_meta else None, + "prefix": parent_meta.get("prefix") if parent_meta else None, + }, + ) + ) + return result + + # primitive case need to create element based on parent_meta + if parent_meta: + return _get_wrapped_element( + o, + exclude_readonly, + { + "name": parent_meta.get("itemsName", parent_meta.get("name")), + "prefix": parent_meta.get("itemsPrefix", parent_meta.get("prefix")), + "ns": parent_meta.get("itemsNs", parent_meta.get("ns")), + }, + ) + + raise ValueError("Could not serialize value into xml: " + o) + + +def _get_wrapped_element( + v: typing.Any, + exclude_readonly: bool, + meta: typing.Optional[typing.Dict[str, typing.Any]], +) -> ET.Element: + wrapped_element = _create_xml_element( + meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None + ) + if isinstance(v, (dict, list)): + wrapped_element.extend(_get_element(v, exclude_readonly, meta)) + elif _is_model(v): + _get_element(v, exclude_readonly, meta, wrapped_element) + else: + wrapped_element.text = _get_primitive_type_value(v) + return wrapped_element + + +def _get_primitive_type_value(v) -> str: + if v is True: + return "true" + if v is False: + return "false" + if isinstance(v, _Null): + return "" + return str(v) + + +def _create_xml_element(tag, prefix=None, ns=None): + if prefix and ns: + ET.register_namespace(prefix, ns) + if ns: + return ET.Element("{" + ns + "}" + tag) + return ET.Element(tag) + + +def _deserialize_xml( + deserializer: typing.Any, + value: str, +) -> typing.Any: + element = ET.fromstring(value) # nosec + return _deserialize(deserializer, element) + + +def _convert_element(e: ET.Element): + # dict case + if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: + dict_result: typing.Dict[str, typing.Any] = {} + for child in e: + if dict_result.get(child.tag) is not None: + if isinstance(dict_result[child.tag], list): + dict_result[child.tag].append(_convert_element(child)) + else: + dict_result[child.tag] = [dict_result[child.tag], _convert_element(child)] + else: + dict_result[child.tag] = _convert_element(child) + dict_result.update(e.attrib) + return dict_result + # array case + if len(e) > 0: + array_result: typing.List[typing.Any] = [] + for child in e: + array_result.append(_convert_element(child)) + return array_result + # primitive case + return e.text 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/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/serialization.py new file mode 100644 index 00000000000..eb86ea23c96 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/serialization.py @@ -0,0 +1,2032 @@ +# pylint: disable=line-too-long,useless-suppression,too-many-lines +# 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. +# -------------------------------------------------------------------------- + +# pyright: reportUnnecessaryTypeIgnoreComment=false + +from base64 import b64decode, b64encode +import calendar +import datetime +import decimal +import email +from enum import Enum +import json +import logging +import re +import sys +import codecs +from typing import ( + Dict, + Any, + cast, + Optional, + Union, + AnyStr, + IO, + Mapping, + Callable, + MutableMapping, + List, +) + +try: + from urllib import quote # type: ignore +except ImportError: + from urllib.parse import quote +import xml.etree.ElementTree as ET + +import isodate # type: ignore +from typing_extensions import Self + +from azure.core.exceptions import DeserializationError, SerializationError +from azure.core.serialization import NULL as CoreNull + +_BOM = codecs.BOM_UTF8.decode(encoding="utf-8") + +JSON = MutableMapping[str, Any] + + +class RawDeserializer: + + # Accept "text" because we're open minded people... + JSON_REGEXP = re.compile(r"^(application|text)/([a-z+.]+\+)?json$") + + # Name used in context + CONTEXT_NAME = "deserialized_data" + + @classmethod + def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type: Optional[str] = None) -> Any: + """Decode data according to content-type. + + Accept a stream of data as well, but will be load at once in memory for now. + + If no content-type, will return the string version (not bytes, not stream) + + :param data: Input, could be bytes or stream (will be decoded with UTF8) or text + :type data: str or bytes or IO + :param str content_type: The content type. + :return: The deserialized data. + :rtype: object + """ + if hasattr(data, "read"): + # Assume a stream + data = cast(IO, data).read() + + if isinstance(data, bytes): + data_as_str = data.decode(encoding="utf-8-sig") + else: + # Explain to mypy the correct type. + data_as_str = cast(str, data) + + # Remove Byte Order Mark if present in string + data_as_str = data_as_str.lstrip(_BOM) + + if content_type is None: + return data + + if cls.JSON_REGEXP.match(content_type): + try: + return json.loads(data_as_str) + except ValueError as err: + raise DeserializationError("JSON is invalid: {}".format(err), err) from err + elif "xml" in (content_type or []): + try: + + try: + if isinstance(data, unicode): # type: ignore + # If I'm Python 2.7 and unicode XML will scream if I try a "fromstring" on unicode string + data_as_str = data_as_str.encode(encoding="utf-8") # type: ignore + except NameError: + pass + + return ET.fromstring(data_as_str) # nosec + except ET.ParseError as err: + # It might be because the server has an issue, and returned JSON with + # content-type XML.... + # So let's try a JSON load, and if it's still broken + # let's flow the initial exception + def _json_attemp(data): + try: + return True, json.loads(data) + except ValueError: + return False, None # Don't care about this one + + success, json_result = _json_attemp(data) + if success: + return json_result + # If i'm here, it's not JSON, it's not XML, let's scream + # and raise the last context in this block (the XML exception) + # The function hack is because Py2.7 messes up with exception + # context otherwise. + _LOGGER.critical("Wasn't XML not JSON, failing") + raise DeserializationError("XML is invalid") from err + elif content_type.startswith("text/"): + return data_as_str + raise DeserializationError("Cannot deserialize content-type: {}".format(content_type)) + + @classmethod + def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], headers: Mapping) -> Any: + """Deserialize from HTTP response. + + Use bytes and headers to NOT use any requests/aiohttp or whatever + specific implementation. + Headers will tested for "content-type" + + :param bytes body_bytes: The body of the response. + :param dict headers: The headers of the response. + :returns: The deserialized data. + :rtype: object + """ + # Try to use content-type from headers if available + content_type = None + if "content-type" in headers: + content_type = headers["content-type"].split(";")[0].strip().lower() + # Ouch, this server did not declare what it sent... + # Let's guess it's JSON... + # Also, since Autorest was considering that an empty body was a valid JSON, + # need that test as well.... + else: + content_type = "application/json" + + if body_bytes: + return cls.deserialize_from_text(body_bytes, content_type) + return None + + +_LOGGER = logging.getLogger(__name__) + +try: + _long_type = long # type: ignore +except NameError: + _long_type = int + +TZ_UTC = datetime.timezone.utc + +_FLATTEN = re.compile(r"(? None: + self.additional_properties: Optional[Dict[str, Any]] = {} + for k in kwargs: # pylint: disable=consider-using-dict-items + if k not in self._attribute_map: + _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) + elif k in self._validation and self._validation[k].get("readonly", False): + _LOGGER.warning("Readonly attribute %s will be ignored in class %s", k, self.__class__) + else: + setattr(self, k, kwargs[k]) + + def __eq__(self, other: Any) -> bool: + """Compare objects by comparing all attributes. + + :param object other: The object to compare + :returns: True if objects are equal + :rtype: bool + """ + if isinstance(other, self.__class__): + return self.__dict__ == other.__dict__ + return False + + def __ne__(self, other: Any) -> bool: + """Compare objects by comparing all attributes. + + :param object other: The object to compare + :returns: True if objects are not equal + :rtype: bool + """ + return not self.__eq__(other) + + def __str__(self) -> str: + return str(self.__dict__) + + @classmethod + def enable_additional_properties_sending(cls) -> None: + cls._attribute_map["additional_properties"] = {"key": "", "type": "{object}"} + + @classmethod + def is_xml_model(cls) -> bool: + try: + cls._xml_map # type: ignore + except AttributeError: + return False + return True + + @classmethod + def _create_xml_node(cls): + """Create XML node. + + :returns: The XML node + :rtype: xml.etree.ElementTree.Element + """ + try: + xml_map = cls._xml_map # type: ignore + except AttributeError: + xml_map = {} + + return _create_xml_node(xml_map.get("name", cls.__name__), xml_map.get("prefix", None), xml_map.get("ns", None)) + + def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: + """Return the JSON that would be sent to server from this model. + + This is an alias to `as_dict(full_restapi_key_transformer, keep_readonly=False)`. + + If you want XML serialization, you can pass the kwargs is_xml=True. + + :param bool keep_readonly: If you want to serialize the readonly attributes + :returns: A dict JSON compatible object + :rtype: dict + """ + serializer = Serializer(self._infer_class_models()) + return serializer._serialize( # type: ignore # pylint: disable=protected-access + self, keep_readonly=keep_readonly, **kwargs + ) + + def as_dict( + self, + keep_readonly: bool = True, + key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + **kwargs: Any + ) -> JSON: + """Return a dict that can be serialized using json.dump. + + Advanced usage might optionally use a callback as parameter: + + .. code::python + + def my_key_transformer(key, attr_desc, value): + return key + + Key is the attribute name used in Python. Attr_desc + is a dict of metadata. Currently contains 'type' with the + msrest type and 'key' with the RestAPI encoded key. + Value is the current value in this object. + + The string returned will be used to serialize the key. + If the return type is a list, this is considered hierarchical + result dict. + + See the three examples in this file: + + - attribute_transformer + - full_restapi_key_transformer + - last_restapi_key_transformer + + If you want XML serialization, you can pass the kwargs is_xml=True. + + :param bool keep_readonly: If you want to serialize the readonly attributes + :param function key_transformer: A key transformer function. + :returns: A dict JSON compatible object + :rtype: dict + """ + serializer = Serializer(self._infer_class_models()) + return serializer._serialize( # type: ignore # pylint: disable=protected-access + self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs + ) + + @classmethod + def _infer_class_models(cls): + try: + str_models = cls.__module__.rsplit(".", 1)[0] + models = sys.modules[str_models] + client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} + if cls.__name__ not in client_models: + raise ValueError("Not Autorest generated code") + except Exception: # pylint: disable=broad-exception-caught + # Assume it's not Autorest generated (tests?). Add ourselves as dependencies. + client_models = {cls.__name__: cls} + return client_models + + @classmethod + def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: + """Parse a str using the RestAPI syntax and return a model. + + :param str data: A str using RestAPI structure. JSON by default. + :param str content_type: JSON by default, set application/xml if XML. + :returns: An instance of this model + :raises DeserializationError: if something went wrong + :rtype: Self + """ + deserializer = Deserializer(cls._infer_class_models()) + return deserializer(cls.__name__, data, content_type=content_type) # type: ignore + + @classmethod + def from_dict( + cls, + data: Any, + key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + content_type: Optional[str] = None, + ) -> Self: + """Parse a dict using given key extractor return a model. + + By default consider key + extractors (rest_key_case_insensitive_extractor, attribute_key_case_insensitive_extractor + and last_rest_key_case_insensitive_extractor) + + :param dict data: A dict using RestAPI structure + :param function key_extractors: A key extractor function. + :param str content_type: JSON by default, set application/xml if XML. + :returns: An instance of this model + :raises DeserializationError: if something went wrong + :rtype: Self + """ + deserializer = Deserializer(cls._infer_class_models()) + deserializer.key_extractors = ( # type: ignore + [ # type: ignore + attribute_key_case_insensitive_extractor, + rest_key_case_insensitive_extractor, + last_rest_key_case_insensitive_extractor, + ] + if key_extractors is None + else key_extractors + ) + return deserializer(cls.__name__, data, content_type=content_type) # type: ignore + + @classmethod + def _flatten_subtype(cls, key, objects): + if "_subtype_map" not in cls.__dict__: + return {} + result = dict(cls._subtype_map[key]) + for valuetype in cls._subtype_map[key].values(): + result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + return result + + @classmethod + def _classify(cls, response, objects): + """Check the class _subtype_map for any child classes. + We want to ignore any inherited _subtype_maps. + + :param dict response: The initial data + :param dict objects: The class objects + :returns: The class to be used + :rtype: class + """ + for subtype_key in cls.__dict__.get("_subtype_map", {}).keys(): + subtype_value = None + + if not isinstance(response, ET.Element): + rest_api_response_key = cls._get_rest_key_parts(subtype_key)[-1] + subtype_value = response.get(rest_api_response_key, None) or response.get(subtype_key, None) + else: + subtype_value = xml_key_extractor(subtype_key, cls._attribute_map[subtype_key], response) + if subtype_value: + # Try to match base class. Can be class name only + # (bug to fix in Autorest to support x-ms-discriminator-name) + if cls.__name__ == subtype_value: + return cls + flatten_mapping_type = cls._flatten_subtype(subtype_key, objects) + try: + return objects[flatten_mapping_type[subtype_value]] # type: ignore + except KeyError: + _LOGGER.warning( + "Subtype value %s has no mapping, use base class %s.", + subtype_value, + cls.__name__, + ) + break + else: + _LOGGER.warning("Discriminator %s is absent or null, use base class %s.", subtype_key, cls.__name__) + break + return cls + + @classmethod + def _get_rest_key_parts(cls, attr_key): + """Get the RestAPI key of this attr, split it and decode part + :param str attr_key: Attribute key must be in attribute_map. + :returns: A list of RestAPI part + :rtype: list + """ + rest_split_key = _FLATTEN.split(cls._attribute_map[attr_key]["key"]) + return [_decode_attribute_map_key(key_part) for key_part in rest_split_key] + + +def _decode_attribute_map_key(key): + """This decode a key in an _attribute_map to the actual key we want to look at + inside the received data. + + :param str key: A key string from the generated code + :returns: The decoded key + :rtype: str + """ + return key.replace("\\.", ".") + + +class Serializer: # pylint: disable=too-many-public-methods + """Request object model serializer.""" + + basic_types = {str: "str", int: "int", bool: "bool", float: "float"} + + _xml_basic_types_serializers = {"bool": lambda x: str(x).lower()} + days = {0: "Mon", 1: "Tue", 2: "Wed", 3: "Thu", 4: "Fri", 5: "Sat", 6: "Sun"} + months = { + 1: "Jan", + 2: "Feb", + 3: "Mar", + 4: "Apr", + 5: "May", + 6: "Jun", + 7: "Jul", + 8: "Aug", + 9: "Sep", + 10: "Oct", + 11: "Nov", + 12: "Dec", + } + validation = { + "min_length": lambda x, y: len(x) < y, + "max_length": lambda x, y: len(x) > y, + "minimum": lambda x, y: x < y, + "maximum": lambda x, y: x > y, + "minimum_ex": lambda x, y: x <= y, + "maximum_ex": lambda x, y: x >= y, + "min_items": lambda x, y: len(x) < y, + "max_items": lambda x, y: len(x) > y, + "pattern": lambda x, y: not re.match(y, x, re.UNICODE), + "unique": lambda x, y: len(x) != len(set(x)), + "multiple": lambda x, y: x % y != 0, + } + + def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: + self.serialize_type = { + "iso-8601": Serializer.serialize_iso, + "rfc-1123": Serializer.serialize_rfc, + "unix-time": Serializer.serialize_unix, + "duration": Serializer.serialize_duration, + "date": Serializer.serialize_date, + "time": Serializer.serialize_time, + "decimal": Serializer.serialize_decimal, + "long": Serializer.serialize_long, + "bytearray": Serializer.serialize_bytearray, + "base64": Serializer.serialize_base64, + "object": self.serialize_object, + "[]": self.serialize_iter, + "{}": self.serialize_dict, + } + self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.key_transformer = full_restapi_key_transformer + self.client_side_validation = True + + def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, too-many-statements, too-many-locals + self, target_obj, data_type=None, **kwargs + ): + """Serialize data into a string according to type. + + :param object target_obj: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str, dict + :raises SerializationError: if serialization fails. + :returns: The serialized data. + """ + key_transformer = kwargs.get("key_transformer", self.key_transformer) + keep_readonly = kwargs.get("keep_readonly", False) + if target_obj is None: + return None + + attr_name = None + class_name = target_obj.__class__.__name__ + + if data_type: + return self.serialize_data(target_obj, data_type, **kwargs) + + if not hasattr(target_obj, "_attribute_map"): + data_type = type(target_obj).__name__ + if data_type in self.basic_types.values(): + return self.serialize_data(target_obj, data_type, **kwargs) + + # Force "is_xml" kwargs if we detect a XML model + try: + is_xml_model_serialization = kwargs["is_xml"] + except KeyError: + is_xml_model_serialization = kwargs.setdefault("is_xml", target_obj.is_xml_model()) + + serialized = {} + if is_xml_model_serialization: + serialized = target_obj._create_xml_node() # pylint: disable=protected-access + try: + attributes = target_obj._attribute_map # pylint: disable=protected-access + for attr, attr_desc in attributes.items(): + attr_name = attr + if not keep_readonly and target_obj._validation.get( # pylint: disable=protected-access + attr_name, {} + ).get("readonly", False): + continue + + if attr_name == "additional_properties" and attr_desc["key"] == "": + if target_obj.additional_properties is not None: + serialized.update(target_obj.additional_properties) + continue + try: + + orig_attr = getattr(target_obj, attr) + if is_xml_model_serialization: + pass # Don't provide "transformer" for XML for now. Keep "orig_attr" + else: # JSON + keys, orig_attr = key_transformer(attr, attr_desc.copy(), orig_attr) + keys = keys if isinstance(keys, list) else [keys] + + kwargs["serialization_ctxt"] = attr_desc + new_attr = self.serialize_data(orig_attr, attr_desc["type"], **kwargs) + + if is_xml_model_serialization: + xml_desc = attr_desc.get("xml", {}) + xml_name = xml_desc.get("name", attr_desc["key"]) + xml_prefix = xml_desc.get("prefix", None) + xml_ns = xml_desc.get("ns", None) + if xml_desc.get("attr", False): + if xml_ns: + ET.register_namespace(xml_prefix, xml_ns) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) + serialized.set(xml_name, new_attr) # type: ignore + continue + if xml_desc.get("text", False): + serialized.text = new_attr # type: ignore + continue + if isinstance(new_attr, list): + serialized.extend(new_attr) # type: ignore + elif isinstance(new_attr, ET.Element): + # If the down XML has no XML/Name, + # we MUST replace the tag with the local tag. But keeping the namespaces. + if "name" not in getattr(orig_attr, "_xml_map", {}): + splitted_tag = new_attr.tag.split("}") + if len(splitted_tag) == 2: # Namespace + new_attr.tag = "}".join([splitted_tag[0], xml_name]) + else: + new_attr.tag = xml_name + serialized.append(new_attr) # type: ignore + else: # That's a basic type + # Integrate namespace if necessary + local_node = _create_xml_node(xml_name, xml_prefix, xml_ns) + local_node.text = str(new_attr) + serialized.append(local_node) # type: ignore + else: # JSON + for k in reversed(keys): # type: ignore + new_attr = {k: new_attr} + + _new_attr = new_attr + _serialized = serialized + for k in keys: # type: ignore + if k not in _serialized: + _serialized.update(_new_attr) # type: ignore + _new_attr = _new_attr[k] # type: ignore + _serialized = _serialized[k] + except ValueError as err: + if isinstance(err, SerializationError): + raise + + except (AttributeError, KeyError, TypeError) as err: + msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj)) + raise SerializationError(msg) from err + return serialized + + def body(self, data, data_type, **kwargs): + """Serialize data intended for a request body. + + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: dict + :raises SerializationError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized request body + """ + + # Just in case this is a dict + internal_data_type_str = data_type.strip("[]{}") + internal_data_type = self.dependencies.get(internal_data_type_str, None) + try: + is_xml_model_serialization = kwargs["is_xml"] + except KeyError: + if internal_data_type and issubclass(internal_data_type, Model): + is_xml_model_serialization = kwargs.setdefault("is_xml", internal_data_type.is_xml_model()) + else: + is_xml_model_serialization = False + if internal_data_type and not isinstance(internal_data_type, Enum): + try: + deserializer = Deserializer(self.dependencies) + # Since it's on serialization, it's almost sure that format is not JSON REST + # We're not able to deal with additional properties for now. + deserializer.additional_properties_detection = False + if is_xml_model_serialization: + deserializer.key_extractors = [ # type: ignore + attribute_key_case_insensitive_extractor, + ] + else: + deserializer.key_extractors = [ + rest_key_case_insensitive_extractor, + attribute_key_case_insensitive_extractor, + last_rest_key_case_insensitive_extractor, + ] + data = deserializer._deserialize(data_type, data) # pylint: disable=protected-access + except DeserializationError as err: + raise SerializationError("Unable to build a model: " + str(err)) from err + + return self._serialize(data, data_type, **kwargs) + + def url(self, name, data, data_type, **kwargs): + """Serialize data intended for a URL path. + + :param str name: The name of the URL path parameter. + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str + :returns: The serialized URL path + :raises TypeError: if serialization fails. + :raises ValueError: if data is None + """ + try: + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + + if kwargs.get("skip_quote") is True: + output = str(output) + output = output.replace("{", quote("{")).replace("}", quote("}")) + else: + output = quote(str(output), safe="") + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return output + + def query(self, name, data, data_type, **kwargs): + """Serialize data intended for a URL query. + + :param str name: The name of the query parameter. + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str, list + :raises TypeError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized query parameter + """ + try: + # Treat the list aside, since we don't want to encode the div separator + if data_type.startswith("["): + internal_data_type = data_type[1:-1] + do_quote = not kwargs.get("skip_quote", False) + return self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs) + + # Not a list, regular serialization + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + if kwargs.get("skip_quote") is True: + output = str(output) + else: + output = quote(str(output), safe="") + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return str(output) + + def header(self, name, data, data_type, **kwargs): + """Serialize data intended for a request header. + + :param str name: The name of the header. + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str + :raises TypeError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized header + """ + try: + if data_type in ["[str]"]: + data = ["" if d is None else d for d in data] + + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return str(output) + + def serialize_data(self, data, data_type, **kwargs): + """Serialize generic data according to supplied data type. + + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :raises AttributeError: if required data is None. + :raises ValueError: if data is None + :raises SerializationError: if serialization fails. + :returns: The serialized data. + :rtype: str, int, float, bool, dict, list + """ + if data is None: + raise ValueError("No value for given attribute") + + try: + if data is CoreNull: + return None + if data_type in self.basic_types.values(): + return self.serialize_basic(data, data_type, **kwargs) + + if data_type in self.serialize_type: + return self.serialize_type[data_type](data, **kwargs) + + # If dependencies is empty, try with current data class + # It has to be a subclass of Enum anyway + enum_type = self.dependencies.get(data_type, data.__class__) + if issubclass(enum_type, Enum): + return Serializer.serialize_enum(data, enum_obj=enum_type) + + iter_type = data_type[0] + data_type[-1] + if iter_type in self.serialize_type: + return self.serialize_type[iter_type](data, data_type[1:-1], **kwargs) + + except (ValueError, TypeError) as err: + msg = "Unable to serialize value: {!r} as type: {!r}." + raise SerializationError(msg.format(data, data_type)) from err + return self._serialize(data, **kwargs) + + @classmethod + def _get_custom_serializers(cls, data_type, **kwargs): # pylint: disable=inconsistent-return-statements + custom_serializer = kwargs.get("basic_types_serializers", {}).get(data_type) + if custom_serializer: + return custom_serializer + if kwargs.get("is_xml", False): + return cls._xml_basic_types_serializers.get(data_type) + + @classmethod + def serialize_basic(cls, data, data_type, **kwargs): + """Serialize basic builting data type. + Serializes objects to str, int, float or bool. + + Possible kwargs: + - basic_types_serializers dict[str, callable] : If set, use the callable as serializer + - is_xml bool : If set, use xml_basic_types_serializers + + :param obj data: Object to be serialized. + :param str data_type: Type of object in the iterable. + :rtype: str, int, float, bool + :return: serialized object + """ + custom_serializer = cls._get_custom_serializers(data_type, **kwargs) + if custom_serializer: + return custom_serializer(data) + if data_type == "str": + return cls.serialize_unicode(data) + return eval(data_type)(data) # nosec # pylint: disable=eval-used + + @classmethod + def serialize_unicode(cls, data): + """Special handling for serializing unicode strings in Py2. + Encode to UTF-8 if unicode, otherwise handle as a str. + + :param str data: Object to be serialized. + :rtype: str + :return: serialized object + """ + try: # If I received an enum, return its value + return data.value + except AttributeError: + pass + + try: + if isinstance(data, unicode): # type: ignore + # Don't change it, JSON and XML ElementTree are totally able + # to serialize correctly u'' strings + return data + except NameError: + return str(data) + return str(data) + + def serialize_iter(self, data, iter_type, div=None, **kwargs): + """Serialize iterable. + + Supported kwargs: + - serialization_ctxt dict : The current entry of _attribute_map, or same format. + serialization_ctxt['type'] should be same as data_type. + - is_xml bool : If set, serialize as XML + + :param list data: Object to be serialized. + :param str iter_type: Type of object in the iterable. + :param str div: If set, this str will be used to combine the elements + in the iterable into a combined string. Default is 'None'. + Defaults to False. + :rtype: list, str + :return: serialized iterable + """ + if isinstance(data, str): + raise SerializationError("Refuse str type as a valid iter type.") + + serialization_ctxt = kwargs.get("serialization_ctxt", {}) + is_xml = kwargs.get("is_xml", False) + + serialized = [] + for d in data: + try: + serialized.append(self.serialize_data(d, iter_type, **kwargs)) + except ValueError as err: + if isinstance(err, SerializationError): + raise + serialized.append(None) + + if kwargs.get("do_quote", False): + serialized = ["" if s is None else quote(str(s), safe="") for s in serialized] + + if div: + serialized = ["" if s is None else str(s) for s in serialized] + serialized = div.join(serialized) + + if "xml" in serialization_ctxt or is_xml: + # XML serialization is more complicated + xml_desc = serialization_ctxt.get("xml", {}) + xml_name = xml_desc.get("name") + if not xml_name: + xml_name = serialization_ctxt["key"] + + # Create a wrap node if necessary (use the fact that Element and list have "append") + is_wrapped = xml_desc.get("wrapped", False) + node_name = xml_desc.get("itemsName", xml_name) + if is_wrapped: + final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + else: + final_result = [] + # All list elements to "local_node" + for el in serialized: + if isinstance(el, ET.Element): + el_node = el + else: + el_node = _create_xml_node(node_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + if el is not None: # Otherwise it writes "None" :-p + el_node.text = str(el) + final_result.append(el_node) + return final_result + return serialized + + def serialize_dict(self, attr, dict_type, **kwargs): + """Serialize a dictionary of objects. + + :param dict attr: Object to be serialized. + :param str dict_type: Type of object in the dictionary. + :rtype: dict + :return: serialized dictionary + """ + serialization_ctxt = kwargs.get("serialization_ctxt", {}) + serialized = {} + for key, value in attr.items(): + try: + serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs) + except ValueError as err: + if isinstance(err, SerializationError): + raise + serialized[self.serialize_unicode(key)] = None + + if "xml" in serialization_ctxt: + # XML serialization is more complicated + xml_desc = serialization_ctxt["xml"] + xml_name = xml_desc["name"] + + final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + for key, value in serialized.items(): + ET.SubElement(final_result, key).text = value + return final_result + + return serialized + + def serialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements + """Serialize a generic object. + This will be handled as a dictionary. If object passed in is not + a basic type (str, int, float, dict, list) it will simply be + cast to str. + + :param dict attr: Object to be serialized. + :rtype: dict or str + :return: serialized object + """ + if attr is None: + return None + if isinstance(attr, ET.Element): + return attr + obj_type = type(attr) + if obj_type in self.basic_types: + return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs) + if obj_type is _long_type: + return self.serialize_long(attr) + if obj_type is str: + return self.serialize_unicode(attr) + if obj_type is datetime.datetime: + return self.serialize_iso(attr) + if obj_type is datetime.date: + return self.serialize_date(attr) + if obj_type is datetime.time: + return self.serialize_time(attr) + if obj_type is datetime.timedelta: + return self.serialize_duration(attr) + if obj_type is decimal.Decimal: + return self.serialize_decimal(attr) + + # If it's a model or I know this dependency, serialize as a Model + if obj_type in self.dependencies.values() or isinstance(attr, Model): + return self._serialize(attr) + + if obj_type == dict: + serialized = {} + for key, value in attr.items(): + try: + serialized[self.serialize_unicode(key)] = self.serialize_object(value, **kwargs) + except ValueError: + serialized[self.serialize_unicode(key)] = None + return serialized + + if obj_type == list: + serialized = [] + for obj in attr: + try: + serialized.append(self.serialize_object(obj, **kwargs)) + except ValueError: + pass + return serialized + return str(attr) + + @staticmethod + def serialize_enum(attr, enum_obj=None): + try: + result = attr.value + except AttributeError: + result = attr + try: + enum_obj(result) # type: ignore + return result + except ValueError as exc: + for enum_value in enum_obj: # type: ignore + if enum_value.value.lower() == str(attr).lower(): + return enum_value.value + error = "{!r} is not valid value for enum {!r}" + raise SerializationError(error.format(attr, enum_obj)) from exc + + @staticmethod + def serialize_bytearray(attr, **kwargs): # pylint: disable=unused-argument + """Serialize bytearray into base-64 string. + + :param str attr: Object to be serialized. + :rtype: str + :return: serialized base64 + """ + return b64encode(attr).decode() + + @staticmethod + def serialize_base64(attr, **kwargs): # pylint: disable=unused-argument + """Serialize str into base-64 string. + + :param str attr: Object to be serialized. + :rtype: str + :return: serialized base64 + """ + encoded = b64encode(attr).decode("ascii") + return encoded.strip("=").replace("+", "-").replace("/", "_") + + @staticmethod + def serialize_decimal(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Decimal object to float. + + :param decimal attr: Object to be serialized. + :rtype: float + :return: serialized decimal + """ + return float(attr) + + @staticmethod + def serialize_long(attr, **kwargs): # pylint: disable=unused-argument + """Serialize long (Py2) or int (Py3). + + :param int attr: Object to be serialized. + :rtype: int/long + :return: serialized long + """ + return _long_type(attr) + + @staticmethod + def serialize_date(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Date object into ISO-8601 formatted string. + + :param Date attr: Object to be serialized. + :rtype: str + :return: serialized date + """ + if isinstance(attr, str): + attr = isodate.parse_date(attr) + t = "{:04}-{:02}-{:02}".format(attr.year, attr.month, attr.day) + return t + + @staticmethod + def serialize_time(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Time object into ISO-8601 formatted string. + + :param datetime.time attr: Object to be serialized. + :rtype: str + :return: serialized time + """ + if isinstance(attr, str): + attr = isodate.parse_time(attr) + t = "{:02}:{:02}:{:02}".format(attr.hour, attr.minute, attr.second) + if attr.microsecond: + t += ".{:02}".format(attr.microsecond) + return t + + @staticmethod + def serialize_duration(attr, **kwargs): # pylint: disable=unused-argument + """Serialize TimeDelta object into ISO-8601 formatted string. + + :param TimeDelta attr: Object to be serialized. + :rtype: str + :return: serialized duration + """ + if isinstance(attr, str): + attr = isodate.parse_duration(attr) + return isodate.duration_isoformat(attr) + + @staticmethod + def serialize_rfc(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Datetime object into RFC-1123 formatted string. + + :param Datetime attr: Object to be serialized. + :rtype: str + :raises TypeError: if format invalid. + :return: serialized rfc + """ + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + utc = attr.utctimetuple() + except AttributeError as exc: + raise TypeError("RFC1123 object must be valid Datetime object.") from exc + + return "{}, {:02} {} {:04} {:02}:{:02}:{:02} GMT".format( + Serializer.days[utc.tm_wday], + utc.tm_mday, + Serializer.months[utc.tm_mon], + utc.tm_year, + utc.tm_hour, + utc.tm_min, + utc.tm_sec, + ) + + @staticmethod + def serialize_iso(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Datetime object into ISO-8601 formatted string. + + :param Datetime attr: Object to be serialized. + :rtype: str + :raises SerializationError: if format invalid. + :return: serialized iso + """ + if isinstance(attr, str): + attr = isodate.parse_datetime(attr) + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + utc = attr.utctimetuple() + if utc.tm_year > 9999 or utc.tm_year < 1: + raise OverflowError("Hit max or min date") + + microseconds = str(attr.microsecond).rjust(6, "0").rstrip("0").ljust(3, "0") + if microseconds: + microseconds = "." + microseconds + date = "{:04}-{:02}-{:02}T{:02}:{:02}:{:02}".format( + utc.tm_year, utc.tm_mon, utc.tm_mday, utc.tm_hour, utc.tm_min, utc.tm_sec + ) + return date + microseconds + "Z" + except (ValueError, OverflowError) as err: + msg = "Unable to serialize datetime object." + raise SerializationError(msg) from err + except AttributeError as err: + msg = "ISO-8601 object must be valid Datetime object." + raise TypeError(msg) from err + + @staticmethod + def serialize_unix(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Datetime object into IntTime format. + This is represented as seconds. + + :param Datetime attr: Object to be serialized. + :rtype: int + :raises SerializationError: if format invalid + :return: serialied unix + """ + if isinstance(attr, int): + return attr + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + return int(calendar.timegm(attr.utctimetuple())) + except AttributeError as exc: + raise TypeError("Unix time object must be valid Datetime object.") from exc + + +def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument + key = attr_desc["key"] + working_data = data + + while "." in key: + # Need the cast, as for some reasons "split" is typed as list[str | Any] + dict_keys = cast(List[str], _FLATTEN.split(key)) + if len(dict_keys) == 1: + key = _decode_attribute_map_key(dict_keys[0]) + break + working_key = _decode_attribute_map_key(dict_keys[0]) + working_data = working_data.get(working_key, data) + if working_data is None: + # If at any point while following flatten JSON path see None, it means + # that all properties under are None as well + return None + key = ".".join(dict_keys[1:]) + + return working_data.get(key) + + +def rest_key_case_insensitive_extractor( # pylint: disable=unused-argument, inconsistent-return-statements + attr, attr_desc, data +): + key = attr_desc["key"] + working_data = data + + while "." in key: + dict_keys = _FLATTEN.split(key) + if len(dict_keys) == 1: + key = _decode_attribute_map_key(dict_keys[0]) + break + working_key = _decode_attribute_map_key(dict_keys[0]) + working_data = attribute_key_case_insensitive_extractor(working_key, None, working_data) + if working_data is None: + # If at any point while following flatten JSON path see None, it means + # that all properties under are None as well + return None + key = ".".join(dict_keys[1:]) + + if working_data: + return attribute_key_case_insensitive_extractor(key, None, working_data) + + +def last_rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument + """Extract the attribute in "data" based on the last part of the JSON path key. + + :param str attr: The attribute to extract + :param dict attr_desc: The attribute description + :param dict data: The data to extract from + :rtype: object + :returns: The extracted attribute + """ + key = attr_desc["key"] + dict_keys = _FLATTEN.split(key) + return attribute_key_extractor(dict_keys[-1], None, data) + + +def last_rest_key_case_insensitive_extractor(attr, attr_desc, data): # pylint: disable=unused-argument + """Extract the attribute in "data" based on the last part of the JSON path key. + + This is the case insensitive version of "last_rest_key_extractor" + :param str attr: The attribute to extract + :param dict attr_desc: The attribute description + :param dict data: The data to extract from + :rtype: object + :returns: The extracted attribute + """ + key = attr_desc["key"] + dict_keys = _FLATTEN.split(key) + return attribute_key_case_insensitive_extractor(dict_keys[-1], None, data) + + +def attribute_key_extractor(attr, _, data): + return data.get(attr) + + +def attribute_key_case_insensitive_extractor(attr, _, data): + found_key = None + lower_attr = attr.lower() + for key in data: + if lower_attr == key.lower(): + found_key = key + break + + return data.get(found_key) + + +def _extract_name_from_internal_type(internal_type): + """Given an internal type XML description, extract correct XML name with namespace. + + :param dict internal_type: An model type + :rtype: tuple + :returns: A tuple XML name + namespace dict + """ + internal_type_xml_map = getattr(internal_type, "_xml_map", {}) + xml_name = internal_type_xml_map.get("name", internal_type.__name__) + xml_ns = internal_type_xml_map.get("ns", None) + if xml_ns: + xml_name = "{{{}}}{}".format(xml_ns, xml_name) + return xml_name + + +def xml_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument,too-many-return-statements + if isinstance(data, dict): + return None + + # Test if this model is XML ready first + if not isinstance(data, ET.Element): + return None + + xml_desc = attr_desc.get("xml", {}) + xml_name = xml_desc.get("name", attr_desc["key"]) + + # Look for a children + is_iter_type = attr_desc["type"].startswith("[") + is_wrapped = xml_desc.get("wrapped", False) + internal_type = attr_desc.get("internalType", None) + internal_type_xml_map = getattr(internal_type, "_xml_map", {}) + + # Integrate namespace if necessary + xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None)) + if xml_ns: + xml_name = "{{{}}}{}".format(xml_ns, xml_name) + + # If it's an attribute, that's simple + if xml_desc.get("attr", False): + return data.get(xml_name) + + # If it's x-ms-text, that's simple too + if xml_desc.get("text", False): + return data.text + + # Scenario where I take the local name: + # - Wrapped node + # - Internal type is an enum (considered basic types) + # - Internal type has no XML/Name node + if is_wrapped or (internal_type and (issubclass(internal_type, Enum) or "name" not in internal_type_xml_map)): + children = data.findall(xml_name) + # If internal type has a local name and it's not a list, I use that name + elif not is_iter_type and internal_type and "name" in internal_type_xml_map: + xml_name = _extract_name_from_internal_type(internal_type) + children = data.findall(xml_name) + # That's an array + else: + if internal_type: # Complex type, ignore itemsName and use the complex type name + items_name = _extract_name_from_internal_type(internal_type) + else: + items_name = xml_desc.get("itemsName", xml_name) + children = data.findall(items_name) + + if len(children) == 0: + if is_iter_type: + if is_wrapped: + return None # is_wrapped no node, we want None + return [] # not wrapped, assume empty list + return None # Assume it's not there, maybe an optional node. + + # If is_iter_type and not wrapped, return all found children + if is_iter_type: + if not is_wrapped: + return children + # Iter and wrapped, should have found one node only (the wrap one) + if len(children) != 1: + raise DeserializationError( + "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( + xml_name + ) + ) + return list(children[0]) # Might be empty list and that's ok. + + # Here it's not a itertype, we should have found one element only or empty + if len(children) > 1: + raise DeserializationError("Find several XML '{}' where it was not expected".format(xml_name)) + return children[0] + + +class Deserializer: + """Response object model deserializer. + + :param dict classes: Class type dictionary for deserializing complex types. + :ivar list key_extractors: Ordered list of extractors to be used by this deserializer. + """ + + basic_types = {str: "str", int: "int", bool: "bool", float: "float"} + + valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") + + def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: + self.deserialize_type = { + "iso-8601": Deserializer.deserialize_iso, + "rfc-1123": Deserializer.deserialize_rfc, + "unix-time": Deserializer.deserialize_unix, + "duration": Deserializer.deserialize_duration, + "date": Deserializer.deserialize_date, + "time": Deserializer.deserialize_time, + "decimal": Deserializer.deserialize_decimal, + "long": Deserializer.deserialize_long, + "bytearray": Deserializer.deserialize_bytearray, + "base64": Deserializer.deserialize_base64, + "object": self.deserialize_object, + "[]": self.deserialize_iter, + "{}": self.deserialize_dict, + } + self.deserialize_expected_types = { + "duration": (isodate.Duration, datetime.timedelta), + "iso-8601": (datetime.datetime), + } + self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.key_extractors = [rest_key_extractor, xml_key_extractor] + # Additional properties only works if the "rest_key_extractor" is used to + # extract the keys. Making it to work whatever the key extractor is too much + # complicated, with no real scenario for now. + # So adding a flag to disable additional properties detection. This flag should be + # used if your expect the deserialization to NOT come from a JSON REST syntax. + # Otherwise, result are unexpected + self.additional_properties_detection = True + + def __call__(self, target_obj, response_data, content_type=None): + """Call the deserializer to process a REST response. + + :param str target_obj: Target data type to deserialize to. + :param requests.Response response_data: REST response object. + :param str content_type: Swagger "produces" if available. + :raises DeserializationError: if deserialization fails. + :return: Deserialized object. + :rtype: object + """ + data = self._unpack_content(response_data, content_type) + return self._deserialize(target_obj, data) + + def _deserialize(self, target_obj, data): # pylint: disable=inconsistent-return-statements + """Call the deserializer on a model. + + Data needs to be already deserialized as JSON or XML ElementTree + + :param str target_obj: Target data type to deserialize to. + :param object data: Object to deserialize. + :raises DeserializationError: if deserialization fails. + :return: Deserialized object. + :rtype: object + """ + # This is already a model, go recursive just in case + if hasattr(data, "_attribute_map"): + constants = [name for name, config in getattr(data, "_validation", {}).items() if config.get("constant")] + try: + for attr, mapconfig in data._attribute_map.items(): # pylint: disable=protected-access + if attr in constants: + continue + value = getattr(data, attr) + if value is None: + continue + local_type = mapconfig["type"] + internal_data_type = local_type.strip("[]{}") + if internal_data_type not in self.dependencies or isinstance(internal_data_type, Enum): + continue + setattr(data, attr, self._deserialize(local_type, value)) + return data + except AttributeError: + return + + response, class_name = self._classify_target(target_obj, data) + + if isinstance(response, str): + return self.deserialize_data(data, response) + if isinstance(response, type) and issubclass(response, Enum): + return self.deserialize_enum(data, response) + + if data is None or data is CoreNull: + return data + try: + attributes = response._attribute_map # type: ignore # pylint: disable=protected-access + d_attrs = {} + for attr, attr_desc in attributes.items(): + # Check empty string. If it's not empty, someone has a real "additionalProperties"... + if attr == "additional_properties" and attr_desc["key"] == "": + continue + raw_value = None + # Enhance attr_desc with some dynamic data + attr_desc = attr_desc.copy() # Do a copy, do not change the real one + internal_data_type = attr_desc["type"].strip("[]{}") + if internal_data_type in self.dependencies: + attr_desc["internalType"] = self.dependencies[internal_data_type] + + for key_extractor in self.key_extractors: + found_value = key_extractor(attr, attr_desc, data) + if found_value is not None: + if raw_value is not None and raw_value != found_value: + msg = ( + "Ignoring extracted value '%s' from %s for key '%s'" + " (duplicate extraction, follow extractors order)" + ) + _LOGGER.warning(msg, found_value, key_extractor, attr) + continue + raw_value = found_value + + value = self.deserialize_data(raw_value, attr_desc["type"]) + d_attrs[attr] = value + except (AttributeError, TypeError, KeyError) as err: + msg = "Unable to deserialize to object: " + class_name # type: ignore + raise DeserializationError(msg) from err + additional_properties = self._build_additional_properties(attributes, data) + return self._instantiate_model(response, d_attrs, additional_properties) + + def _build_additional_properties(self, attribute_map, data): + if not self.additional_properties_detection: + return None + if "additional_properties" in attribute_map and attribute_map.get("additional_properties", {}).get("key") != "": + # Check empty string. If it's not empty, someone has a real "additionalProperties" + return None + if isinstance(data, ET.Element): + data = {el.tag: el.text for el in data} + + known_keys = { + _decode_attribute_map_key(_FLATTEN.split(desc["key"])[0]) + for desc in attribute_map.values() + if desc["key"] != "" + } + present_keys = set(data.keys()) + missing_keys = present_keys - known_keys + return {key: data[key] for key in missing_keys} + + def _classify_target(self, target, data): + """Check to see whether the deserialization target object can + be classified into a subclass. + Once classification has been determined, initialize object. + + :param str target: The target object type to deserialize to. + :param str/dict data: The response data to deserialize. + :return: The classified target object and its class name. + :rtype: tuple + """ + if target is None: + return None, None + + if isinstance(target, str): + try: + target = self.dependencies[target] + except KeyError: + return target, target + + try: + target = target._classify(data, self.dependencies) # type: ignore # pylint: disable=protected-access + except AttributeError: + pass # Target is not a Model, no classify + return target, target.__class__.__name__ # type: ignore + + def failsafe_deserialize(self, target_obj, data, content_type=None): + """Ignores any errors encountered in deserialization, + and falls back to not deserializing the object. Recommended + for use in error deserialization, as we want to return the + HttpResponseError to users, and not have them deal with + a deserialization error. + + :param str target_obj: The target object type to deserialize to. + :param str/dict data: The response data to deserialize. + :param str content_type: Swagger "produces" if available. + :return: Deserialized object. + :rtype: object + """ + try: + return self(target_obj, data, content_type=content_type) + except: # pylint: disable=bare-except + _LOGGER.debug( + "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True + ) + return None + + @staticmethod + def _unpack_content(raw_data, content_type=None): + """Extract the correct structure for deserialization. + + If raw_data is a PipelineResponse, try to extract the result of RawDeserializer. + if we can't, raise. Your Pipeline should have a RawDeserializer. + + If not a pipeline response and raw_data is bytes or string, use content-type + to decode it. If no content-type, try JSON. + + If raw_data is something else, bypass all logic and return it directly. + + :param obj raw_data: Data to be processed. + :param str content_type: How to parse if raw_data is a string/bytes. + :raises JSONDecodeError: If JSON is requested and parsing is impossible. + :raises UnicodeDecodeError: If bytes is not UTF8 + :rtype: object + :return: Unpacked content. + """ + # Assume this is enough to detect a Pipeline Response without importing it + context = getattr(raw_data, "context", {}) + if context: + if RawDeserializer.CONTEXT_NAME in context: + return context[RawDeserializer.CONTEXT_NAME] + raise ValueError("This pipeline didn't have the RawDeserializer policy; can't deserialize") + + # Assume this is enough to recognize universal_http.ClientResponse without importing it + if hasattr(raw_data, "body"): + return RawDeserializer.deserialize_from_http_generics(raw_data.text(), raw_data.headers) + + # Assume this enough to recognize requests.Response without importing it. + if hasattr(raw_data, "_content_consumed"): + return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers) + + if isinstance(raw_data, (str, bytes)) or hasattr(raw_data, "read"): + return RawDeserializer.deserialize_from_text(raw_data, content_type) # type: ignore + return raw_data + + def _instantiate_model(self, response, attrs, additional_properties=None): + """Instantiate a response model passing in deserialized args. + + :param Response response: The response model class. + :param dict attrs: The deserialized response attributes. + :param dict additional_properties: Additional properties to be set. + :rtype: Response + :return: The instantiated response model. + """ + if callable(response): + subtype = getattr(response, "_subtype_map", {}) + try: + readonly = [ + k + for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore + if v.get("readonly") + ] + const = [ + k + for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore + if v.get("constant") + ] + kwargs = {k: v for k, v in attrs.items() if k not in subtype and k not in readonly + const} + response_obj = response(**kwargs) + for attr in readonly: + setattr(response_obj, attr, attrs.get(attr)) + if additional_properties: + response_obj.additional_properties = additional_properties # type: ignore + return response_obj + except TypeError as err: + msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) # type: ignore + raise DeserializationError(msg + str(err)) from err + else: + try: + for attr, value in attrs.items(): + setattr(response, attr, value) + return response + except Exception as exp: + msg = "Unable to populate response model. " + msg += "Type: {}, Error: {}".format(type(response), exp) + raise DeserializationError(msg) from exp + + def deserialize_data(self, data, data_type): # pylint: disable=too-many-return-statements + """Process data for deserialization according to data type. + + :param str data: The response string to be deserialized. + :param str data_type: The type to deserialize to. + :raises DeserializationError: if deserialization fails. + :return: Deserialized object. + :rtype: object + """ + if data is None: + return data + + try: + if not data_type: + return data + if data_type in self.basic_types.values(): + return self.deserialize_basic(data, data_type) + if data_type in self.deserialize_type: + if isinstance(data, self.deserialize_expected_types.get(data_type, tuple())): + return data + + is_a_text_parsing_type = lambda x: x not in [ # pylint: disable=unnecessary-lambda-assignment + "object", + "[]", + r"{}", + ] + if isinstance(data, ET.Element) and is_a_text_parsing_type(data_type) and not data.text: + return None + data_val = self.deserialize_type[data_type](data) + return data_val + + iter_type = data_type[0] + data_type[-1] + if iter_type in self.deserialize_type: + return self.deserialize_type[iter_type](data, data_type[1:-1]) + + obj_type = self.dependencies[data_type] + if issubclass(obj_type, Enum): + if isinstance(data, ET.Element): + data = data.text + return self.deserialize_enum(data, obj_type) + + except (ValueError, TypeError, AttributeError) as err: + msg = "Unable to deserialize response data." + msg += " Data: {}, {}".format(data, data_type) + raise DeserializationError(msg) from err + return self._deserialize(obj_type, data) + + def deserialize_iter(self, attr, iter_type): + """Deserialize an iterable. + + :param list attr: Iterable to be deserialized. + :param str iter_type: The type of object in the iterable. + :return: Deserialized iterable. + :rtype: list + """ + if attr is None: + return None + if isinstance(attr, ET.Element): # If I receive an element here, get the children + attr = list(attr) + if not isinstance(attr, (list, set)): + raise DeserializationError("Cannot deserialize as [{}] an object of type {}".format(iter_type, type(attr))) + return [self.deserialize_data(a, iter_type) for a in attr] + + def deserialize_dict(self, attr, dict_type): + """Deserialize a dictionary. + + :param dict/list attr: Dictionary to be deserialized. Also accepts + a list of key, value pairs. + :param str dict_type: The object type of the items in the dictionary. + :return: Deserialized dictionary. + :rtype: dict + """ + if isinstance(attr, list): + return {x["key"]: self.deserialize_data(x["value"], dict_type) for x in attr} + + if isinstance(attr, ET.Element): + # Transform value into {"Key": "value"} + attr = {el.tag: el.text for el in attr} + return {k: self.deserialize_data(v, dict_type) for k, v in attr.items()} + + def deserialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements + """Deserialize a generic object. + This will be handled as a dictionary. + + :param dict attr: Dictionary to be deserialized. + :return: Deserialized object. + :rtype: dict + :raises TypeError: if non-builtin datatype encountered. + """ + if attr is None: + return None + if isinstance(attr, ET.Element): + # Do no recurse on XML, just return the tree as-is + return attr + if isinstance(attr, str): + return self.deserialize_basic(attr, "str") + obj_type = type(attr) + if obj_type in self.basic_types: + return self.deserialize_basic(attr, self.basic_types[obj_type]) + if obj_type is _long_type: + return self.deserialize_long(attr) + + if obj_type == dict: + deserialized = {} + for key, value in attr.items(): + try: + deserialized[key] = self.deserialize_object(value, **kwargs) + except ValueError: + deserialized[key] = None + return deserialized + + if obj_type == list: + deserialized = [] + for obj in attr: + try: + deserialized.append(self.deserialize_object(obj, **kwargs)) + except ValueError: + pass + return deserialized + + error = "Cannot deserialize generic object with type: " + raise TypeError(error + str(obj_type)) + + def deserialize_basic(self, attr, data_type): # pylint: disable=too-many-return-statements + """Deserialize basic builtin data type from string. + Will attempt to convert to str, int, float and bool. + This function will also accept '1', '0', 'true' and 'false' as + valid bool values. + + :param str attr: response string to be deserialized. + :param str data_type: deserialization data type. + :return: Deserialized basic type. + :rtype: str, int, float or bool + :raises TypeError: if string format is not valid. + """ + # If we're here, data is supposed to be a basic type. + # If it's still an XML node, take the text + if isinstance(attr, ET.Element): + attr = attr.text + if not attr: + if data_type == "str": + # None or '', node is empty string. + return "" + # None or '', node with a strong type is None. + # Don't try to model "empty bool" or "empty int" + return None + + if data_type == "bool": + if attr in [True, False, 1, 0]: + return bool(attr) + if isinstance(attr, str): + if attr.lower() in ["true", "1"]: + return True + if attr.lower() in ["false", "0"]: + return False + raise TypeError("Invalid boolean value: {}".format(attr)) + + if data_type == "str": + return self.deserialize_unicode(attr) + return eval(data_type)(attr) # nosec # pylint: disable=eval-used + + @staticmethod + def deserialize_unicode(data): + """Preserve unicode objects in Python 2, otherwise return data + as a string. + + :param str data: response string to be deserialized. + :return: Deserialized string. + :rtype: str or unicode + """ + # We might be here because we have an enum modeled as string, + # and we try to deserialize a partial dict with enum inside + if isinstance(data, Enum): + return data + + # Consider this is real string + try: + if isinstance(data, unicode): # type: ignore + return data + except NameError: + return str(data) + return str(data) + + @staticmethod + def deserialize_enum(data, enum_obj): + """Deserialize string into enum object. + + If the string is not a valid enum value it will be returned as-is + and a warning will be logged. + + :param str data: Response string to be deserialized. If this value is + None or invalid it will be returned as-is. + :param Enum enum_obj: Enum object to deserialize to. + :return: Deserialized enum object. + :rtype: Enum + """ + if isinstance(data, enum_obj) or data is None: + return data + if isinstance(data, Enum): + data = data.value + if isinstance(data, int): + # Workaround. We might consider remove it in the future. + try: + return list(enum_obj.__members__.values())[data] + except IndexError as exc: + error = "{!r} is not a valid index for enum {!r}" + raise DeserializationError(error.format(data, enum_obj)) from exc + try: + return enum_obj(str(data)) + except ValueError: + for enum_value in enum_obj: + if enum_value.value.lower() == str(data).lower(): + return enum_value + # We don't fail anymore for unknown value, we deserialize as a string + _LOGGER.warning("Deserializer is not able to find %s as valid enum in %s", data, enum_obj) + return Deserializer.deserialize_unicode(data) + + @staticmethod + def deserialize_bytearray(attr): + """Deserialize string into bytearray. + + :param str attr: response string to be deserialized. + :return: Deserialized bytearray + :rtype: bytearray + :raises TypeError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + return bytearray(b64decode(attr)) # type: ignore + + @staticmethod + def deserialize_base64(attr): + """Deserialize base64 encoded string into string. + + :param str attr: response string to be deserialized. + :return: Deserialized base64 string + :rtype: bytearray + :raises TypeError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore + attr = attr + padding # type: ignore + encoded = attr.replace("-", "+").replace("_", "/") + return b64decode(encoded) + + @staticmethod + def deserialize_decimal(attr): + """Deserialize string into Decimal object. + + :param str attr: response string to be deserialized. + :return: Deserialized decimal + :raises DeserializationError: if string format invalid. + :rtype: decimal + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + return decimal.Decimal(str(attr)) # type: ignore + except decimal.DecimalException as err: + msg = "Invalid decimal {}".format(attr) + raise DeserializationError(msg) from err + + @staticmethod + def deserialize_long(attr): + """Deserialize string into long (Py2) or int (Py3). + + :param str attr: response string to be deserialized. + :return: Deserialized int + :rtype: long or int + :raises ValueError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + return _long_type(attr) # type: ignore + + @staticmethod + def deserialize_duration(attr): + """Deserialize ISO-8601 formatted string into TimeDelta object. + + :param str attr: response string to be deserialized. + :return: Deserialized duration + :rtype: TimeDelta + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + duration = isodate.parse_duration(attr) + except (ValueError, OverflowError, AttributeError) as err: + msg = "Cannot deserialize duration object." + raise DeserializationError(msg) from err + return duration + + @staticmethod + def deserialize_date(attr): + """Deserialize ISO-8601 formatted string into Date object. + + :param str attr: response string to be deserialized. + :return: Deserialized date + :rtype: Date + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore + raise DeserializationError("Date must have only digits and -. Received: %s" % attr) + # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. + return isodate.parse_date(attr, defaultmonth=0, defaultday=0) + + @staticmethod + def deserialize_time(attr): + """Deserialize ISO-8601 formatted string into time object. + + :param str attr: response string to be deserialized. + :return: Deserialized time + :rtype: datetime.time + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore + raise DeserializationError("Date must have only digits and -. Received: %s" % attr) + return isodate.parse_time(attr) + + @staticmethod + def deserialize_rfc(attr): + """Deserialize RFC-1123 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :return: Deserialized RFC datetime + :rtype: Datetime + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + parsed_date = email.utils.parsedate_tz(attr) # type: ignore + date_obj = datetime.datetime( + *parsed_date[:6], tzinfo=datetime.timezone(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60)) + ) + if not date_obj.tzinfo: + date_obj = date_obj.astimezone(tz=TZ_UTC) + except ValueError as err: + msg = "Cannot deserialize to rfc datetime object." + raise DeserializationError(msg) from err + return date_obj + + @staticmethod + def deserialize_iso(attr): + """Deserialize ISO-8601 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :return: Deserialized ISO datetime + :rtype: Datetime + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + attr = attr.upper() # type: ignore + match = Deserializer.valid_date.match(attr) + if not match: + raise ValueError("Invalid datetime string: " + attr) + + check_decimal = attr.split(".") + if len(check_decimal) > 1: + decimal_str = "" + for digit in check_decimal[1]: + if digit.isdigit(): + decimal_str += digit + else: + break + if len(decimal_str) > 6: + attr = attr.replace(decimal_str, decimal_str[0:6]) + + date_obj = isodate.parse_datetime(attr) + test_utc = date_obj.utctimetuple() + if test_utc.tm_year > 9999 or test_utc.tm_year < 1: + raise OverflowError("Hit max or min date") + except (ValueError, OverflowError, AttributeError) as err: + msg = "Cannot deserialize datetime object." + raise DeserializationError(msg) from err + return date_obj + + @staticmethod + def deserialize_unix(attr): + """Serialize Datetime object into IntTime format. + This is represented as seconds. + + :param int attr: Object to be serialized. + :return: Deserialized datetime + :rtype: Datetime + :raises DeserializationError: if format invalid + """ + if isinstance(attr, ET.Element): + attr = int(attr.text) # type: ignore + try: + attr = int(attr) + date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC) + except ValueError as err: + msg = "Cannot deserialize to unix datetime object." + raise DeserializationError(msg) from err + return date_obj 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/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/utils.py new file mode 100644 index 00000000000..35c9c836f85 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/utils.py @@ -0,0 +1,25 @@ +# -------------------------------------------------------------------------- +# 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 abc import ABC +from typing import Generic, TYPE_CHECKING, TypeVar + +if TYPE_CHECKING: + from .serialization import Deserializer, Serializer + + +TClient = TypeVar("TClient") +TConfig = TypeVar("TConfig") + + +class ClientMixinABC(ABC, Generic[TClient, TConfig]): + """DO NOT use this class. It is for internal typing use only.""" + + _client: TClient + _config: TConfig + _serialize: "Serializer" + _deserialize: "Deserializer" 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/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/__init__.py new file mode 100644 index 00000000000..a2bfcc451fb --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/__init__.py @@ -0,0 +1,29 @@ +# 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=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._client import ApiKeyClient # type: ignore + +try: + from ._patch import __all__ as _patch_all + from ._patch import * +except ImportError: + _patch_all = [] +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "ApiKeyClient", +] +__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/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_client.py new file mode 100644 index 00000000000..496661c0e01 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_client.py @@ -0,0 +1,97 @@ +# 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 copy import deepcopy +from typing import Any, Awaitable +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 + + +class ApiKeyClient(_ApiKeyClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Illustrates clients generated with ApiKey authentication. + + :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 + ) -> None: + _endpoint = "{endpoint}" + self._config = ApiKeyClientConfiguration(credential=credential, endpoint=endpoint, **kwargs) + + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + policies.RequestIdPolicy(**kwargs), + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + self._config.redirect_policy, + self._config.retry_policy, + self._config.authentication_policy, + self._config.custom_hook_policy, + self._config.logging_policy, + policies.DistributedTracingPolicy(**kwargs), + policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, + self._config.http_logging_policy, + ] + self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=_endpoint, policies=_policies, **kwargs) + + self._serialize = Serializer() + self._deserialize = Deserializer() + self._serialize.client_side_validation = False + + def send_request( + self, request: HttpRequest, *, stream: bool = False, **kwargs: Any + ) -> Awaitable[AsyncHttpResponse]: + """Runs the network request through the client's chained policies. + + >>> from azure.core.rest import HttpRequest + >>> request = HttpRequest("GET", "https://www.example.org/") + + >>> response = await client.send_request(request) + + + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request + + :param request: The network request you want to make. Required. + :type request: ~azure.core.rest.HttpRequest + :keyword bool stream: Whether the response payload will be streamed. Defaults to False. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~azure.core.rest.AsyncHttpResponse + """ + + request_copy = deepcopy(request) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + + request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + async def close(self) -> None: + await self._client.close() + + async def __aenter__(self) -> Self: + await self._client.__aenter__() + return self + + async def __aexit__(self, *exc_details: Any) -> None: + await self._client.__aexit__(*exc_details) 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/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_configuration.py new file mode 100644 index 00000000000..931c3267987 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_configuration.py @@ -0,0 +1,50 @@ +# 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 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. + + 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.") + + self.credential = credential + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "authentication-api-key-subdir/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) + self._configure(**kwargs) + + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs) + self.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/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/__init__.py new file mode 100644 index 00000000000..90f96a75199 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/__init__.py @@ -0,0 +1,23 @@ +# 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=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._operations import _ApiKeyClientOperationsMixin # type: ignore # pylint: disable=unused-import + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [] +__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/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 new file mode 100644 index 00000000000..52a900f805b --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_operations.py @@ -0,0 +1,128 @@ +# 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/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_patch.py @@ -0,0 +1,21 @@ +# 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. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ 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/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_patch.py @@ -0,0 +1,21 @@ +# 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. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ 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 new file mode 100644 index 00000000000..6735c06e991 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/apiview-properties.json @@ -0,0 +1,10 @@ +{ + "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/generated_tests/conftest.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/conftest.py new file mode 100644 index 00000000000..8082748a92a --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/conftest.py @@ -0,0 +1,35 @@ +# 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. +# -------------------------------------------------------------------------- +import os +import pytest +from dotenv import load_dotenv +from devtools_testutils import ( + test_proxy, + add_general_regex_sanitizer, + add_body_key_sanitizer, + add_header_regex_sanitizer, +) + +load_dotenv() + + +# 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") + + add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]") + add_header_regex_sanitizer(key="Cookie", value="cookie;") + add_body_key_sanitizer(json_path="$..access_token", value="access_token") diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/test_api_key.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/test_api_key.py new file mode 100644 index 00000000000..2916e7b9498 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/test_api_key.py @@ -0,0 +1,31 @@ +# 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. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils import recorded_by_proxy +from testpreparer import ApiKeyClientTestBase, ApiKeyPreparer + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestApiKey(ApiKeyClientTestBase): + @ApiKeyPreparer() + @recorded_by_proxy + def test_valid(self, apikey_endpoint): + client = self.create_client(endpoint=apikey_endpoint) + response = client.valid() + + # please add some check logic here by yourself + # ... + + @ApiKeyPreparer() + @recorded_by_proxy + def test_invalid(self, apikey_endpoint): + client = self.create_client(endpoint=apikey_endpoint) + response = client.invalid() + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/test_api_key_async.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/test_api_key_async.py new file mode 100644 index 00000000000..214be1ee608 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/test_api_key_async.py @@ -0,0 +1,32 @@ +# 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. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils.aio import recorded_by_proxy_async +from testpreparer import ApiKeyPreparer +from testpreparer_async import ApiKeyClientTestBaseAsync + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestApiKeyAsync(ApiKeyClientTestBaseAsync): + @ApiKeyPreparer() + @recorded_by_proxy_async + async def test_valid(self, apikey_endpoint): + client = self.create_async_client(endpoint=apikey_endpoint) + response = await client.valid() + + # please add some check logic here by yourself + # ... + + @ApiKeyPreparer() + @recorded_by_proxy_async + async def test_invalid(self, apikey_endpoint): + client = self.create_async_client(endpoint=apikey_endpoint) + response = await client.invalid() + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/testpreparer.py new file mode 100644 index 00000000000..1b3696072cd --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/testpreparer.py @@ -0,0 +1,24 @@ +# 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 authentication.api.key.subdir import ApiKeyClient +from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer +import functools + + +class ApiKeyClientTestBase(AzureRecordedTestCase): + + def create_client(self, endpoint): + credential = self.get_credential(ApiKeyClient) + return self.create_client_from_credential( + ApiKeyClient, + credential=credential, + endpoint=endpoint, + ) + + +ApiKeyPreparer = functools.partial(PowerShellPreparer, "apikey", apikey_endpoint="https://fake_apikey_endpoint.com") diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/testpreparer_async.py new file mode 100644 index 00000000000..98e4f0a0b12 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/testpreparer_async.py @@ -0,0 +1,20 @@ +# 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 authentication.api.key.subdir.aio import ApiKeyClient +from devtools_testutils import AzureRecordedTestCase + + +class ApiKeyClientTestBaseAsync(AzureRecordedTestCase): + + def create_async_client(self, endpoint): + credential = self.get_credential(ApiKeyClient, is_async=True) + return self.create_client_from_credential( + ApiKeyClient, + credential=credential, + endpoint=endpoint, + ) 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/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/__init__.py new file mode 100644 index 00000000000..afdf5ab4e36 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/__init__.py @@ -0,0 +1,27 @@ +# 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=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + + +from ._models import ( # type: ignore + InvalidAuth, +) +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "InvalidAuth", +] +__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/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 new file mode 100644 index 00000000000..b695706d2dd --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_models.py @@ -0,0 +1,40 @@ +# 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/_generated/models/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_patch.py @@ -0,0 +1,21 @@ +# 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. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_version.py similarity index 54% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/__init__.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_version.py index 40b1309b160..be71c81bd28 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/__init__.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_version.py @@ -1,10 +1,9 @@ -# ------------------------------------------------------------------------- +# 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. +# 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 ._client import CustomizedApiKeyClient -from ._generated.models import InvalidAuth - -__all__ = ["CustomizedApiKeyClient", "InvalidAuth"] +VERSION = "1.0.0b1" diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/py.typed b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/py.typed similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/py.typed rename to packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/py.typed diff --git a/packages/typespec-python/test/azure/requirements.txt b/packages/typespec-python/test/azure/requirements.txt index 67239f6533e..1e326f5caa7 100644 --- a/packages/typespec-python/test/azure/requirements.txt +++ b/packages/typespec-python/test/azure/requirements.txt @@ -38,7 +38,7 @@ azure-mgmt-core==1.6.0 # common test case -e ./generated/authentication-api-key --e ./generated/authentication-api-key-with-subdir +-e ./generated/authentication-api-key-subdir -e ./generated/authentication-http-custom -e ./generated/authentication-oauth2 -e ./generated/authentication-union 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 new file mode 100644 index 00000000000..d55ccad1f57 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/__init__.py @@ -0,0 +1 @@ +__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 new file mode 100644 index 00000000000..d55ccad1f57 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/__init__.py @@ -0,0 +1 @@ +__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 new file mode 100644 index 00000000000..d55ccad1f57 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/__init__.py @@ -0,0 +1 @@ +__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/__init__.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/__init__.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_client.py similarity index 98% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_client.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_client.py index b809f321bd0..39c3789576b 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_client.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_client.py @@ -9,7 +9,7 @@ from corehttp.runtime import PipelineClient, policies from ._configuration import ApiKeyClientConfiguration -from ._operations._operations import _ApiKeyClientOperationsMixin +from ._operations import _ApiKeyClientOperationsMixin from ._utils.serialization import Deserializer, Serializer diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_configuration.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_configuration.py similarity index 98% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_configuration.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_configuration.py index 7055fb9552d..137fcbf6419 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_configuration.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_configuration.py @@ -28,7 +28,7 @@ def __init__( self.credential = credential self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "authentication-api-key-with-subdir/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "authentication-api-key-subdir/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/__init__.py similarity index 79% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/__init__.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/__init__.py index 0d033db47cd..ec7cfa89f78 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/__init__.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/__init__.py @@ -6,6 +6,7 @@ if TYPE_CHECKING: from ._patch import * # pylint: disable=unused-wildcard-import +from ._operations import _ApiKeyClientOperationsMixin # 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/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py similarity index 92% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_operations.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py index c2c0f07f7da..dc89eb01e77 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py @@ -13,7 +13,6 @@ 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 @@ -36,17 +35,10 @@ def build_api_key_valid_request(**kwargs: Any) -> HttpRequest: 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) + return HttpRequest(method="GET", url=_url, **kwargs) class _ApiKeyClientOperationsMixin( diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_patch.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_operations/_patch.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_patch.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_patch.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_patch.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_patch.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_patch.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/__init__.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/__init__.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/model_base.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/model_base.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/serialization.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/serialization.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/serialization.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/serialization.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/utils.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/utils.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/_utils/utils.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/utils.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/__init__.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_client.py similarity index 98% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_client.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_client.py index 028cb9f347e..77cc728a366 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_client.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_client.py @@ -10,7 +10,7 @@ from .._utils.serialization import Deserializer, Serializer from ._configuration import ApiKeyClientConfiguration -from ._operations._operations import _ApiKeyClientOperationsMixin +from ._operations import _ApiKeyClientOperationsMixin class ApiKeyClient(_ApiKeyClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_configuration.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_configuration.py similarity index 98% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_configuration.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_configuration.py index d688ff35fc1..6515d844fb4 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_configuration.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_configuration.py @@ -28,7 +28,7 @@ def __init__( self.credential = credential self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "authentication-api-key-with-subdir/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "authentication-api-key-subdir/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/__init__.py similarity index 79% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/__init__.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/__init__.py index 0d033db47cd..ec7cfa89f78 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/__init__.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/__init__.py @@ -6,6 +6,7 @@ if TYPE_CHECKING: from ._patch import * # pylint: disable=unused-wildcard-import +from ._operations import _ApiKeyClientOperationsMixin # 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/authentication-api-key-with-subdir/authentication/apikey/_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 similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_operations.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_operations.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_patch.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_operations/_patch.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_patch.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_patch.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/aio/_patch.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_patch.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/__init__.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/__init__.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_models.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_models.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_models.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_models.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_patch.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_patch.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_generated/models/_patch.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/models/_patch.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_version.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_version.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_version.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_version.py 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/authentication-api-key-subdir/authentication/api/key/subdir/py.typed new file mode 100644 index 00000000000..e5aff4f83af --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/py.typed @@ -0,0 +1 @@ +# Marker file for PEP 561. \ No newline at end of file diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/CHANGELOG.md b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/CHANGELOG.md deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/MANIFEST.in b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/MANIFEST.in deleted file mode 100644 index 805328d742a..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/MANIFEST.in +++ /dev/null @@ -1,6 +0,0 @@ -include *.md -include LICENSE -include authentication/apikey/py.typed -recursive-include tests *.py -recursive-include samples *.py *.md -include authentication/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/README.md b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/README.md deleted file mode 100644 index 37844352395..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# Overview - -This package is generated by `@typespec/http-client-python` with Typespec. - -## Getting started - -### Prequisites - -- Python 3.9 or later is required to use this package. - -### Install the package - -Step into folder where setup.py is then run: - -```bash -pip install -e . -``` - -### Examples - -```python ->>> from authentication.apikey import ApiKeyClient ->>> from corehttp.exceptions import HttpResponseError - ->>> client = ApiKeyClient(endpoint='') ->>> try: - - except HttpResponseError as e: - print('service responds error: {}'.format(e.response.json())) -``` diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py deleted file mode 100644 index 420231520ea..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/_client.py +++ /dev/null @@ -1,21 +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 ._generated import ApiKeyClient - - -class CustomizedApiKeyClient(ApiKeyClient): - - def custom_method(self) -> str: - """ - A custom method that does something specific. - - :param param1: A string parameter. - :param param2: An integer parameter. - :return: A string result. - """ - # Custom logic here - return "This is a custom method in the subdirectory client." diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py deleted file mode 100644 index 9afa30756f0..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/authentication/apikey/aio/_client.py +++ /dev/null @@ -1,21 +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 .._generated.aio import ApiKeyClient - - -class CustomizedApiKeyClient(ApiKeyClient): - - def custom_method(self) -> str: - """ - A custom method that does something specific. - - :param param1: A string parameter. - :param param2: An integer parameter. - :return: A string result. - """ - # Custom logic here - return "This is a custom method in the subdirectory client." diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/setup.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/setup.py deleted file mode 100644 index f2a51d6a432..00000000000 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key-with-subdir/setup.py +++ /dev/null @@ -1,61 +0,0 @@ -# coding=utf-8 - - -import os -import re -from setuptools import setup, find_packages - - -PACKAGE_NAME = "authentication-api-key-with-subdir" -PACKAGE_PPRINT_NAME = "Authentication Api Key With Subdir" -PACKAGE_NAMESPACE = "authentication.apikey" - -# a.b.c => a/b/c -package_folder_path = PACKAGE_NAMESPACE.replace(".", "/") - -# Version extraction inspired from 'requests' -with open(os.path.join(package_folder_path, "_version.py"), "r") as fd: - version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1) - -if not version: - raise RuntimeError("Cannot find version information") - - -setup( - name=PACKAGE_NAME, - version=version, - description=" {} Client Library for Python".format(PACKAGE_PPRINT_NAME), - long_description=open("README.md", "r").read(), - long_description_content_type="text/markdown", - license="MIT License", - author="", - classifiers=[ - "Development Status :: 4 - Beta", - "Programming Language :: Python", - "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "License :: OSI Approved :: MIT License", - ], - zip_safe=False, - packages=find_packages( - exclude=[ - "tests", - # Exclude packages that will be covered by PEP420 or nspkg - "authentication", - ] - ), - include_package_data=True, - package_data={ - "authentication.apikey": ["py.typed"], - }, - install_requires=[ - "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", - "typing-extensions>=4.6.0", - ], - python_requires=">=3.9", -) diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_operations/_operations.py index c2c0f07f7da..dc89eb01e77 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_operations/_operations.py @@ -13,7 +13,6 @@ 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 @@ -36,17 +35,10 @@ def build_api_key_valid_request(**kwargs: Any) -> HttpRequest: 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) + return HttpRequest(method="GET", url=_url, **kwargs) class _ApiKeyClientOperationsMixin( diff --git a/packages/typespec-python/test/unbranded/requirements.txt b/packages/typespec-python/test/unbranded/requirements.txt index 4ac844aff9f..57caee6ff9a 100644 --- a/packages/typespec-python/test/unbranded/requirements.txt +++ b/packages/typespec-python/test/unbranded/requirements.txt @@ -5,7 +5,7 @@ pytest-asyncio==0.14.0;python_full_version>="3.5.2" # common test case -e ./generated/authentication-api-key --e ./generated/authentication-api-key-with-subdir +-e ./generated/authentication-api-key-subdir -e ./generated/authentication-http-custom -e ./generated/authentication-oauth2 -e ./generated/authentication-union From af22affcf601bbad1b0d69bf1306562715a11280 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 4 Aug 2025 12:30:56 -0400 Subject: [PATCH 15/34] fix placement of generated tests in tsp --- .../generated_tests/conftest.py | 0 .../generated_tests/test_api_key.py | 0 .../generated_tests/test_api_key_async.py | 0 .../generated_tests/testpreparer.py | 0 .../generated_tests/testpreparer_async.py | 0 .../generated_tests/conftest.py | 35 +++++++++++++++++++ .../generated_tests/test_api_key.py | 31 ++++++++++++++++ .../generated_tests/test_api_key_async.py | 32 +++++++++++++++++ .../generated_tests/testpreparer.py | 24 +++++++++++++ .../generated_tests/testpreparer_async.py | 20 +++++++++++ .../apikey/generated_tests/conftest.py | 35 +++++++++++++++++++ .../apikey/generated_tests/test_api_key.py | 31 ++++++++++++++++ .../generated_tests/test_api_key_async.py | 32 +++++++++++++++++ .../apikey/generated_tests/testpreparer.py | 24 +++++++++++++ .../generated_tests/testpreparer_async.py | 20 +++++++++++ .../oauth2/_operations/_operations.py | 10 +----- .../contentnegotiation/models/_models.py | 10 ++++-- .../_operations/_operations.py | 19 ++-------- .../http/custom/_operations/_operations.py | 10 +----- .../oauth2/_operations/_operations.py | 10 +----- .../headasbooleanfalse/models/_models.py | 5 +++ .../headasbooleantrue/models/_models.py | 5 +++ .../differentbody/models/_models.py | 10 ++++-- .../_operations/_operations.py | 19 ++-------- .../model/visibility/models/_models.py | 5 +++ 25 files changed, 322 insertions(+), 65 deletions(-) rename packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/{_generated => }/generated_tests/conftest.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/{_generated => }/generated_tests/test_api_key.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/{_generated => }/generated_tests/test_api_key_async.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/{_generated => }/generated_tests/testpreparer.py (100%) rename packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/{_generated => }/generated_tests/testpreparer_async.py (100%) create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/conftest.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/test_api_key.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/test_api_key_async.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/testpreparer.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/testpreparer_async.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/conftest.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/test_api_key.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/test_api_key_async.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/testpreparer.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/testpreparer_async.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/conftest.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/generated_tests/conftest.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/conftest.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/generated_tests/conftest.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/test_api_key.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/generated_tests/test_api_key.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/test_api_key.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/generated_tests/test_api_key.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/test_api_key_async.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/generated_tests/test_api_key_async.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/test_api_key_async.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/generated_tests/test_api_key_async.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/generated_tests/testpreparer.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/testpreparer.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/generated_tests/testpreparer.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/generated_tests/testpreparer_async.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/generated_tests/testpreparer_async.py rename to packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/generated_tests/testpreparer_async.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/conftest.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/conftest.py new file mode 100644 index 00000000000..8082748a92a --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/conftest.py @@ -0,0 +1,35 @@ +# 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. +# -------------------------------------------------------------------------- +import os +import pytest +from dotenv import load_dotenv +from devtools_testutils import ( + test_proxy, + add_general_regex_sanitizer, + add_body_key_sanitizer, + add_header_regex_sanitizer, +) + +load_dotenv() + + +# 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") + + add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]") + add_header_regex_sanitizer(key="Cookie", value="cookie;") + add_body_key_sanitizer(json_path="$..access_token", value="access_token") 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/authentication-api-key-subdir/generated_tests/test_api_key.py new file mode 100644 index 00000000000..2916e7b9498 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/test_api_key.py @@ -0,0 +1,31 @@ +# 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. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils import recorded_by_proxy +from testpreparer import ApiKeyClientTestBase, ApiKeyPreparer + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestApiKey(ApiKeyClientTestBase): + @ApiKeyPreparer() + @recorded_by_proxy + def test_valid(self, apikey_endpoint): + client = self.create_client(endpoint=apikey_endpoint) + response = client.valid() + + # please add some check logic here by yourself + # ... + + @ApiKeyPreparer() + @recorded_by_proxy + def test_invalid(self, apikey_endpoint): + client = self.create_client(endpoint=apikey_endpoint) + response = client.invalid() + + # 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/authentication-api-key-subdir/generated_tests/test_api_key_async.py new file mode 100644 index 00000000000..214be1ee608 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/test_api_key_async.py @@ -0,0 +1,32 @@ +# 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. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils.aio import recorded_by_proxy_async +from testpreparer import ApiKeyPreparer +from testpreparer_async import ApiKeyClientTestBaseAsync + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestApiKeyAsync(ApiKeyClientTestBaseAsync): + @ApiKeyPreparer() + @recorded_by_proxy_async + async def test_valid(self, apikey_endpoint): + client = self.create_async_client(endpoint=apikey_endpoint) + response = await client.valid() + + # please add some check logic here by yourself + # ... + + @ApiKeyPreparer() + @recorded_by_proxy_async + async def test_invalid(self, apikey_endpoint): + client = self.create_async_client(endpoint=apikey_endpoint) + response = await client.invalid() + + # 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/authentication-api-key-subdir/generated_tests/testpreparer.py new file mode 100644 index 00000000000..1b3696072cd --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/testpreparer.py @@ -0,0 +1,24 @@ +# 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 authentication.api.key.subdir import ApiKeyClient +from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer +import functools + + +class ApiKeyClientTestBase(AzureRecordedTestCase): + + def create_client(self, endpoint): + credential = self.get_credential(ApiKeyClient) + return self.create_client_from_credential( + ApiKeyClient, + credential=credential, + endpoint=endpoint, + ) + + +ApiKeyPreparer = functools.partial(PowerShellPreparer, "apikey", apikey_endpoint="https://fake_apikey_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/authentication-api-key-subdir/generated_tests/testpreparer_async.py new file mode 100644 index 00000000000..98e4f0a0b12 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/generated_tests/testpreparer_async.py @@ -0,0 +1,20 @@ +# 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 authentication.api.key.subdir.aio import ApiKeyClient +from devtools_testutils import AzureRecordedTestCase + + +class ApiKeyClientTestBaseAsync(AzureRecordedTestCase): + + def create_async_client(self, endpoint): + credential = self.get_credential(ApiKeyClient, is_async=True) + return self.create_client_from_credential( + ApiKeyClient, + credential=credential, + endpoint=endpoint, + ) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/conftest.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/conftest.py new file mode 100644 index 00000000000..8082748a92a --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/conftest.py @@ -0,0 +1,35 @@ +# 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. +# -------------------------------------------------------------------------- +import os +import pytest +from dotenv import load_dotenv +from devtools_testutils import ( + test_proxy, + add_general_regex_sanitizer, + add_body_key_sanitizer, + add_header_regex_sanitizer, +) + +load_dotenv() + + +# 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") + + add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]") + add_header_regex_sanitizer(key="Cookie", value="cookie;") + add_body_key_sanitizer(json_path="$..access_token", value="access_token") diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/test_api_key.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/test_api_key.py new file mode 100644 index 00000000000..2916e7b9498 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/test_api_key.py @@ -0,0 +1,31 @@ +# 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. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils import recorded_by_proxy +from testpreparer import ApiKeyClientTestBase, ApiKeyPreparer + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestApiKey(ApiKeyClientTestBase): + @ApiKeyPreparer() + @recorded_by_proxy + def test_valid(self, apikey_endpoint): + client = self.create_client(endpoint=apikey_endpoint) + response = client.valid() + + # please add some check logic here by yourself + # ... + + @ApiKeyPreparer() + @recorded_by_proxy + def test_invalid(self, apikey_endpoint): + client = self.create_client(endpoint=apikey_endpoint) + response = client.invalid() + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/test_api_key_async.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/test_api_key_async.py new file mode 100644 index 00000000000..214be1ee608 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/test_api_key_async.py @@ -0,0 +1,32 @@ +# 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. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils.aio import recorded_by_proxy_async +from testpreparer import ApiKeyPreparer +from testpreparer_async import ApiKeyClientTestBaseAsync + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestApiKeyAsync(ApiKeyClientTestBaseAsync): + @ApiKeyPreparer() + @recorded_by_proxy_async + async def test_valid(self, apikey_endpoint): + client = self.create_async_client(endpoint=apikey_endpoint) + response = await client.valid() + + # please add some check logic here by yourself + # ... + + @ApiKeyPreparer() + @recorded_by_proxy_async + async def test_invalid(self, apikey_endpoint): + client = self.create_async_client(endpoint=apikey_endpoint) + response = await client.invalid() + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/testpreparer.py new file mode 100644 index 00000000000..5af4c923ab1 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/testpreparer.py @@ -0,0 +1,24 @@ +# 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 authentication.apikey import ApiKeyClient +from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer +import functools + + +class ApiKeyClientTestBase(AzureRecordedTestCase): + + def create_client(self, endpoint): + credential = self.get_credential(ApiKeyClient) + return self.create_client_from_credential( + ApiKeyClient, + credential=credential, + endpoint=endpoint, + ) + + +ApiKeyPreparer = functools.partial(PowerShellPreparer, "apikey", apikey_endpoint="https://fake_apikey_endpoint.com") diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/testpreparer_async.py new file mode 100644 index 00000000000..09c26f3fe60 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/generated_tests/testpreparer_async.py @@ -0,0 +1,20 @@ +# 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 authentication.apikey.aio import ApiKeyClient +from devtools_testutils import AzureRecordedTestCase + + +class ApiKeyClientTestBaseAsync(AzureRecordedTestCase): + + def create_async_client(self, endpoint): + credential = self.get_credential(ApiKeyClient, is_async=True) + return self.create_client_from_credential( + ApiKeyClient, + credential=credential, + endpoint=endpoint, + ) diff --git a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py index 7d7feb8aeb2..9d0a349b41e 100644 --- a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py @@ -20,7 +20,6 @@ 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 OAuth2ClientConfiguration @@ -43,17 +42,10 @@ def build_oauth2_valid_request(**kwargs: Any) -> HttpRequest: def build_oauth2_invalid_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - # Construct URL _url = "/authentication/oauth2/invalid" - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) + return HttpRequest(method="GET", url=_url, **kwargs) class _OAuth2ClientOperationsMixin( diff --git a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/models/_models.py b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/models/_models.py index df3d23f1039..2752e3b385b 100644 --- a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/models/_models.py +++ b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/models/_models.py @@ -5,9 +5,8 @@ # 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 typing import Any, Literal, Mapping, overload from .._utils.model_base import Model as _Model, rest_field @@ -15,10 +14,16 @@ class PngImageAsJson(_Model): """PngImageAsJson. + :ivar content_type: Required. Default value is "application/json". + :vartype content_type: str :ivar content: Required. :vartype content: bytes """ + content_type: Literal["application/json"] = rest_field( + name="contentType", visibility=["read", "create", "update", "delete", "query"] + ) + """Required. Default value is \"application/json\".""" content: bytes = rest_field(visibility=["read", "create", "update", "delete", "query"], format="base64") """Required.""" @@ -38,3 +43,4 @@ def __init__(self, mapping: Mapping[str, Any]) -> None: def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) + self.content_type: Literal["application/json"] = "application/json" diff --git a/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py b/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py index 17791e05ef4..b3a11f13110 100644 --- a/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py @@ -20,7 +20,6 @@ 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 StatusCodeRangeClientConfiguration @@ -38,33 +37,19 @@ def build_status_code_range_error_response_status_code_in_range_request( # pylint: disable=name-too-long **kwargs: Any, ) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - # Construct URL _url = "/response/status-code-range/error-response-status-code-in-range" - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) + return HttpRequest(method="GET", url=_url, **kwargs) def build_status_code_range_error_response_status_code404_request( # pylint: disable=name-too-long **kwargs: Any, ) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - # Construct URL _url = "/response/status-code-range/error-response-status-code-404" - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) + return HttpRequest(method="GET", url=_url, **kwargs) class _StatusCodeRangeClientOperationsMixin( diff --git a/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py index 9912506b033..1c666305930 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py @@ -13,7 +13,6 @@ 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 CustomClientConfiguration @@ -36,17 +35,10 @@ def build_custom_valid_request(**kwargs: Any) -> HttpRequest: def build_custom_invalid_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - # Construct URL _url = "/authentication/http/custom/invalid" - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) + return HttpRequest(method="GET", url=_url, **kwargs) class _CustomClientOperationsMixin( diff --git a/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py index b8c8eb49202..99577d85f4d 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py @@ -13,7 +13,6 @@ 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 OAuth2ClientConfiguration @@ -36,17 +35,10 @@ def build_oauth2_valid_request(**kwargs: Any) -> HttpRequest: def build_oauth2_invalid_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - # Construct URL _url = "/authentication/oauth2/invalid" - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) + return HttpRequest(method="GET", url=_url, **kwargs) class _OAuth2ClientOperationsMixin( diff --git a/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py b/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py index 8afead9dc15..d60a70ab3a8 100644 --- a/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py @@ -26,6 +26,8 @@ class VisibilityModel(_Model): :ivar read_prop: Required string, illustrating a readonly property. Required. :vartype read_prop: str + :ivar query_prop: Required int32, illustrating a query property. Required. + :vartype query_prop: int :ivar create_prop: Required string[], illustrating a create property. Required. :vartype create_prop: list[str] :ivar update_prop: Required int32[], illustrating a update property. Required. @@ -36,6 +38,8 @@ class VisibilityModel(_Model): read_prop: str = rest_field(name="readProp", visibility=["read"]) """Required string, illustrating a readonly property. Required.""" + query_prop: int = rest_field(name="queryProp", visibility=["query"]) + """Required int32, illustrating a query property. Required.""" create_prop: List[str] = rest_field(name="createProp", visibility=["create"]) """Required string[], illustrating a create property. Required.""" update_prop: List[int] = rest_field(name="updateProp", visibility=["update"]) @@ -47,6 +51,7 @@ class VisibilityModel(_Model): def __init__( self, *, + query_prop: int, create_prop: List[str], update_prop: List[int], delete_prop: bool, diff --git a/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/models/_models.py b/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/models/_models.py index 8afead9dc15..d60a70ab3a8 100644 --- a/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/models/_models.py @@ -26,6 +26,8 @@ class VisibilityModel(_Model): :ivar read_prop: Required string, illustrating a readonly property. Required. :vartype read_prop: str + :ivar query_prop: Required int32, illustrating a query property. Required. + :vartype query_prop: int :ivar create_prop: Required string[], illustrating a create property. Required. :vartype create_prop: list[str] :ivar update_prop: Required int32[], illustrating a update property. Required. @@ -36,6 +38,8 @@ class VisibilityModel(_Model): read_prop: str = rest_field(name="readProp", visibility=["read"]) """Required string, illustrating a readonly property. Required.""" + query_prop: int = rest_field(name="queryProp", visibility=["query"]) + """Required int32, illustrating a query property. Required.""" create_prop: List[str] = rest_field(name="createProp", visibility=["create"]) """Required string[], illustrating a create property. Required.""" update_prop: List[int] = rest_field(name="updateProp", visibility=["update"]) @@ -47,6 +51,7 @@ class VisibilityModel(_Model): def __init__( self, *, + query_prop: int, create_prop: List[str], update_prop: List[int], delete_prop: bool, diff --git a/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/differentbody/models/_models.py b/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/differentbody/models/_models.py index 60eacb31f90..ac53a34c343 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/differentbody/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/differentbody/models/_models.py @@ -1,7 +1,6 @@ # coding=utf-8 -# pylint: disable=useless-super-delegation -from typing import Any, Mapping, overload +from typing import Any, Literal, Mapping, overload from ..._utils.model_base import Model as _Model, rest_field @@ -9,10 +8,16 @@ class PngImageAsJson(_Model): """PngImageAsJson. + :ivar content_type: Required. Default value is "application/json". + :vartype content_type: str :ivar content: Required. :vartype content: bytes """ + content_type: Literal["application/json"] = rest_field( + name="contentType", visibility=["read", "create", "update", "delete", "query"] + ) + """Required. Default value is \"application/json\".""" content: bytes = rest_field(visibility=["read", "create", "update", "delete", "query"], format="base64") """Required.""" @@ -32,3 +37,4 @@ def __init__(self, mapping: Mapping[str, Any]) -> None: def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) + self.content_type: Literal["application/json"] = "application/json" diff --git a/packages/typespec-python/test/unbranded/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py index a41ccae8907..9ce5b023ba1 100644 --- a/packages/typespec-python/test/unbranded/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py @@ -13,7 +13,6 @@ 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 StatusCodeRangeClientConfiguration @@ -31,33 +30,19 @@ def build_status_code_range_error_response_status_code_in_range_request( # pylint: disable=name-too-long **kwargs: Any, ) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - # Construct URL _url = "/response/status-code-range/error-response-status-code-in-range" - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) + return HttpRequest(method="GET", url=_url, **kwargs) def build_status_code_range_error_response_status_code404_request( # pylint: disable=name-too-long **kwargs: Any, ) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - # Construct URL _url = "/response/status-code-range/error-response-status-code-404" - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) + return HttpRequest(method="GET", url=_url, **kwargs) class _StatusCodeRangeClientOperationsMixin( diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py index 8afead9dc15..d60a70ab3a8 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py @@ -26,6 +26,8 @@ class VisibilityModel(_Model): :ivar read_prop: Required string, illustrating a readonly property. Required. :vartype read_prop: str + :ivar query_prop: Required int32, illustrating a query property. Required. + :vartype query_prop: int :ivar create_prop: Required string[], illustrating a create property. Required. :vartype create_prop: list[str] :ivar update_prop: Required int32[], illustrating a update property. Required. @@ -36,6 +38,8 @@ class VisibilityModel(_Model): read_prop: str = rest_field(name="readProp", visibility=["read"]) """Required string, illustrating a readonly property. Required.""" + query_prop: int = rest_field(name="queryProp", visibility=["query"]) + """Required int32, illustrating a query property. Required.""" create_prop: List[str] = rest_field(name="createProp", visibility=["create"]) """Required string[], illustrating a create property. Required.""" update_prop: List[int] = rest_field(name="updateProp", visibility=["update"]) @@ -47,6 +51,7 @@ class VisibilityModel(_Model): def __init__( self, *, + query_prop: int, create_prop: List[str], update_prop: List[int], delete_prop: bool, From e39baf5dfea1747c80385225f9a9dc721f49b1ff Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 4 Aug 2025 12:49:44 -0400 Subject: [PATCH 16/34] get rid of gitignore --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index cf1d6e87806..06bd3cb697b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,6 @@ __pycache__/ # C extensions *.so -# macOS -.DS_Store - # Distribution / packaging .Python build/ From e3d6a85527ea9b1ed58ae55a12658e3f15a03afd Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 4 Aug 2025 13:06:28 -0400 Subject: [PATCH 17/34] latest --- packages/autorest.python/package.json | 2 +- packages/typespec-python/package.json | 2 +- pnpm-lock.yaml | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/autorest.python/package.json b/packages/autorest.python/package.json index f9fad6152d7..03a83f9aef3 100644 --- a/packages/autorest.python/package.json +++ b/packages/autorest.python/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md", "dependencies": { - "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", + "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", "@autorest/system-requirements": "~1.0.2", "fs-extra": "~11.2.0", "tsx": "~4.19.1" diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json index 4ba617075cb..43b7eb58773 100644 --- a/packages/typespec-python/package.json +++ b/packages/typespec-python/package.json @@ -67,7 +67,7 @@ "js-yaml": "~4.1.0", "semver": "~7.6.2", "tsx": "~4.19.1", - "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", + "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", "fs-extra": "~11.2.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e0054673e55..f8479d8d986 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,8 +60,8 @@ importers: specifier: ~1.0.2 version: 1.0.2 '@typespec/http-client-python': - specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz - version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim) + specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz + version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -82,8 +82,8 @@ importers: packages/typespec-python: dependencies: '@typespec/http-client-python': - specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz - version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(syuyg2efcycv4rjoyukojjfo2i) + specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz + version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(syuyg2efcycv4rjoyukojjfo2i) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -1527,8 +1527,8 @@ packages: peerDependencies: '@typespec/compiler': ^1.2.1 - '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz': - resolution: {tarball: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz} + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz': + resolution: {tarball: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz} version: 0.14.2 engines: {node: '>=20.0.0'} peerDependencies: @@ -4693,7 +4693,7 @@ snapshots: '@autorest/python@file:packages/autorest.python(iczbepxqiakhsdv7fgak6rpfim)': dependencies: '@autorest/system-requirements': 1.0.2 - '@typespec/http-client-python': https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim) + '@typespec/http-client-python': https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim) fs-extra: 11.2.0 tsx: 4.19.4 transitivePeerDependencies: @@ -6497,7 +6497,7 @@ snapshots: dependencies: '@typespec/compiler': 1.2.1(@types/node@24.0.15) - '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim)': + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim)': dependencies: '@azure-tools/typespec-autorest': 0.58.1(v7wf2zb5txflycjk6xzznulzs4) '@azure-tools/typespec-azure-core': 0.58.0(@typespec/compiler@1.2.1(@types/node@24.0.15))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@24.0.15))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@24.0.15))))(@typespec/rest@0.72.1(@typespec/compiler@1.2.1(@types/node@24.0.15))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@24.0.15))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@24.0.15))))) @@ -6522,7 +6522,7 @@ snapshots: - bufferutil - utf-8-validate - '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3MzQ3My9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(syuyg2efcycv4rjoyukojjfo2i)': + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(syuyg2efcycv4rjoyukojjfo2i)': dependencies: '@azure-tools/typespec-autorest': 0.58.1(3incr7dx56ztepkodc2t2fp6e4) '@azure-tools/typespec-azure-core': 0.58.0(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))(@typespec/rest@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))) From b008e272a80788109872edcbe820e5faa750cec0 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 4 Aug 2025 13:51:40 -0400 Subject: [PATCH 18/34] add azure test --- .../authentication/api/key/subdir/__init__.py | 12 ++++++++ .../authentication/api/key/subdir/_client.py | 30 +++++++++++++++++++ .../api/key/subdir/aio/__init__.py | 0 .../api/key/subdir/aio/_client.py | 30 +++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/_client.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/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/__init__.py new file mode 100644 index 00000000000..df73d052afd --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/__init__.py @@ -0,0 +1,12 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +from ._client import CustomizedApiKeyClient +from ._generated.models import InvalidAuth + +__all__ = [ + "CustomizedApiKeyClient", + "InvalidAuth", +] diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py new file mode 100644 index 00000000000..ea94bd2ae24 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_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 ._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: ~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 + ) -> None: + self._client = GeneratedClient(credential=credential, endpoint=endpoint, **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/aio/__init__.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/__init__.py new file mode 100644 index 00000000000..e69de29bb2d 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 new file mode 100644 index 00000000000..04408789ce1 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/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 .._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 + """ + + def __init__( + self, credential: AzureKeyCredential, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + self._client = GeneratedClient(credential=credential, endpoint=endpoint, **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 From 609a63e133f76eee5006aba71b0fb72e8f1c3ed4 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 4 Aug 2025 13:53:26 -0400 Subject: [PATCH 19/34] update mockapitests --- .../asynctests/test_generation_subdir_async.py | 7 +++---- .../test/generic_mock_api_tests/test_generation_subdir.py | 7 +++---- 2 files changed, 6 insertions(+), 8 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 6d07cb87478..8eb7b6a78f1 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,9 @@ # license information. # -------------------------------------------------------------------------- import pytest -from authentication.apikey.aio import ApiKeyClient +from authentication.apikey.aio import CustomizedApiKeyClient @pytest.mark.asyncio async def test_custom_method(key_credential): - async with ApiKeyClient(key_credential("valid-key")) as client: - - assert client.custom_method() == "This is a custom method in the subdirectory client." + async with CustomizedApiKeyClient(key_credential("valid-key")) as client: + assert (await client.custom_method()) 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 839544b4e84..dd5b5072edf 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,13 +4,12 @@ # license information. # -------------------------------------------------------------------------- import pytest -from authentication.apikey import ApiKeyClient +from authentication.apikey.subdir import CustomizedApiKeyClient def test_custom_method(key_credential): - with ApiKeyClient(key_credential("valid-key")) as client: - assert client.custom_method() == "This is a custom method in the subdirectory client." - + with CustomizedApiKeyClient(key_credential("valid-key")) as client: + assert client.custom_method() def test_custom_model(): try: from authentication.apikey import InvalidAuth From 513152f939a5d1076b4ef7f03d0a20810e3b7b75 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 4 Aug 2025 13:58:25 -0400 Subject: [PATCH 20/34] add auth api key tests --- .../api/key/subdir/aio/__init__.py | 11 +++++++ .../authentication/api/key/subdir/__init__.py | 12 ++++++++ .../authentication/api/key/subdir/_client.py | 30 +++++++++++++++++++ .../api/key/subdir/aio/__init__.py | 11 +++++++ .../api/key/subdir/aio/_client.py | 30 +++++++++++++++++++ 5 files changed, 94 insertions(+) create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/_client.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/authentication-api-key-subdir/authentication/api/key/subdir/aio/__init__.py index e69de29bb2d..46b2bd5759d 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/authentication-api-key-subdir/authentication/api/key/subdir/aio/__init__.py @@ -0,0 +1,11 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- + +from ._client import CustomizedApiKeyClient + +__all__ = [ + "CustomizedApiKeyClient", +] diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/__init__.py new file mode 100644 index 00000000000..df73d052afd --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/__init__.py @@ -0,0 +1,12 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +from ._client import CustomizedApiKeyClient +from ._generated.models import InvalidAuth + +__all__ = [ + "CustomizedApiKeyClient", + "InvalidAuth", +] 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 new file mode 100644 index 00000000000..ea94bd2ae24 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_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 ._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: ~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 + ) -> None: + self._client = GeneratedClient(credential=credential, endpoint=endpoint, **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/aio/__init__.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/__init__.py new file mode 100644 index 00000000000..46b2bd5759d --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/aio/__init__.py @@ -0,0 +1,11 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- + +from ._client import CustomizedApiKeyClient + +__all__ = [ + "CustomizedApiKeyClient", +] 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 new file mode 100644 index 00000000000..04408789ce1 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/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 .._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 + """ + + def __init__( + self, credential: AzureKeyCredential, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + self._client = GeneratedClient(credential=credential, endpoint=endpoint, **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 From 4f03983f7dbcaa186761ae7363621c95992d623e Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Tue, 5 Aug 2025 10:10:38 +0800 Subject: [PATCH 21/34] bump http-client-python version --- packages/autorest.python/package.json | 2 +- packages/typespec-python/package.json | 2 +- pnpm-lock.yaml | 19 +++++++++---------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/packages/autorest.python/package.json b/packages/autorest.python/package.json index 03a83f9aef3..bce547257c7 100644 --- a/packages/autorest.python/package.json +++ b/packages/autorest.python/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md", "dependencies": { - "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", + "@typespec/http-client-python": "~0.14.3-dev.1", "@autorest/system-requirements": "~1.0.2", "fs-extra": "~11.2.0", "tsx": "~4.19.1" diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json index 43b7eb58773..d4c6c7d2839 100644 --- a/packages/typespec-python/package.json +++ b/packages/typespec-python/package.json @@ -67,7 +67,7 @@ "js-yaml": "~4.1.0", "semver": "~7.6.2", "tsx": "~4.19.1", - "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", + "@typespec/http-client-python": "~0.14.3-dev.1", "fs-extra": "~11.2.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f8479d8d986..27f941fe028 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,8 +60,8 @@ importers: specifier: ~1.0.2 version: 1.0.2 '@typespec/http-client-python': - specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz - version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim) + specifier: ~0.14.3-dev.1 + version: 0.14.3-dev.1(iczbepxqiakhsdv7fgak6rpfim) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -82,8 +82,8 @@ importers: packages/typespec-python: dependencies: '@typespec/http-client-python': - specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz - version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(syuyg2efcycv4rjoyukojjfo2i) + specifier: ~0.14.3-dev.1 + version: 0.14.3-dev.1(syuyg2efcycv4rjoyukojjfo2i) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -1527,9 +1527,8 @@ packages: peerDependencies: '@typespec/compiler': ^1.2.1 - '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz': - resolution: {tarball: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz} - version: 0.14.2 + '@typespec/http-client-python@0.14.3-dev.1': + resolution: {integrity: sha512-mD76t6ADgfrv7hOETAufuG7SxT7ER0VP1M3PSsbnenkICF1iIc6x+su/y0bBv8agfsW8nRMPgbBWziHXONwUEQ==} engines: {node: '>=20.0.0'} peerDependencies: '@azure-tools/typespec-autorest': '>=0.58.0 <1.0.0' @@ -4693,7 +4692,7 @@ snapshots: '@autorest/python@file:packages/autorest.python(iczbepxqiakhsdv7fgak6rpfim)': dependencies: '@autorest/system-requirements': 1.0.2 - '@typespec/http-client-python': https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim) + '@typespec/http-client-python': 0.14.3-dev.1(iczbepxqiakhsdv7fgak6rpfim) fs-extra: 11.2.0 tsx: 4.19.4 transitivePeerDependencies: @@ -6497,7 +6496,7 @@ snapshots: dependencies: '@typespec/compiler': 1.2.1(@types/node@24.0.15) - '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iczbepxqiakhsdv7fgak6rpfim)': + '@typespec/http-client-python@0.14.3-dev.1(iczbepxqiakhsdv7fgak6rpfim)': dependencies: '@azure-tools/typespec-autorest': 0.58.1(v7wf2zb5txflycjk6xzznulzs4) '@azure-tools/typespec-azure-core': 0.58.0(@typespec/compiler@1.2.1(@types/node@24.0.15))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@24.0.15))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@24.0.15))))(@typespec/rest@0.72.1(@typespec/compiler@1.2.1(@types/node@24.0.15))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@24.0.15))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@24.0.15))))) @@ -6522,7 +6521,7 @@ snapshots: - bufferutil - utf-8-validate - '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3NTU4Ny9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(syuyg2efcycv4rjoyukojjfo2i)': + '@typespec/http-client-python@0.14.3-dev.1(syuyg2efcycv4rjoyukojjfo2i)': dependencies: '@azure-tools/typespec-autorest': 0.58.1(3incr7dx56ztepkodc2t2fp6e4) '@azure-tools/typespec-azure-core': 0.58.0(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))(@typespec/rest@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))) From 271797effbb9d53e71fcf939d81a38f99e248ba5 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Tue, 5 Aug 2025 13:54:26 +0800 Subject: [PATCH 22/34] update private package link --- packages/autorest.python/package.json | 2 +- packages/typespec-python/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/autorest.python/package.json b/packages/autorest.python/package.json index bce547257c7..29ec24df6e4 100644 --- a/packages/autorest.python/package.json +++ b/packages/autorest.python/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md", "dependencies": { - "@typespec/http-client-python": "~0.14.3-dev.1", + "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", "@autorest/system-requirements": "~1.0.2", "fs-extra": "~11.2.0", "tsx": "~4.19.1" diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json index d4c6c7d2839..7b563a41494 100644 --- a/packages/typespec-python/package.json +++ b/packages/typespec-python/package.json @@ -67,7 +67,7 @@ "js-yaml": "~4.1.0", "semver": "~7.6.2", "tsx": "~4.19.1", - "@typespec/http-client-python": "~0.14.3-dev.1", + "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", "fs-extra": "~11.2.0" }, "devDependencies": { From 6217b6d568b9902f21c744aa21234928ad42d4bf Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Tue, 5 Aug 2025 14:37:34 +0800 Subject: [PATCH 23/34] update lock file --- pnpm-lock.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3c7a5a7268b..74faeb2636f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,8 +60,8 @@ importers: specifier: ~1.0.2 version: 1.0.2 '@typespec/http-client-python': - specifier: ~0.14.3-dev.1 - version: 0.14.3-dev.1(iurth4uuk4s6znzuuc7ncenk2q) + specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz + version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iurth4uuk4s6znzuuc7ncenk2q) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -82,8 +82,8 @@ importers: packages/typespec-python: dependencies: '@typespec/http-client-python': - specifier: ~0.14.3-dev.1 - version: 0.14.3-dev.1(iurth4uuk4s6znzuuc7ncenk2q) + specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz + version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iurth4uuk4s6znzuuc7ncenk2q) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -1668,8 +1668,9 @@ packages: peerDependencies: '@typespec/compiler': ^1.2.1 - '@typespec/http-client-python@0.14.3-dev.1': - resolution: {integrity: sha512-mD76t6ADgfrv7hOETAufuG7SxT7ER0VP1M3PSsbnenkICF1iIc6x+su/y0bBv8agfsW8nRMPgbBWziHXONwUEQ==} + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz': + resolution: {tarball: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz} + version: 0.14.2 engines: {node: '>=20.0.0'} peerDependencies: '@azure-tools/typespec-autorest': '>=0.58.0 <1.0.0' @@ -6421,7 +6422,7 @@ snapshots: dependencies: '@typespec/compiler': 1.2.1(@types/node@22.13.17) - '@typespec/http-client-python@0.14.3-dev.1(iurth4uuk4s6znzuuc7ncenk2q)': + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iurth4uuk4s6znzuuc7ncenk2q)': dependencies: '@azure-tools/typespec-autorest': 0.58.0(vddu6w2yloigenmssnpyjivoim) '@azure-tools/typespec-azure-core': 0.58.0(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))(@typespec/rest@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))) From 25fadbb02304779e9e565ee71207af57dc919547 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Tue, 5 Aug 2025 14:43:04 +0800 Subject: [PATCH 24/34] fix format --- .../test/azure/mock_api_tests/test_generation_subdir.py | 2 +- .../asynctests/test_generation_subdir_async.py | 3 ++- .../test/generic_mock_api_tests/test_generation_subdir.py | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_generation_subdir.py b/packages/typespec-python/test/azure/mock_api_tests/test_generation_subdir.py index 13e6a918400..47da9edef5c 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_generation_subdir.py +++ b/packages/typespec-python/test/azure/mock_api_tests/test_generation_subdir.py @@ -1 +1 @@ -from authentication.apikey import +# from authentication.apikey import 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 8eb7b6a78f1..f7bc3cc2cd6 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 @@ -6,7 +6,8 @@ import pytest from authentication.apikey.aio import CustomizedApiKeyClient + @pytest.mark.asyncio async def test_custom_method(key_credential): async with CustomizedApiKeyClient(key_credential("valid-key")) as client: - assert (await client.custom_method()) + assert await client.custom_method() 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 dd5b5072edf..507f0b06807 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 @@ -10,10 +10,12 @@ def test_custom_method(key_credential): with CustomizedApiKeyClient(key_credential("valid-key")) as client: assert client.custom_method() + + def test_custom_model(): try: from authentication.apikey import InvalidAuth + assert InvalidAuth is not None except ImportError: pytest.fail("InvalidAuth could not be imported") - From 8d602a69c11941914fe0282c87e51cc003afc438 Mon Sep 17 00:00:00 2001 From: AutoPrFromHttpClientPython Date: Tue, 5 Aug 2025 07:03:00 +0000 Subject: [PATCH 25/34] Regenerate for typespec-python (2025-08-05 07:03:00) --- .../_generated/_operations/_operations.py | 10 +++++- .../apikey/_operations/_operations.py | 10 +++++- .../http/custom/_operations/_operations.py | 10 +++++- .../oauth2/_operations/_operations.py | 10 +++++- .../core/override/models/_models.py | 36 ++----------------- .../core/basic/_operations/_operations.py | 8 ++++- .../commonproperties/models/_models.py | 12 +++---- ...test_common_properties_error_operations.py | 2 +- ...ommon_properties_error_operations_async.py | 2 +- ..._properties_managed_identity_operations.py | 4 +-- ...rties_managed_identity_operations_async.py | 4 +-- .../operationtemplates/models/_models.py | 12 +++---- .../operations/_operations.py | 8 ++++- ...test_operation_templates_lro_operations.py | 2 +- ...peration_templates_lro_operations_async.py | 2 +- .../resources/models/_models.py | 30 ++++++---------- .../resources/operations/_operations.py | 35 +++++++++++++++--- ...sources_extensions_resources_operations.py | 4 +-- ...s_extensions_resources_operations_async.py | 4 +-- ...resources_location_resources_operations.py | 4 +-- ...ces_location_resources_operations_async.py | 4 +-- .../test_resources_nested_operations.py | 4 +-- .../test_resources_nested_operations_async.py | 4 +-- .../test_resources_singleton_operations.py | 4 +-- ...st_resources_singleton_operations_async.py | 4 +-- .../test_resources_top_level_operations.py | 4 +-- ...st_resources_top_level_operations_async.py | 4 +-- .../generated_tests/test_visibility.py | 12 +++---- .../generated_tests/test_visibility_async.py | 12 +++---- .../headasbooleanfalse/models/_models.py | 5 --- .../generated_tests/test_visibility.py | 12 +++---- .../generated_tests/test_visibility_async.py | 12 +++---- .../headasbooleantrue/models/_models.py | 5 --- .../contentnegotiation/models/_models.py | 10 ++---- .../_operations/_operations.py | 19 ++++++++-- .../generated_tests/test_visibility.py | 12 +++---- .../generated_tests/test_visibility_async.py | 12 +++---- .../model/visibility/models/_models.py | 5 --- .../_generated/_operations/_operations.py | 10 +++++- .../apikey/_operations/_operations.py | 10 +++++- .../http/custom/_operations/_operations.py | 10 +++++- .../oauth2/_operations/_operations.py | 10 +++++- .../headasbooleanfalse/models/_models.py | 5 --- .../headasbooleantrue/models/_models.py | 5 --- .../differentbody/models/_models.py | 10 ++---- .../_operations/_operations.py | 19 ++++++++-- .../model/visibility/models/_models.py | 5 --- 47 files changed, 239 insertions(+), 198 deletions(-) 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 index e04e5527efc..104d8af49e3 100644 --- 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 @@ -20,6 +20,7 @@ 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 @@ -42,10 +43,17 @@ def build_api_key_valid_request(**kwargs: Any) -> HttpRequest: 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" - return HttpRequest(method="GET", url=_url, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) class _ApiKeyClientOperationsMixin( diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_operations.py index e04e5527efc..104d8af49e3 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_operations.py @@ -20,6 +20,7 @@ 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 @@ -42,10 +43,17 @@ def build_api_key_valid_request(**kwargs: Any) -> HttpRequest: 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" - return HttpRequest(method="GET", url=_url, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) class _ApiKeyClientOperationsMixin( diff --git a/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py index 66ff3016a7b..40dd4aa36dd 100644 --- a/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py @@ -20,6 +20,7 @@ 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 CustomClientConfiguration @@ -42,10 +43,17 @@ def build_custom_valid_request(**kwargs: Any) -> HttpRequest: def build_custom_invalid_request(**kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = "/authentication/http/custom/invalid" - return HttpRequest(method="GET", url=_url, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) class _CustomClientOperationsMixin( diff --git a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py index 9d0a349b41e..7d7feb8aeb2 100644 --- a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py @@ -20,6 +20,7 @@ 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 OAuth2ClientConfiguration @@ -42,10 +43,17 @@ def build_oauth2_valid_request(**kwargs: Any) -> HttpRequest: def build_oauth2_invalid_request(**kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = "/authentication/oauth2/invalid" - return HttpRequest(method="GET", url=_url, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) class _OAuth2ClientOperationsMixin( diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-override/specs/azure/clientgenerator/core/override/models/_models.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-override/specs/azure/clientgenerator/core/override/models/_models.py index d871f7c1571..12e4530731a 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-override/specs/azure/clientgenerator/core/override/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-override/specs/azure/clientgenerator/core/override/models/_models.py @@ -5,41 +5,9 @@ # 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 +from .._utils.model_base import Model as _Model class GroupParametersOptions(_Model): - """GroupParametersOptions. - - :ivar param1: Required. - :vartype param1: str - :ivar param2: Required. - :vartype param2: str - """ - - param1: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """Required.""" - param2: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """Required.""" - - @overload - def __init__( - self, - *, - param1: str, - param2: 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) + """GroupParametersOptions.""" diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_operations/_operations.py index a8f22988306..08efd4facb9 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_operations/_operations.py @@ -164,9 +164,12 @@ def build_basic_list_request( def build_basic_delete_request(id: int, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-12-01-preview")) + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = "/azure/core/basic/users/{id}" path_format_arguments = { @@ -178,7 +181,10 @@ def build_basic_delete_request(id: int, **kwargs: Any) -> HttpRequest: # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") - return HttpRequest(method="DELETE", url=_url, params=_params, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) def build_basic_export_request(id: int, *, format: str, **kwargs: Any) -> HttpRequest: diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/azure/resourcemanager/commonproperties/models/_models.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/azure/resourcemanager/commonproperties/models/_models.py index e9d6eced60e..d70afed1b73 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/azure/resourcemanager/commonproperties/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/azure/resourcemanager/commonproperties/models/_models.py @@ -212,6 +212,8 @@ class ConfidentialResource(TrackedResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str + :ivar name: The name of the resource. + :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -225,16 +227,12 @@ class ConfidentialResource(TrackedResource): :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.commonproperties.models.ConfidentialResourceProperties - :ivar name: The name of the ConfidentialResource. Required. - :vartype name: str """ properties: Optional["_models.ConfidentialResourceProperties"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" - name: str = rest_field(visibility=["read"]) - """The name of the ConfidentialResource. Required.""" @overload def __init__( @@ -401,6 +399,8 @@ class ManagedIdentityTrackedResource(TrackedResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str + :ivar name: The name of the resource. + :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -414,8 +414,6 @@ class ManagedIdentityTrackedResource(TrackedResource): :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.commonproperties.models.ManagedIdentityTrackedResourceProperties - :ivar name: arm resource name for path. Required. - :vartype name: str :ivar identity: The managed service identities assigned to this resource. :vartype identity: ~azure.resourcemanager.commonproperties.models.ManagedServiceIdentity """ @@ -424,8 +422,6 @@ class ManagedIdentityTrackedResource(TrackedResource): visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" - name: str = rest_field(visibility=["read"]) - """arm resource name for path. Required.""" identity: Optional["_models.ManagedServiceIdentity"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_error_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_error_operations.py index 3b1a2ae4b72..427f508b084 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_error_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_error_operations.py @@ -37,8 +37,8 @@ def test_error_create_for_user_defined_error(self, resource_group): confidential_resource_name="str", resource={ "location": "str", - "name": "str", "id": "str", + "name": "str", "properties": {"provisioningState": "str", "username": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_error_operations_async.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_error_operations_async.py index ed14d356ed5..ceedb3682f1 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_error_operations_async.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_error_operations_async.py @@ -38,8 +38,8 @@ async def test_error_create_for_user_defined_error(self, resource_group): confidential_resource_name="str", resource={ "location": "str", - "name": "str", "id": "str", + "name": "str", "properties": {"provisioningState": "str", "username": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_managed_identity_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_managed_identity_operations.py index e932d9d4c80..92226f4ed8f 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_managed_identity_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_managed_identity_operations.py @@ -37,7 +37,6 @@ def test_managed_identity_create_with_system_assigned(self, resource_group): managed_identity_tracked_resource_name="str", resource={ "location": "str", - "name": "str", "id": "str", "identity": { "type": "str", @@ -45,6 +44,7 @@ def test_managed_identity_create_with_system_assigned(self, resource_group): "tenantId": "str", "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, }, + "name": "str", "properties": {"provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -70,7 +70,6 @@ def test_managed_identity_update_with_user_assigned_and_system_assigned(self, re managed_identity_tracked_resource_name="str", properties={ "location": "str", - "name": "str", "id": "str", "identity": { "type": "str", @@ -78,6 +77,7 @@ def test_managed_identity_update_with_user_assigned_and_system_assigned(self, re "tenantId": "str", "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, }, + "name": "str", "properties": {"provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_managed_identity_operations_async.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_managed_identity_operations_async.py index 46b2b00d356..5b0776d5e57 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_managed_identity_operations_async.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/generated_tests/test_common_properties_managed_identity_operations_async.py @@ -38,7 +38,6 @@ async def test_managed_identity_create_with_system_assigned(self, resource_group managed_identity_tracked_resource_name="str", resource={ "location": "str", - "name": "str", "id": "str", "identity": { "type": "str", @@ -46,6 +45,7 @@ async def test_managed_identity_create_with_system_assigned(self, resource_group "tenantId": "str", "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, }, + "name": "str", "properties": {"provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -71,7 +71,6 @@ async def test_managed_identity_update_with_user_assigned_and_system_assigned(se managed_identity_tracked_resource_name="str", properties={ "location": "str", - "name": "str", "id": "str", "identity": { "type": "str", @@ -79,6 +78,7 @@ async def test_managed_identity_update_with_user_assigned_and_system_assigned(se "tenantId": "str", "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, }, + "name": "str", "properties": {"provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/_models.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/_models.py index 1bbc271a7b8..3ec1d43d865 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/_models.py @@ -522,6 +522,8 @@ class Order(TrackedResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str + :ivar name: The name of the resource. + :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -534,16 +536,12 @@ class Order(TrackedResource): :vartype location: str :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.operationtemplates.models.OrderProperties - :ivar name: The name of the Order. Required. - :vartype name: str """ properties: Optional["_models.OrderProperties"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" - name: str = rest_field(visibility=["read"]) - """The name of the Order. Required.""" @overload def __init__( @@ -677,6 +675,8 @@ class Widget(TrackedResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str + :ivar name: The name of the resource. + :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -689,16 +689,12 @@ class Widget(TrackedResource): :vartype location: str :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.operationtemplates.models.WidgetProperties - :ivar name: The name of the Widget. Required. - :vartype name: str """ properties: Optional["_models.WidgetProperties"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" - name: str = rest_field(visibility=["read"]) - """The name of the Widget. Required.""" @overload def __init__( diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/operations/_operations.py index 489b9f2bd68..385a7ea8502 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/operations/_operations.py @@ -188,9 +188,12 @@ def build_lro_export_request( def build_lro_delete_request( resource_group_name: str, order_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-12-01-preview")) + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.OperationTemplates/orders/{orderName}" path_format_arguments = { @@ -204,7 +207,10 @@ def build_lro_delete_request( # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") - return HttpRequest(method="DELETE", url=_url, params=_params, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) def build_optional_body_get_request( diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/generated_tests/test_operation_templates_lro_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/generated_tests/test_operation_templates_lro_operations.py index 56938986a7d..4dd9bfcf656 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/generated_tests/test_operation_templates_lro_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/generated_tests/test_operation_templates_lro_operations.py @@ -26,8 +26,8 @@ def test_lro_begin_create_or_replace(self, resource_group): order_name="str", resource={ "location": "str", - "name": "str", "id": "str", + "name": "str", "properties": {"amount": 0, "productId": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/generated_tests/test_operation_templates_lro_operations_async.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/generated_tests/test_operation_templates_lro_operations_async.py index f1bb03dbfa3..4d27a056ccf 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/generated_tests/test_operation_templates_lro_operations_async.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/generated_tests/test_operation_templates_lro_operations_async.py @@ -28,8 +28,8 @@ async def test_lro_begin_create_or_replace(self, resource_group): order_name="str", resource={ "location": "str", - "name": "str", "id": "str", + "name": "str", "properties": {"amount": 0, "productId": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/azure/resourcemanager/resources/models/_models.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/azure/resourcemanager/resources/models/_models.py index 03c2d5052f1..59578127d90 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/azure/resourcemanager/resources/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/azure/resourcemanager/resources/models/_models.py @@ -141,6 +141,8 @@ class ExtensionsResource(ExtensionResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str + :ivar name: The name of the resource. + :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -149,16 +151,12 @@ class ExtensionsResource(ExtensionResource): :vartype system_data: ~azure.resourcemanager.resources.models.SystemData :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.resources.models.ExtensionsResourceProperties - :ivar name: The name of the ExtensionsResource. Required. - :vartype name: str """ properties: Optional["_models.ExtensionsResourceProperties"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" - name: str = rest_field(visibility=["read"]) - """The name of the ExtensionsResource. Required.""" @overload def __init__( @@ -238,6 +236,8 @@ class LocationResource(ProxyResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str + :ivar name: The name of the resource. + :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -246,16 +246,12 @@ class LocationResource(ProxyResource): :vartype system_data: ~azure.resourcemanager.resources.models.SystemData :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.resources.models.LocationResourceProperties - :ivar name: The name of the LocationResource. Required. - :vartype name: str """ properties: Optional["_models.LocationResourceProperties"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" - name: str = rest_field(visibility=["read"]) - """The name of the LocationResource. Required.""" @overload def __init__( @@ -317,6 +313,8 @@ class NestedProxyResource(ProxyResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str + :ivar name: The name of the resource. + :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -325,16 +323,12 @@ class NestedProxyResource(ProxyResource): :vartype system_data: ~azure.resourcemanager.resources.models.SystemData :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.resources.models.NestedProxyResourceProperties - :ivar name: Name of the nested resource. Required. - :vartype name: str """ properties: Optional["_models.NestedProxyResourceProperties"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" - name: str = rest_field(visibility=["read"]) - """Name of the nested resource. Required.""" @overload def __init__( @@ -474,6 +468,8 @@ class SingletonTrackedResource(TrackedResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str + :ivar name: The name of the resource. + :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -486,16 +482,12 @@ class SingletonTrackedResource(TrackedResource): :vartype location: str :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.resources.models.SingletonTrackedResourceProperties - :ivar name: The name of the SingletonTrackedResource. Required. - :vartype name: str """ properties: Optional["_models.SingletonTrackedResourceProperties"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" - name: str = rest_field(visibility=["read"]) - """The name of the SingletonTrackedResource. Required.""" @overload def __init__( @@ -627,6 +619,8 @@ class TopLevelTrackedResource(TrackedResource): :ivar id: Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str + :ivar name: The name of the resource. + :vartype name: str :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". :vartype type: str @@ -639,16 +633,12 @@ class TopLevelTrackedResource(TrackedResource): :vartype location: str :ivar properties: The resource-specific properties for this resource. :vartype properties: ~azure.resourcemanager.resources.models.TopLevelTrackedResourceProperties - :ivar name: arm resource name for path. Required. - :vartype name: str """ properties: Optional["_models.TopLevelTrackedResourceProperties"] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) """The resource-specific properties for this resource.""" - name: str = rest_field(visibility=["read"]) - """arm resource name for path. Required.""" @overload def __init__( diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/azure/resourcemanager/resources/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/azure/resourcemanager/resources/operations/_operations.py index eb0a214656b..869561404aa 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/azure/resourcemanager/resources/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/azure/resourcemanager/resources/operations/_operations.py @@ -144,9 +144,12 @@ def build_top_level_update_request( def build_top_level_delete_request( resource_group_name: str, top_level_tracked_resource_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-12-01-preview")) + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}" path_format_arguments = { @@ -162,7 +165,10 @@ def build_top_level_delete_request( # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") - return HttpRequest(method="DELETE", url=_url, params=_params, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) def build_top_level_list_by_resource_group_request( # pylint: disable=name-too-long @@ -226,6 +232,8 @@ def build_top_level_action_sync_request( content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-12-01-preview")) + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/actionSync" path_format_arguments = { @@ -244,6 +252,7 @@ def build_top_level_action_sync_request( # Construct headers if content_type is not None: _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) @@ -366,9 +375,12 @@ def build_nested_delete_request( subscription_id: str, **kwargs: Any ) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-12-01-preview")) + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}" path_format_arguments = { @@ -385,7 +397,10 @@ def build_nested_delete_request( # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") - return HttpRequest(method="DELETE", url=_url, params=_params, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) def build_nested_list_by_top_level_tracked_resource_request( # pylint: disable=name-too-long @@ -620,9 +635,12 @@ def build_extensions_resources_update_request( # pylint: disable=name-too-long def build_extensions_resources_delete_request( # pylint: disable=name-too-long resource_uri: str, extensions_resource_name: str, **kwargs: Any ) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-12-01-preview")) + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = "/{resourceUri}/providers/Azure.ResourceManager.Resources/extensionsResources/{extensionsResourceName}" path_format_arguments = { @@ -635,7 +653,10 @@ def build_extensions_resources_delete_request( # pylint: disable=name-too-long # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") - return HttpRequest(method="DELETE", url=_url, params=_params, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) def build_extensions_resources_list_by_scope_request( # pylint: disable=name-too-long @@ -757,9 +778,12 @@ def build_location_resources_update_request( def build_location_resources_delete_request( location: str, location_resource_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-12-01-preview")) + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = "/subscriptions/{subscriptionId}/providers/Azure.ResourceManager.Resources/locations/{location}/locationResources/{locationResourceName}" path_format_arguments = { @@ -773,7 +797,10 @@ def build_location_resources_delete_request( # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") - return HttpRequest(method="DELETE", url=_url, params=_params, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) def build_location_resources_list_by_location_request( # pylint: disable=name-too-long diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_extensions_resources_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_extensions_resources_operations.py index d4af1caccf6..b37e097a361 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_extensions_resources_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_extensions_resources_operations.py @@ -36,8 +36,8 @@ def test_extensions_resources_begin_create_or_update(self, resource_group): resource_uri="str", extensions_resource_name="str", resource={ - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -61,8 +61,8 @@ def test_extensions_resources_update(self, resource_group): resource_uri="str", extensions_resource_name="str", properties={ - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_extensions_resources_operations_async.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_extensions_resources_operations_async.py index ce12b232631..88a33f4800d 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_extensions_resources_operations_async.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_extensions_resources_operations_async.py @@ -38,8 +38,8 @@ async def test_extensions_resources_begin_create_or_update(self, resource_group) resource_uri="str", extensions_resource_name="str", resource={ - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -64,8 +64,8 @@ async def test_extensions_resources_update(self, resource_group): resource_uri="str", extensions_resource_name="str", properties={ - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_location_resources_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_location_resources_operations.py index d1d254411b2..41965ddabba 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_location_resources_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_location_resources_operations.py @@ -36,8 +36,8 @@ def test_location_resources_create_or_update(self, resource_group): location="str", location_resource_name="str", resource={ - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -61,8 +61,8 @@ def test_location_resources_update(self, resource_group): location="str", location_resource_name="str", properties={ - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_location_resources_operations_async.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_location_resources_operations_async.py index 7b3f253eeac..493b2a11fd8 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_location_resources_operations_async.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_location_resources_operations_async.py @@ -37,8 +37,8 @@ async def test_location_resources_create_or_update(self, resource_group): location="str", location_resource_name="str", resource={ - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -62,8 +62,8 @@ async def test_location_resources_update(self, resource_group): location="str", location_resource_name="str", properties={ - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_nested_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_nested_operations.py index b1dbf9d87ae..b60fadc33d8 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_nested_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_nested_operations.py @@ -38,8 +38,8 @@ def test_nested_begin_create_or_replace(self, resource_group): top_level_tracked_resource_name="str", nexted_proxy_resource_name="str", resource={ - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -64,8 +64,8 @@ def test_nested_begin_update(self, resource_group): top_level_tracked_resource_name="str", nexted_proxy_resource_name="str", properties={ - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_nested_operations_async.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_nested_operations_async.py index 6c8f724f73c..bb86a6ff911 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_nested_operations_async.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_nested_operations_async.py @@ -40,8 +40,8 @@ async def test_nested_begin_create_or_replace(self, resource_group): top_level_tracked_resource_name="str", nexted_proxy_resource_name="str", resource={ - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -68,8 +68,8 @@ async def test_nested_begin_update(self, resource_group): top_level_tracked_resource_name="str", nexted_proxy_resource_name="str", properties={ - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_singleton_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_singleton_operations.py index 5d460d4789f..bef8b7bbe35 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_singleton_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_singleton_operations.py @@ -35,8 +35,8 @@ def test_singleton_begin_create_or_update(self, resource_group): resource_group_name=resource_group.name, resource={ "location": "str", - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -61,8 +61,8 @@ def test_singleton_update(self, resource_group): resource_group_name=resource_group.name, properties={ "location": "str", - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_singleton_operations_async.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_singleton_operations_async.py index b5325b135d7..dc973f54204 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_singleton_operations_async.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_singleton_operations_async.py @@ -37,8 +37,8 @@ async def test_singleton_begin_create_or_update(self, resource_group): resource_group_name=resource_group.name, resource={ "location": "str", - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -64,8 +64,8 @@ async def test_singleton_update(self, resource_group): resource_group_name=resource_group.name, properties={ "location": "str", - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_top_level_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_top_level_operations.py index cc2e9b22fe5..8c685fd5000 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_top_level_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_top_level_operations.py @@ -37,8 +37,8 @@ def test_top_level_begin_create_or_replace(self, resource_group): top_level_tracked_resource_name="str", resource={ "location": "str", - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -64,8 +64,8 @@ def test_top_level_begin_update(self, resource_group): top_level_tracked_resource_name="str", properties={ "location": "str", - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_top_level_operations_async.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_top_level_operations_async.py index 45294d2d27c..c3cec3db79a 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_top_level_operations_async.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/generated_tests/test_resources_top_level_operations_async.py @@ -39,8 +39,8 @@ async def test_top_level_begin_create_or_replace(self, resource_group): top_level_tracked_resource_name="str", resource={ "location": "str", - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", @@ -68,8 +68,8 @@ async def test_top_level_begin_update(self, resource_group): top_level_tracked_resource_name="str", properties={ "location": "str", - "name": "str", "id": "str", + "name": "str", "properties": {"description": "str", "provisioningState": "str"}, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/packages/typespec-python/test/azure/generated/headasbooleanfalse/generated_tests/test_visibility.py b/packages/typespec-python/test/azure/generated/headasbooleanfalse/generated_tests/test_visibility.py index a7cf96b179f..8752fa205bf 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleanfalse/generated_tests/test_visibility.py +++ b/packages/typespec-python/test/azure/generated/headasbooleanfalse/generated_tests/test_visibility.py @@ -17,7 +17,7 @@ class TestVisibility(VisibilityClientTestBase): def test_get_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.get_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -29,7 +29,7 @@ def test_get_model(self, visibility_endpoint): def test_head_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.head_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -41,7 +41,7 @@ def test_head_model(self, visibility_endpoint): def test_put_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.put_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -52,7 +52,7 @@ def test_put_model(self, visibility_endpoint): def test_patch_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.patch_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -63,7 +63,7 @@ def test_patch_model(self, visibility_endpoint): def test_post_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.post_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -74,7 +74,7 @@ def test_post_model(self, visibility_endpoint): def test_delete_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.delete_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself diff --git a/packages/typespec-python/test/azure/generated/headasbooleanfalse/generated_tests/test_visibility_async.py b/packages/typespec-python/test/azure/generated/headasbooleanfalse/generated_tests/test_visibility_async.py index 8ddd7f23ca0..191024e0c9f 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleanfalse/generated_tests/test_visibility_async.py +++ b/packages/typespec-python/test/azure/generated/headasbooleanfalse/generated_tests/test_visibility_async.py @@ -18,7 +18,7 @@ class TestVisibilityAsync(VisibilityClientTestBaseAsync): async def test_get_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.get_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -30,7 +30,7 @@ async def test_get_model(self, visibility_endpoint): async def test_head_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.head_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -42,7 +42,7 @@ async def test_head_model(self, visibility_endpoint): async def test_put_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.put_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -53,7 +53,7 @@ async def test_put_model(self, visibility_endpoint): async def test_patch_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.patch_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -64,7 +64,7 @@ async def test_patch_model(self, visibility_endpoint): async def test_post_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.post_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -75,7 +75,7 @@ async def test_post_model(self, visibility_endpoint): async def test_delete_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.delete_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself diff --git a/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py b/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py index a87780911d8..e4b8dcd1fd4 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py +++ b/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py @@ -32,8 +32,6 @@ class VisibilityModel(_Model): :ivar read_prop: Required string, illustrating a readonly property. Required. :vartype read_prop: str - :ivar query_prop: Required int32, illustrating a query property. Required. - :vartype query_prop: int :ivar create_prop: Required string[], illustrating a create property. Required. :vartype create_prop: list[str] :ivar update_prop: Required int32[], illustrating a update property. Required. @@ -44,8 +42,6 @@ class VisibilityModel(_Model): read_prop: str = rest_field(name="readProp", visibility=["read"]) """Required string, illustrating a readonly property. Required.""" - query_prop: int = rest_field(name="queryProp", visibility=["query"]) - """Required int32, illustrating a query property. Required.""" create_prop: List[str] = rest_field(name="createProp", visibility=["create"]) """Required string[], illustrating a create property. Required.""" update_prop: List[int] = rest_field(name="updateProp", visibility=["update"]) @@ -57,7 +53,6 @@ class VisibilityModel(_Model): def __init__( self, *, - query_prop: int, create_prop: List[str], update_prop: List[int], delete_prop: bool, diff --git a/packages/typespec-python/test/azure/generated/headasbooleantrue/generated_tests/test_visibility.py b/packages/typespec-python/test/azure/generated/headasbooleantrue/generated_tests/test_visibility.py index a7cf96b179f..8752fa205bf 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleantrue/generated_tests/test_visibility.py +++ b/packages/typespec-python/test/azure/generated/headasbooleantrue/generated_tests/test_visibility.py @@ -17,7 +17,7 @@ class TestVisibility(VisibilityClientTestBase): def test_get_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.get_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -29,7 +29,7 @@ def test_get_model(self, visibility_endpoint): def test_head_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.head_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -41,7 +41,7 @@ def test_head_model(self, visibility_endpoint): def test_put_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.put_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -52,7 +52,7 @@ def test_put_model(self, visibility_endpoint): def test_patch_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.patch_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -63,7 +63,7 @@ def test_patch_model(self, visibility_endpoint): def test_post_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.post_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -74,7 +74,7 @@ def test_post_model(self, visibility_endpoint): def test_delete_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.delete_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself diff --git a/packages/typespec-python/test/azure/generated/headasbooleantrue/generated_tests/test_visibility_async.py b/packages/typespec-python/test/azure/generated/headasbooleantrue/generated_tests/test_visibility_async.py index 8ddd7f23ca0..191024e0c9f 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleantrue/generated_tests/test_visibility_async.py +++ b/packages/typespec-python/test/azure/generated/headasbooleantrue/generated_tests/test_visibility_async.py @@ -18,7 +18,7 @@ class TestVisibilityAsync(VisibilityClientTestBaseAsync): async def test_get_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.get_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -30,7 +30,7 @@ async def test_get_model(self, visibility_endpoint): async def test_head_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.head_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -42,7 +42,7 @@ async def test_head_model(self, visibility_endpoint): async def test_put_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.put_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -53,7 +53,7 @@ async def test_put_model(self, visibility_endpoint): async def test_patch_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.patch_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -64,7 +64,7 @@ async def test_patch_model(self, visibility_endpoint): async def test_post_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.post_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -75,7 +75,7 @@ async def test_post_model(self, visibility_endpoint): async def test_delete_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.delete_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself diff --git a/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/models/_models.py b/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/models/_models.py index a87780911d8..e4b8dcd1fd4 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/models/_models.py +++ b/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/models/_models.py @@ -32,8 +32,6 @@ class VisibilityModel(_Model): :ivar read_prop: Required string, illustrating a readonly property. Required. :vartype read_prop: str - :ivar query_prop: Required int32, illustrating a query property. Required. - :vartype query_prop: int :ivar create_prop: Required string[], illustrating a create property. Required. :vartype create_prop: list[str] :ivar update_prop: Required int32[], illustrating a update property. Required. @@ -44,8 +42,6 @@ class VisibilityModel(_Model): read_prop: str = rest_field(name="readProp", visibility=["read"]) """Required string, illustrating a readonly property. Required.""" - query_prop: int = rest_field(name="queryProp", visibility=["query"]) - """Required int32, illustrating a query property. Required.""" create_prop: List[str] = rest_field(name="createProp", visibility=["create"]) """Required string[], illustrating a create property. Required.""" update_prop: List[int] = rest_field(name="updateProp", visibility=["update"]) @@ -57,7 +53,6 @@ class VisibilityModel(_Model): def __init__( self, *, - query_prop: int, create_prop: List[str], update_prop: List[int], delete_prop: bool, diff --git a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/models/_models.py b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/models/_models.py index 2752e3b385b..df3d23f1039 100644 --- a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/models/_models.py +++ b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/models/_models.py @@ -5,8 +5,9 @@ # 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, Literal, Mapping, overload +from typing import Any, Mapping, overload from .._utils.model_base import Model as _Model, rest_field @@ -14,16 +15,10 @@ class PngImageAsJson(_Model): """PngImageAsJson. - :ivar content_type: Required. Default value is "application/json". - :vartype content_type: str :ivar content: Required. :vartype content: bytes """ - content_type: Literal["application/json"] = rest_field( - name="contentType", visibility=["read", "create", "update", "delete", "query"] - ) - """Required. Default value is \"application/json\".""" content: bytes = rest_field(visibility=["read", "create", "update", "delete", "query"], format="base64") """Required.""" @@ -43,4 +38,3 @@ def __init__(self, mapping: Mapping[str, Any]) -> None: def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) - self.content_type: Literal["application/json"] = "application/json" diff --git a/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py b/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py index b3a11f13110..17791e05ef4 100644 --- a/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py @@ -20,6 +20,7 @@ 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 StatusCodeRangeClientConfiguration @@ -37,19 +38,33 @@ def build_status_code_range_error_response_status_code_in_range_request( # pylint: disable=name-too-long **kwargs: Any, ) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = "/response/status-code-range/error-response-status-code-in-range" - return HttpRequest(method="GET", url=_url, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) def build_status_code_range_error_response_status_code404_request( # pylint: disable=name-too-long **kwargs: Any, ) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = "/response/status-code-range/error-response-status-code-404" - return HttpRequest(method="GET", url=_url, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) class _StatusCodeRangeClientOperationsMixin( diff --git a/packages/typespec-python/test/azure/generated/typetest-model-visibility/generated_tests/test_visibility.py b/packages/typespec-python/test/azure/generated/typetest-model-visibility/generated_tests/test_visibility.py index a7cf96b179f..8752fa205bf 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-visibility/generated_tests/test_visibility.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-visibility/generated_tests/test_visibility.py @@ -17,7 +17,7 @@ class TestVisibility(VisibilityClientTestBase): def test_get_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.get_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -29,7 +29,7 @@ def test_get_model(self, visibility_endpoint): def test_head_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.head_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -41,7 +41,7 @@ def test_head_model(self, visibility_endpoint): def test_put_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.put_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -52,7 +52,7 @@ def test_put_model(self, visibility_endpoint): def test_patch_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.patch_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -63,7 +63,7 @@ def test_patch_model(self, visibility_endpoint): def test_post_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.post_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -74,7 +74,7 @@ def test_post_model(self, visibility_endpoint): def test_delete_model(self, visibility_endpoint): client = self.create_client(endpoint=visibility_endpoint) response = client.delete_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself diff --git a/packages/typespec-python/test/azure/generated/typetest-model-visibility/generated_tests/test_visibility_async.py b/packages/typespec-python/test/azure/generated/typetest-model-visibility/generated_tests/test_visibility_async.py index 8ddd7f23ca0..191024e0c9f 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-visibility/generated_tests/test_visibility_async.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-visibility/generated_tests/test_visibility_async.py @@ -18,7 +18,7 @@ class TestVisibilityAsync(VisibilityClientTestBaseAsync): async def test_get_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.get_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -30,7 +30,7 @@ async def test_get_model(self, visibility_endpoint): async def test_head_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.head_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, query_prop=0, ) @@ -42,7 +42,7 @@ async def test_head_model(self, visibility_endpoint): async def test_put_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.put_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -53,7 +53,7 @@ async def test_put_model(self, visibility_endpoint): async def test_patch_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.patch_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -64,7 +64,7 @@ async def test_patch_model(self, visibility_endpoint): async def test_post_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.post_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself @@ -75,7 +75,7 @@ async def test_post_model(self, visibility_endpoint): async def test_delete_model(self, visibility_endpoint): client = self.create_async_client(endpoint=visibility_endpoint) response = await client.delete_model( - input={"createProp": ["str"], "deleteProp": bool, "queryProp": 0, "readProp": "str", "updateProp": [0]}, + input={"createProp": ["str"], "deleteProp": bool, "readProp": "str", "updateProp": [0]}, ) # please add some check logic here by yourself diff --git a/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py index a87780911d8..e4b8dcd1fd4 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py @@ -32,8 +32,6 @@ class VisibilityModel(_Model): :ivar read_prop: Required string, illustrating a readonly property. Required. :vartype read_prop: str - :ivar query_prop: Required int32, illustrating a query property. Required. - :vartype query_prop: int :ivar create_prop: Required string[], illustrating a create property. Required. :vartype create_prop: list[str] :ivar update_prop: Required int32[], illustrating a update property. Required. @@ -44,8 +42,6 @@ class VisibilityModel(_Model): read_prop: str = rest_field(name="readProp", visibility=["read"]) """Required string, illustrating a readonly property. Required.""" - query_prop: int = rest_field(name="queryProp", visibility=["query"]) - """Required int32, illustrating a query property. Required.""" create_prop: List[str] = rest_field(name="createProp", visibility=["create"]) """Required string[], illustrating a create property. Required.""" update_prop: List[int] = rest_field(name="updateProp", visibility=["update"]) @@ -57,7 +53,6 @@ class VisibilityModel(_Model): def __init__( self, *, - query_prop: int, create_prop: List[str], update_prop: List[int], delete_prop: bool, 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 index dc89eb01e77..c2c0f07f7da 100644 --- 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 @@ -13,6 +13,7 @@ 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 @@ -35,10 +36,17 @@ def build_api_key_valid_request(**kwargs: Any) -> HttpRequest: 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" - return HttpRequest(method="GET", url=_url, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) class _ApiKeyClientOperationsMixin( diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_operations/_operations.py index dc89eb01e77..c2c0f07f7da 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_operations/_operations.py @@ -13,6 +13,7 @@ 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 @@ -35,10 +36,17 @@ def build_api_key_valid_request(**kwargs: Any) -> HttpRequest: 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" - return HttpRequest(method="GET", url=_url, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) class _ApiKeyClientOperationsMixin( diff --git a/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py index 1c666305930..9912506b033 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py @@ -13,6 +13,7 @@ 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 CustomClientConfiguration @@ -35,10 +36,17 @@ def build_custom_valid_request(**kwargs: Any) -> HttpRequest: def build_custom_invalid_request(**kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = "/authentication/http/custom/invalid" - return HttpRequest(method="GET", url=_url, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) class _CustomClientOperationsMixin( diff --git a/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py index 99577d85f4d..b8c8eb49202 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py @@ -13,6 +13,7 @@ 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 OAuth2ClientConfiguration @@ -35,10 +36,17 @@ def build_oauth2_valid_request(**kwargs: Any) -> HttpRequest: def build_oauth2_invalid_request(**kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = "/authentication/oauth2/invalid" - return HttpRequest(method="GET", url=_url, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) class _OAuth2ClientOperationsMixin( diff --git a/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py b/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py index d60a70ab3a8..8afead9dc15 100644 --- a/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py @@ -26,8 +26,6 @@ class VisibilityModel(_Model): :ivar read_prop: Required string, illustrating a readonly property. Required. :vartype read_prop: str - :ivar query_prop: Required int32, illustrating a query property. Required. - :vartype query_prop: int :ivar create_prop: Required string[], illustrating a create property. Required. :vartype create_prop: list[str] :ivar update_prop: Required int32[], illustrating a update property. Required. @@ -38,8 +36,6 @@ class VisibilityModel(_Model): read_prop: str = rest_field(name="readProp", visibility=["read"]) """Required string, illustrating a readonly property. Required.""" - query_prop: int = rest_field(name="queryProp", visibility=["query"]) - """Required int32, illustrating a query property. Required.""" create_prop: List[str] = rest_field(name="createProp", visibility=["create"]) """Required string[], illustrating a create property. Required.""" update_prop: List[int] = rest_field(name="updateProp", visibility=["update"]) @@ -51,7 +47,6 @@ class VisibilityModel(_Model): def __init__( self, *, - query_prop: int, create_prop: List[str], update_prop: List[int], delete_prop: bool, diff --git a/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/models/_models.py b/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/models/_models.py index d60a70ab3a8..8afead9dc15 100644 --- a/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/models/_models.py @@ -26,8 +26,6 @@ class VisibilityModel(_Model): :ivar read_prop: Required string, illustrating a readonly property. Required. :vartype read_prop: str - :ivar query_prop: Required int32, illustrating a query property. Required. - :vartype query_prop: int :ivar create_prop: Required string[], illustrating a create property. Required. :vartype create_prop: list[str] :ivar update_prop: Required int32[], illustrating a update property. Required. @@ -38,8 +36,6 @@ class VisibilityModel(_Model): read_prop: str = rest_field(name="readProp", visibility=["read"]) """Required string, illustrating a readonly property. Required.""" - query_prop: int = rest_field(name="queryProp", visibility=["query"]) - """Required int32, illustrating a query property. Required.""" create_prop: List[str] = rest_field(name="createProp", visibility=["create"]) """Required string[], illustrating a create property. Required.""" update_prop: List[int] = rest_field(name="updateProp", visibility=["update"]) @@ -51,7 +47,6 @@ class VisibilityModel(_Model): def __init__( self, *, - query_prop: int, create_prop: List[str], update_prop: List[int], delete_prop: bool, diff --git a/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/differentbody/models/_models.py b/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/differentbody/models/_models.py index ac53a34c343..60eacb31f90 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/differentbody/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/differentbody/models/_models.py @@ -1,6 +1,7 @@ # coding=utf-8 +# pylint: disable=useless-super-delegation -from typing import Any, Literal, Mapping, overload +from typing import Any, Mapping, overload from ..._utils.model_base import Model as _Model, rest_field @@ -8,16 +9,10 @@ class PngImageAsJson(_Model): """PngImageAsJson. - :ivar content_type: Required. Default value is "application/json". - :vartype content_type: str :ivar content: Required. :vartype content: bytes """ - content_type: Literal["application/json"] = rest_field( - name="contentType", visibility=["read", "create", "update", "delete", "query"] - ) - """Required. Default value is \"application/json\".""" content: bytes = rest_field(visibility=["read", "create", "update", "delete", "query"], format="base64") """Required.""" @@ -37,4 +32,3 @@ def __init__(self, mapping: Mapping[str, Any]) -> None: def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) - self.content_type: Literal["application/json"] = "application/json" diff --git a/packages/typespec-python/test/unbranded/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py index 9ce5b023ba1..a41ccae8907 100644 --- a/packages/typespec-python/test/unbranded/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py @@ -13,6 +13,7 @@ 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 StatusCodeRangeClientConfiguration @@ -30,19 +31,33 @@ def build_status_code_range_error_response_status_code_in_range_request( # pylint: disable=name-too-long **kwargs: Any, ) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = "/response/status-code-range/error-response-status-code-in-range" - return HttpRequest(method="GET", url=_url, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) def build_status_code_range_error_response_status_code404_request( # pylint: disable=name-too-long **kwargs: Any, ) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = "/response/status-code-range/error-response-status-code-404" - return HttpRequest(method="GET", url=_url, **kwargs) + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) class _StatusCodeRangeClientOperationsMixin( diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py index d60a70ab3a8..8afead9dc15 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py @@ -26,8 +26,6 @@ class VisibilityModel(_Model): :ivar read_prop: Required string, illustrating a readonly property. Required. :vartype read_prop: str - :ivar query_prop: Required int32, illustrating a query property. Required. - :vartype query_prop: int :ivar create_prop: Required string[], illustrating a create property. Required. :vartype create_prop: list[str] :ivar update_prop: Required int32[], illustrating a update property. Required. @@ -38,8 +36,6 @@ class VisibilityModel(_Model): read_prop: str = rest_field(name="readProp", visibility=["read"]) """Required string, illustrating a readonly property. Required.""" - query_prop: int = rest_field(name="queryProp", visibility=["query"]) - """Required int32, illustrating a query property. Required.""" create_prop: List[str] = rest_field(name="createProp", visibility=["create"]) """Required string[], illustrating a create property. Required.""" update_prop: List[int] = rest_field(name="updateProp", visibility=["update"]) @@ -51,7 +47,6 @@ class VisibilityModel(_Model): def __init__( self, *, - query_prop: int, create_prop: List[str], update_prop: List[int], delete_prop: bool, From 564f1d60a3497c8c086bc0f64f057d2695703351 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 5 Aug 2025 11:31:38 -0400 Subject: [PATCH 26/34] fix mock tests --- .../test/azure/mock_api_tests/test_generation_subdir.py | 1 - .../asynctests/test_generation_subdir_async.py | 2 +- .../test/generic_mock_api_tests/test_generation_subdir.py | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 packages/typespec-python/test/azure/mock_api_tests/test_generation_subdir.py diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_generation_subdir.py b/packages/typespec-python/test/azure/mock_api_tests/test_generation_subdir.py deleted file mode 100644 index 47da9edef5c..00000000000 --- a/packages/typespec-python/test/azure/mock_api_tests/test_generation_subdir.py +++ /dev/null @@ -1 +0,0 @@ -# from authentication.apikey import 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 f7bc3cc2cd6..36084a9d065 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,7 @@ # license information. # -------------------------------------------------------------------------- import pytest -from authentication.apikey.aio import CustomizedApiKeyClient +from authentication.api.key.subdir.aio import CustomizedApiKeyClient @pytest.mark.asyncio 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 507f0b06807..23c21738cb8 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.apikey.subdir import CustomizedApiKeyClient +from authentication.api.key.subdir import CustomizedApiKeyClient def test_custom_method(key_credential): @@ -14,7 +14,7 @@ def test_custom_method(key_credential): def test_custom_model(): try: - from authentication.apikey import InvalidAuth + from authentication.api.key.subdir import InvalidAuth assert InvalidAuth is not None except ImportError: From bd2512af17919c58e8754d6646bc42154039accf Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 5 Aug 2025 11:32:31 -0400 Subject: [PATCH 27/34] add changeset --- .chronus/changes/generation_subdir-2025-7-5-11-32-14.md | 7 +++++++ .chronus/changes/generation_subdir-2025-7-5-11-32-25.md | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 .chronus/changes/generation_subdir-2025-7-5-11-32-14.md create mode 100644 .chronus/changes/generation_subdir-2025-7-5-11-32-25.md diff --git a/.chronus/changes/generation_subdir-2025-7-5-11-32-14.md b/.chronus/changes/generation_subdir-2025-7-5-11-32-14.md new file mode 100644 index 00000000000..75b8fba4c5e --- /dev/null +++ b/.chronus/changes/generation_subdir-2025-7-5-11-32-14.md @@ -0,0 +1,7 @@ +--- +changeKind: dependencies +packages: + - "@autorest/python" +--- + +Bump `http-client-python` dep \ No newline at end of file diff --git a/.chronus/changes/generation_subdir-2025-7-5-11-32-25.md b/.chronus/changes/generation_subdir-2025-7-5-11-32-25.md new file mode 100644 index 00000000000..638b8bff3e4 --- /dev/null +++ b/.chronus/changes/generation_subdir-2025-7-5-11-32-25.md @@ -0,0 +1,7 @@ +--- +changeKind: feature +packages: + - "@azure-tools/typespec-python" +--- + +Add support for `generation-subdir` \ No newline at end of file From 563c27403511f12a9e65284815373ad90029315f Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 5 Aug 2025 12:42:47 -0400 Subject: [PATCH 28/34] prep for version fix --- packages/autorest.python/package.json | 2 +- packages/typespec-python/package.json | 2 +- .../api/key/subdir/_generated/_version.py | 9 +++++++++ .../api/key/subdir/_generated/_version.py | 3 +++ pnpm-lock.yaml | 14 +++++++------- 5 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_version.py create mode 100644 packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_version.py diff --git a/packages/autorest.python/package.json b/packages/autorest.python/package.json index 29ec24df6e4..0dedec00684 100644 --- a/packages/autorest.python/package.json +++ b/packages/autorest.python/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md", "dependencies": { - "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", + "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4MDYwNC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", "@autorest/system-requirements": "~1.0.2", "fs-extra": "~11.2.0", "tsx": "~4.19.1" diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json index 7b563a41494..a8dc693ebbf 100644 --- a/packages/typespec-python/package.json +++ b/packages/typespec-python/package.json @@ -67,7 +67,7 @@ "js-yaml": "~4.1.0", "semver": "~7.6.2", "tsx": "~4.19.1", - "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", + "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4MDYwNC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz", "fs-extra": "~11.2.0" }, "devDependencies": { 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/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_version.py new file mode 100644 index 00000000000..be71c81bd28 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_version.py @@ -0,0 +1,9 @@ +# 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. +# -------------------------------------------------------------------------- + +VERSION = "1.0.0b1" 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/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_version.py new file mode 100644 index 00000000000..9f6458b8cda --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_version.py @@ -0,0 +1,3 @@ +# coding=utf-8 + +VERSION = "1.0.0b1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 74faeb2636f..cff07d2980f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,8 +60,8 @@ importers: specifier: ~1.0.2 version: 1.0.2 '@typespec/http-client-python': - specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz - version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iurth4uuk4s6znzuuc7ncenk2q) + specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4MDYwNC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz + version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4MDYwNC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iurth4uuk4s6znzuuc7ncenk2q) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -82,8 +82,8 @@ importers: packages/typespec-python: dependencies: '@typespec/http-client-python': - specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz - version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iurth4uuk4s6znzuuc7ncenk2q) + specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4MDYwNC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz + version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4MDYwNC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iurth4uuk4s6znzuuc7ncenk2q) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -1668,8 +1668,8 @@ packages: peerDependencies: '@typespec/compiler': ^1.2.1 - '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz': - resolution: {tarball: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz} + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4MDYwNC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz': + resolution: {tarball: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4MDYwNC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz} version: 0.14.2 engines: {node: '>=20.0.0'} peerDependencies: @@ -6422,7 +6422,7 @@ snapshots: dependencies: '@typespec/compiler': 1.2.1(@types/node@22.13.17) - '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE3ODY1OS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iurth4uuk4s6znzuuc7ncenk2q)': + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4MDYwNC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.14.2.tgz(iurth4uuk4s6znzuuc7ncenk2q)': dependencies: '@azure-tools/typespec-autorest': 0.58.0(vddu6w2yloigenmssnpyjivoim) '@azure-tools/typespec-azure-core': 0.58.0(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))(@typespec/rest@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))) From 5389df53c6224c877878e4766a247840853f1e45 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 5 Aug 2025 12:59:21 -0400 Subject: [PATCH 29/34] format --- packages/typespec-python/scripts/eng/regenerate.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/typespec-python/scripts/eng/regenerate.ts b/packages/typespec-python/scripts/eng/regenerate.ts index fc053ac2af9..c356238257b 100644 --- a/packages/typespec-python/scripts/eng/regenerate.ts +++ b/packages/typespec-python/scripts/eng/regenerate.ts @@ -132,13 +132,12 @@ const EMITTER_OPTIONS: Record | Record Date: Tue, 5 Aug 2025 13:32:28 -0400 Subject: [PATCH 30/34] lint and fix problems in customized client --- .../authentication/api/key/subdir/_client.py | 11 +++++++++-- .../authentication/api/key/subdir/aio/_client.py | 11 +++++++++-- .../authentication/api/key/subdir/_client.py | 13 ++++++++++--- .../authentication/api/key/subdir/aio/_client.py | 13 ++++++++++--- 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py index ea94bd2ae24..0cf89a66f9e 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py @@ -3,6 +3,8 @@ # 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 import ApiKeyClient as GeneratedClient @@ -16,9 +18,14 @@ class CustomizedApiKeyClient: """ def __init__( - self, credential: AzureKeyCredential, *, endpoint: str = "http://localhost:3000", **kwargs: Any + self, + credential: AzureKeyCredential, + *, + endpoint: str = "http://localhost:3000", + api_version: Optional[str] = None, + **kwargs: Any ) -> None: - self._client = GeneratedClient(credential=credential, endpoint=endpoint, **kwargs) + 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. 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 index 04408789ce1..34cbd7e948b 100644 --- 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 @@ -3,6 +3,8 @@ # 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 @@ -16,9 +18,14 @@ class CustomizedApiKeyClient: """ def __init__( - self, credential: AzureKeyCredential, *, endpoint: str = "http://localhost:3000", **kwargs: Any + self, + credential: AzureKeyCredential, + *, + endpoint: str = "http://localhost:3000", + api_version: Optional[str] = None, + **kwargs: Any ) -> None: - self._client = GeneratedClient(credential=credential, endpoint=endpoint, **kwargs) + 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. 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 index ea94bd2ae24..3a7f4c52d10 100644 --- 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 @@ -3,6 +3,8 @@ # 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 @@ -10,15 +12,20 @@ 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 + :type credential: ~corehttp.credentials.ServiceKeyCredential :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 + self, + credential: ServiceKeyCredential, + *, + endpoint: str = "http://localhost:3000", + api_version: Optional[str] = None, + **kwargs: Any ) -> None: - self._client = GeneratedClient(credential=credential, endpoint=endpoint, **kwargs) + 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. 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 index 04408789ce1..8bbef19e53d 100644 --- 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 @@ -3,6 +3,8 @@ # 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 @@ -10,15 +12,20 @@ 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 + :type credential: ~corehttp.credentials.ServiceKeyCredential :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 + self, + credential: ServiceKeyCredential, + *, + endpoint: str = "http://localhost:3000", + api_version: Optional[str] = None, + **kwargs: Any ) -> None: - self._client = GeneratedClient(credential=credential, endpoint=endpoint, **kwargs) + 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. From d71f800bd8cf6132143feb14a9a1f9abd0571227 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 5 Aug 2025 13:49:47 -0400 Subject: [PATCH 31/34] fix context managing in mock api tests --- .../asynctests/test_generation_subdir_async.py | 4 ++-- .../test/generic_mock_api_tests/test_generation_subdir.py | 4 ++-- 2 files changed, 4 insertions(+), 4 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 36084a9d065..44d37c30794 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 @@ -9,5 +9,5 @@ @pytest.mark.asyncio async def test_custom_method(key_credential): - async with CustomizedApiKeyClient(key_credential("valid-key")) as client: - assert await client.custom_method() + client = CustomizedApiKeyClient(key_credential("valid-key")) + assert await client.custom_method() 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 23c21738cb8..324b201c55a 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,8 +8,8 @@ def test_custom_method(key_credential): - with CustomizedApiKeyClient(key_credential("valid-key")) as client: - assert client.custom_method() + client = CustomizedApiKeyClient(key_credential("valid-key")) + assert client.custom_method() def test_custom_model(): From 2e2e6b5230ba0a0ff645218ea8c4db5998f47995 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 5 Aug 2025 13:50:30 -0400 Subject: [PATCH 32/34] add back patch ops --- .../apikey/_operations/_patch.py | 25 +++++++++++++++---- .../apikey/aio/_operations/_patch.py | 25 +++++++++++++++---- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_patch.py index 8bcb627aa47..fc4fac79b3b 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_patch.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_patch.py @@ -1,15 +1,30 @@ # 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. -# -------------------------------------------------------------------------- + """Customize generated code here. Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize """ from typing import List -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level +from ._operations import _ApiKeyClientOperationsMixin as Generated + + +class _ApiKeyClientOperationsMixin(Generated): + + def patch_added_operation(self) -> bool: + """This is a placeholder for the operation that was added in the patch. + + This method is a no-op and does not perform any action. + + :return: Always returns True. + :rtype: bool + """ + return True + + +__all__: List[str] = [ + "_ApiKeyClientOperationsMixin" +] # Add all objects you want publicly available to users at this package level def patch_sdk(): diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/aio/_operations/_patch.py index 8bcb627aa47..fc4fac79b3b 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/aio/_operations/_patch.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/aio/_operations/_patch.py @@ -1,15 +1,30 @@ # 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. -# -------------------------------------------------------------------------- + """Customize generated code here. Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize """ from typing import List -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level +from ._operations import _ApiKeyClientOperationsMixin as Generated + + +class _ApiKeyClientOperationsMixin(Generated): + + def patch_added_operation(self) -> bool: + """This is a placeholder for the operation that was added in the patch. + + This method is a no-op and does not perform any action. + + :return: Always returns True. + :rtype: bool + """ + return True + + +__all__: List[str] = [ + "_ApiKeyClientOperationsMixin" +] # Add all objects you want publicly available to users at this package level def patch_sdk(): From 6c4e67eb1c0044862f0b866e3832015aed750166 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 5 Aug 2025 14:12:59 -0400 Subject: [PATCH 33/34] fix sensitive word test --- .../test/unbranded/mock_api_tests/test_unbranded.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 df4549b3907..bfb276ca54f 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 @@ -54,6 +54,9 @@ def test_sensitive_word(): check_folder = (Path(os.path.dirname(__file__)) / "../generated").resolve() assert [] == check_sensitive_word(check_folder, "azure") # after update cadl-ranch, it shall also equal to [] - assert ["authentication-oauth2", "authentication-union", "setuppy-authentication-union"] == check_sensitive_word( - check_folder, "microsoft" - ) + assert [ + "authentication-api-key-subdir", + "authentication-oauth2", + "authentication-union", + "setuppy-authentication-union", + ] == check_sensitive_word(check_folder, "microsoft") From 3be8c2489bc2801215bceacdf4d0cb472d0e0664 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 5 Aug 2025 14:44:26 -0400 Subject: [PATCH 34/34] fix docs --- .../authentication/api/key/subdir/_client.py | 2 ++ .../authentication/api/key/subdir/aio/_client.py | 2 ++ .../authentication/api/key/subdir/_client.py | 2 ++ .../authentication/api/key/subdir/aio/_client.py | 2 ++ 4 files changed, 8 insertions(+) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py index 0cf89a66f9e..5abe1d2b287 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_client.py @@ -15,6 +15,8 @@ class CustomizedApiKeyClient: :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__( 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 index 34cbd7e948b..ab105fc8e89 100644 --- 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 @@ -15,6 +15,8 @@ class CustomizedApiKeyClient: :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__( 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 index 3a7f4c52d10..35edabef5af 100644 --- 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 @@ -15,6 +15,8 @@ class CustomizedApiKeyClient: :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__( 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 index 8bbef19e53d..03a11bfbcea 100644 --- 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 @@ -15,6 +15,8 @@ class CustomizedApiKeyClient: :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__(