From 37e7f9bb63d9d7be6ec5eed6621f626ecca9ceee Mon Sep 17 00:00:00 2001 From: Chenjie Shi Date: Mon, 21 Apr 2025 12:02:17 +0000 Subject: [PATCH 1/7] upgrade emitter --- packages/typespec-python/package.json | 8 +- .../CHANGELOG.md | 5 + .../LICENSE | 21 + .../MANIFEST.in | 9 + .../README.md | 43 + .../apiview-properties.json | 19 + .../dev_requirements.txt | 3 + .../generated_tests/conftest.py | 75 + .../generated_tests/test_header_param.py | 35 + .../test_header_param_async.py | 36 + .../generated_tests/test_mixed_params.py | 37 + .../test_mixed_params_async.py | 38 + .../generated_tests/test_multiple_params.py | 35 + .../test_multiple_params_async.py | 36 + .../generated_tests/test_param_alias.py | 31 + .../generated_tests/test_param_alias_async.py | 32 + .../generated_tests/test_path_param.py | 40 + .../generated_tests/test_path_param_async.py | 41 + .../generated_tests/testpreparer.py | 96 + .../generated_tests/testpreparer_async.py | 70 + .../setup.py | 72 + .../specs/__init__.py | 1 + .../specs/azure/__init__.py | 1 + .../specs/azure/clientgenerator/__init__.py | 1 + .../azure/clientgenerator/core/__init__.py | 1 + .../core/clientinitialization/__init__.py | 40 + .../core/clientinitialization/_client.py | 413 ++++ .../clientinitialization/_configuration.py | 193 ++ .../core/clientinitialization/_model_base.py | 1232 ++++++++++ .../_operations/__init__.py | 33 + .../_operations/_operations.py | 951 ++++++++ .../_operations/_patch.py | 21 + .../core/clientinitialization/_patch.py | 21 + .../clientinitialization/_serialization.py | 2032 +++++++++++++++++ .../core/clientinitialization/_vendor.py | 67 + .../core/clientinitialization/_version.py | 9 + .../core/clientinitialization/aio/__init__.py | 37 + .../core/clientinitialization/aio/_client.py | 423 ++++ .../aio/_configuration.py | 193 ++ .../aio/_operations/__init__.py | 33 + .../aio/_operations/_operations.py | 775 +++++++ .../aio/_operations/_patch.py | 21 + .../core/clientinitialization/aio/_patch.py | 21 + .../core/clientinitialization/aio/_vendor.py | 67 + .../clientinitialization/models/__init__.py | 31 + .../clientinitialization/models/_models.py | 115 + .../clientinitialization/models/_patch.py | 21 + .../core/clientinitialization/py.typed | 1 + .../azure-core-page/apiview-properties.json | 3 +- .../generated_tests/test_page.py | 11 + .../generated_tests/test_page_async.py | 11 + .../core/page/aio/operations/_operations.py | 90 + .../azure/core/page/operations/_operations.py | 111 + .../apiview-properties.json | 1 + .../aio/operations/_operations.py | 54 +- .../operationtemplates/models/__init__.py | 2 + .../operationtemplates/models/_models.py | 28 + .../operations/_operations.py | 54 +- .../generated/parameters-path/CHANGELOG.md | 5 + .../azure/generated/parameters-path/LICENSE | 21 + .../generated/parameters-path/MANIFEST.in | 6 + .../azure/generated/parameters-path/README.md | 43 + .../parameters-path/apiview-properties.json | 7 + .../parameters-path/dev_requirements.txt | 3 + .../generated_tests/conftest.py | 35 + .../generated_tests/test_path.py | 33 + .../generated_tests/test_path_async.py | 34 + .../generated_tests/testpreparer.py | 24 + .../generated_tests/testpreparer_async.py | 20 + .../parameters-path/parameters/__init__.py | 1 + .../parameters/path/__init__.py | 32 + .../parameters/path/_client.py | 92 + .../parameters/path/_configuration.py | 42 + .../parameters/path/_model_base.py | 1232 ++++++++++ .../parameters/path/_operations/__init__.py | 25 + .../path/_operations/_operations.py | 153 ++ .../parameters/path/_operations/_patch.py | 21 + .../parameters-path/parameters/path/_patch.py | 21 + .../parameters/path/_serialization.py | 2032 +++++++++++++++++ .../parameters/path/_vendor.py | 25 + .../parameters/path/_version.py | 9 + .../parameters/path/aio/__init__.py | 29 + .../parameters/path/aio/_client.py | 94 + .../parameters/path/aio/_configuration.py | 42 + .../path/aio/_operations/__init__.py | 25 + .../path/aio/_operations/_operations.py | 125 + .../parameters/path/aio/_operations/_patch.py | 21 + .../parameters/path/aio/_patch.py | 21 + .../parameters/path/aio/_vendor.py | 25 + .../parameters-path/parameters/path/py.typed | 1 + .../azure/generated/parameters-path/setup.py | 69 + ...erator_core_client_initialization_async.py | 50 + ...nt_generator_core_client_initialization.py | 44 + .../test/azure/requirements.txt | 4 +- .../asynctests/test_parameters_path_async.py | 24 + .../test_payload_json_merge_patch_async.py | 2 +- .../test_parameters_path.py | 22 + .../test_payload_json_merge_patch.py | 2 +- .../generated/parameters-path/CHANGELOG.md | 5 + .../generated/parameters-path/MANIFEST.in | 6 + .../generated/parameters-path/README.md | 0 .../parameters-path/parameters/__init__.py | 1 + .../parameters/path/__init__.py | 26 + .../parameters/path/_client.py | 79 + .../parameters/path/_configuration.py | 33 + .../parameters/path/_model_base.py | 1226 ++++++++++ .../parameters/path/_operations/__init__.py | 19 + .../path/_operations/_operations.py | 140 ++ .../parameters/path/_operations/_patch.py | 18 + .../parameters-path/parameters/path/_patch.py | 18 + .../parameters/path/_serialization.py | 2026 ++++++++++++++++ .../parameters/path/_vendor.py | 18 + .../parameters/path/_version.py | 3 + .../parameters/path/aio/__init__.py | 23 + .../parameters/path/aio/_client.py | 81 + .../parameters/path/aio/_configuration.py | 33 + .../path/aio/_operations/__init__.py | 19 + .../path/aio/_operations/_operations.py | 115 + .../parameters/path/aio/_operations/_patch.py | 18 + .../parameters/path/aio/_patch.py | 18 + .../parameters/path/aio/_vendor.py | 18 + .../parameters-path/parameters/path/py.typed | 1 + .../generated/parameters-path/setup.py | 60 + .../test/unbranded/requirements.txt | 1 + pnpm-lock.yaml | 54 +- 125 files changed, 16407 insertions(+), 69 deletions(-) create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/CHANGELOG.md create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/LICENSE create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/MANIFEST.in create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/README.md create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/apiview-properties.json create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/dev_requirements.txt create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/conftest.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_header_param.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_header_param_async.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_mixed_params.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_mixed_params_async.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_multiple_params.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_multiple_params_async.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_param_alias.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_param_alias_async.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_path_param.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_path_param_async.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/testpreparer.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/testpreparer_async.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/setup.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_client.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_configuration.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_model_base.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_operations/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_operations/_operations.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_operations/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_serialization.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_vendor.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_version.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_client.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_configuration.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_operations/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_operations/_operations.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_operations/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_vendor.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/models/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/models/_models.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/models/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/py.typed create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/CHANGELOG.md create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/LICENSE create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/MANIFEST.in create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/README.md create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/apiview-properties.json create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/dev_requirements.txt create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/generated_tests/conftest.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/generated_tests/test_path.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/generated_tests/test_path_async.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/generated_tests/testpreparer.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/generated_tests/testpreparer_async.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_client.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_configuration.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_model_base.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/_operations.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_serialization.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_vendor.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_version.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_client.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_configuration.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/__init__.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/_operations.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_patch.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_vendor.py create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/parameters/path/py.typed create mode 100644 packages/typespec-python/test/azure/generated/parameters-path/setup.py create mode 100644 packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_initialization_async.py create mode 100644 packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_client_initialization.py create mode 100644 packages/typespec-python/test/generic_mock_api_tests/asynctests/test_parameters_path_async.py create mode 100644 packages/typespec-python/test/generic_mock_api_tests/test_parameters_path.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/CHANGELOG.md create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/MANIFEST.in create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/README.md create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_client.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_configuration.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_model_base.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_operations/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_operations/_operations.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_operations/_patch.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_patch.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_serialization.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_vendor.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_version.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_client.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_configuration.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_operations/__init__.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_operations/_operations.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_operations/_patch.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_patch.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_vendor.py create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/py.typed create mode 100644 packages/typespec-python/test/unbranded/generated/parameters-path/setup.py diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json index ab8b4d53cb7..aad3cbf104c 100644 --- a/packages/typespec-python/package.json +++ b/packages/typespec-python/package.json @@ -58,7 +58,7 @@ "@azure-tools/typespec-azure-resource-manager": ">=0.54.0 <1.0.0", "@azure-tools/typespec-autorest": ">=0.54.0 <1.0.0", "@azure-tools/typespec-azure-rulesets": ">=0.54.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.54.0 <1.0.0" + "@azure-tools/typespec-client-generator-core": ">=0.54.2 <1.0.0" }, "dependencies": { "js-yaml": "~4.1.0", @@ -81,9 +81,9 @@ "@azure-tools/typespec-azure-core": "~0.54.0", "@azure-tools/typespec-azure-rulesets": "~0.54.0", "@azure-tools/typespec-autorest": "~0.54.0", - "@azure-tools/typespec-client-generator-core": "~0.54.0", - "@azure-tools/azure-http-specs": "0.1.0-alpha.13", - "@typespec/http-specs": "0.1.0-alpha.17", + "@azure-tools/typespec-client-generator-core": "~0.54.2", + "@azure-tools/azure-http-specs": "0.1.0-alpha.14", + "@typespec/http-specs": "0.1.0-alpha.19", "@types/js-yaml": "~4.0.5", "@types/node": "~22.13.14", "@types/yargs": "~17.0.33", diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/CHANGELOG.md b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/CHANGELOG.md new file mode 100644 index 00000000000..628743d283a --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/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/azure-client-generator-core-client-initialization/LICENSE b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/LICENSE new file mode 100644 index 00000000000..63447fd8bbb --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/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/azure-client-generator-core-client-initialization/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/MANIFEST.in new file mode 100644 index 00000000000..8a97fb91976 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/MANIFEST.in @@ -0,0 +1,9 @@ +include *.md +include LICENSE +include specs/azure/clientgenerator/core/clientinitialization/py.typed +recursive-include tests *.py +recursive-include samples *.py *.md +include specs/__init__.py +include specs/azure/__init__.py +include specs/azure/clientgenerator/__init__.py +include specs/azure/clientgenerator/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/README.md b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/README.md new file mode 100644 index 00000000000..bb0476a1e22 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/README.md @@ -0,0 +1,43 @@ +# Specs Azure Clientgenerator Core Clientinitialization client library for Python + + +## Getting started + +### Install the package + +```bash +python -m pip install specs-azure-clientgenerator-core-clientinitialization +``` + +#### 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 Specs Azure Clientgenerator Core Clientinitialization 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/azure-client-generator-core-client-initialization/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/apiview-properties.json new file mode 100644 index 00000000000..8bbac3f9070 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/apiview-properties.json @@ -0,0 +1,19 @@ +{ + "CrossLanguagePackageId": "Service", + "CrossLanguageDefinitionId": { + "specs.azure.clientgenerator.core.clientinitialization.models.BlobProperties": "Service.BlobProperties", + "specs.azure.clientgenerator.core.clientinitialization.models.Input": "Service.Input", + "specs.azure.clientgenerator.core.clientinitialization.models.WithBodyRequest": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.withBody.Request.anonymous", + "specs.azure.clientgenerator.core.clientinitialization.HeaderParamClient.with_query": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.HeaderParam.withQuery", + "specs.azure.clientgenerator.core.clientinitialization.HeaderParamClient.with_body": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.HeaderParam.withBody", + "specs.azure.clientgenerator.core.clientinitialization.MultipleParamsClient.with_query": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.MultipleParams.withQuery", + "specs.azure.clientgenerator.core.clientinitialization.MultipleParamsClient.with_body": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.MultipleParams.withBody", + "specs.azure.clientgenerator.core.clientinitialization.MixedParamsClient.with_query": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.MixedParams.withQuery", + "specs.azure.clientgenerator.core.clientinitialization.MixedParamsClient.with_body": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.MixedParams.withBody", + "specs.azure.clientgenerator.core.clientinitialization.PathParamClient.with_query": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.PathParam.withQuery", + "specs.azure.clientgenerator.core.clientinitialization.PathParamClient.get_standalone": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.PathParam.getStandalone", + "specs.azure.clientgenerator.core.clientinitialization.PathParamClient.delete_standalone": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.PathParam.deleteStandalone", + "specs.azure.clientgenerator.core.clientinitialization.ParamAliasClient.with_aliased_name": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.ParamAlias.withAliasedName", + "specs.azure.clientgenerator.core.clientinitialization.ParamAliasClient.with_original_name": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.ParamAlias.withOriginalName" + } +} \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/dev_requirements.txt b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/dev_requirements.txt new file mode 100644 index 00000000000..10548647144 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/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/azure-client-generator-core-client-initialization/generated_tests/conftest.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/conftest.py new file mode 100644 index 00000000000..bc1efd0f372 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/conftest.py @@ -0,0 +1,75 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +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): + headerparam_subscription_id = os.environ.get("HEADERPARAM_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") + headerparam_tenant_id = os.environ.get("HEADERPARAM_TENANT_ID", "00000000-0000-0000-0000-000000000000") + headerparam_client_id = os.environ.get("HEADERPARAM_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + headerparam_client_secret = os.environ.get("HEADERPARAM_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=headerparam_subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=headerparam_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=headerparam_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=headerparam_client_secret, value="00000000-0000-0000-0000-000000000000") + + multipleparams_subscription_id = os.environ.get( + "MULTIPLEPARAMS_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000" + ) + multipleparams_tenant_id = os.environ.get("MULTIPLEPARAMS_TENANT_ID", "00000000-0000-0000-0000-000000000000") + multipleparams_client_id = os.environ.get("MULTIPLEPARAMS_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + multipleparams_client_secret = os.environ.get( + "MULTIPLEPARAMS_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000" + ) + add_general_regex_sanitizer(regex=multipleparams_subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=multipleparams_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=multipleparams_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=multipleparams_client_secret, value="00000000-0000-0000-0000-000000000000") + + mixedparams_subscription_id = os.environ.get("MIXEDPARAMS_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") + mixedparams_tenant_id = os.environ.get("MIXEDPARAMS_TENANT_ID", "00000000-0000-0000-0000-000000000000") + mixedparams_client_id = os.environ.get("MIXEDPARAMS_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + mixedparams_client_secret = os.environ.get("MIXEDPARAMS_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=mixedparams_subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=mixedparams_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=mixedparams_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=mixedparams_client_secret, value="00000000-0000-0000-0000-000000000000") + + pathparam_subscription_id = os.environ.get("PATHPARAM_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") + pathparam_tenant_id = os.environ.get("PATHPARAM_TENANT_ID", "00000000-0000-0000-0000-000000000000") + pathparam_client_id = os.environ.get("PATHPARAM_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + pathparam_client_secret = os.environ.get("PATHPARAM_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=pathparam_subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=pathparam_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=pathparam_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=pathparam_client_secret, value="00000000-0000-0000-0000-000000000000") + + paramalias_subscription_id = os.environ.get("PARAMALIAS_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") + paramalias_tenant_id = os.environ.get("PARAMALIAS_TENANT_ID", "00000000-0000-0000-0000-000000000000") + paramalias_client_id = os.environ.get("PARAMALIAS_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + paramalias_client_secret = os.environ.get("PARAMALIAS_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=paramalias_subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=paramalias_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=paramalias_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=paramalias_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/azure-client-generator-core-client-initialization/generated_tests/test_header_param.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_header_param.py new file mode 100644 index 00000000000..b31ec5cf500 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_header_param.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 pytest +from devtools_testutils import recorded_by_proxy +from testpreparer import HeaderParamClientTestBase, HeaderParamPreparer + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestHeaderParam(HeaderParamClientTestBase): + @HeaderParamPreparer() + @recorded_by_proxy + def test_with_query(self, headerparam_endpoint): + client = self.create_client(endpoint=headerparam_endpoint) + response = client.with_query( + id="str", + ) + + # please add some check logic here by yourself + # ... + + @HeaderParamPreparer() + @recorded_by_proxy + def test_with_body(self, headerparam_endpoint): + client = self.create_client(endpoint=headerparam_endpoint) + response = client.with_body( + body={"name": "str"}, + ) + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_header_param_async.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_header_param_async.py new file mode 100644 index 00000000000..787cb30d7bf --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_header_param_async.py @@ -0,0 +1,36 @@ +# 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 HeaderParamPreparer +from testpreparer_async import HeaderParamClientTestBaseAsync + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestHeaderParamAsync(HeaderParamClientTestBaseAsync): + @HeaderParamPreparer() + @recorded_by_proxy_async + async def test_with_query(self, headerparam_endpoint): + client = self.create_async_client(endpoint=headerparam_endpoint) + response = await client.with_query( + id="str", + ) + + # please add some check logic here by yourself + # ... + + @HeaderParamPreparer() + @recorded_by_proxy_async + async def test_with_body(self, headerparam_endpoint): + client = self.create_async_client(endpoint=headerparam_endpoint) + response = await client.with_body( + body={"name": "str"}, + ) + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_mixed_params.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_mixed_params.py new file mode 100644 index 00000000000..396cff2001f --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_mixed_params.py @@ -0,0 +1,37 @@ +# 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 MixedParamsClientTestBase, MixedParamsPreparer + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestMixedParams(MixedParamsClientTestBase): + @MixedParamsPreparer() + @recorded_by_proxy + def test_with_query(self, mixedparams_endpoint): + client = self.create_client(endpoint=mixedparams_endpoint) + response = client.with_query( + region="str", + id="str", + ) + + # please add some check logic here by yourself + # ... + + @MixedParamsPreparer() + @recorded_by_proxy + def test_with_body(self, mixedparams_endpoint): + client = self.create_client(endpoint=mixedparams_endpoint) + response = client.with_body( + body={"name": "str"}, + region="str", + ) + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_mixed_params_async.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_mixed_params_async.py new file mode 100644 index 00000000000..9e962339c9e --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_mixed_params_async.py @@ -0,0 +1,38 @@ +# 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 MixedParamsPreparer +from testpreparer_async import MixedParamsClientTestBaseAsync + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestMixedParamsAsync(MixedParamsClientTestBaseAsync): + @MixedParamsPreparer() + @recorded_by_proxy_async + async def test_with_query(self, mixedparams_endpoint): + client = self.create_async_client(endpoint=mixedparams_endpoint) + response = await client.with_query( + region="str", + id="str", + ) + + # please add some check logic here by yourself + # ... + + @MixedParamsPreparer() + @recorded_by_proxy_async + async def test_with_body(self, mixedparams_endpoint): + client = self.create_async_client(endpoint=mixedparams_endpoint) + response = await client.with_body( + body={"name": "str"}, + region="str", + ) + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_multiple_params.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_multiple_params.py new file mode 100644 index 00000000000..92b624f15bf --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_multiple_params.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 pytest +from devtools_testutils import recorded_by_proxy +from testpreparer import MultipleParamsClientTestBase, MultipleParamsPreparer + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestMultipleParams(MultipleParamsClientTestBase): + @MultipleParamsPreparer() + @recorded_by_proxy + def test_with_query(self, multipleparams_endpoint): + client = self.create_client(endpoint=multipleparams_endpoint) + response = client.with_query( + id="str", + ) + + # please add some check logic here by yourself + # ... + + @MultipleParamsPreparer() + @recorded_by_proxy + def test_with_body(self, multipleparams_endpoint): + client = self.create_client(endpoint=multipleparams_endpoint) + response = client.with_body( + body={"name": "str"}, + ) + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_multiple_params_async.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_multiple_params_async.py new file mode 100644 index 00000000000..14ef35169bc --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_multiple_params_async.py @@ -0,0 +1,36 @@ +# 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 MultipleParamsPreparer +from testpreparer_async import MultipleParamsClientTestBaseAsync + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestMultipleParamsAsync(MultipleParamsClientTestBaseAsync): + @MultipleParamsPreparer() + @recorded_by_proxy_async + async def test_with_query(self, multipleparams_endpoint): + client = self.create_async_client(endpoint=multipleparams_endpoint) + response = await client.with_query( + id="str", + ) + + # please add some check logic here by yourself + # ... + + @MultipleParamsPreparer() + @recorded_by_proxy_async + async def test_with_body(self, multipleparams_endpoint): + client = self.create_async_client(endpoint=multipleparams_endpoint) + response = await client.with_body( + body={"name": "str"}, + ) + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_param_alias.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_param_alias.py new file mode 100644 index 00000000000..8680bbb0cd5 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_param_alias.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 ParamAliasClientTestBase, ParamAliasPreparer + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestParamAlias(ParamAliasClientTestBase): + @ParamAliasPreparer() + @recorded_by_proxy + def test_with_aliased_name(self, paramalias_endpoint): + client = self.create_client(endpoint=paramalias_endpoint) + response = client.with_aliased_name() + + # please add some check logic here by yourself + # ... + + @ParamAliasPreparer() + @recorded_by_proxy + def test_with_original_name(self, paramalias_endpoint): + client = self.create_client(endpoint=paramalias_endpoint) + response = client.with_original_name() + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_param_alias_async.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_param_alias_async.py new file mode 100644 index 00000000000..a9afaa01686 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_param_alias_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 ParamAliasPreparer +from testpreparer_async import ParamAliasClientTestBaseAsync + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestParamAliasAsync(ParamAliasClientTestBaseAsync): + @ParamAliasPreparer() + @recorded_by_proxy_async + async def test_with_aliased_name(self, paramalias_endpoint): + client = self.create_async_client(endpoint=paramalias_endpoint) + response = await client.with_aliased_name() + + # please add some check logic here by yourself + # ... + + @ParamAliasPreparer() + @recorded_by_proxy_async + async def test_with_original_name(self, paramalias_endpoint): + client = self.create_async_client(endpoint=paramalias_endpoint) + response = await client.with_original_name() + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_path_param.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_path_param.py new file mode 100644 index 00000000000..66aa7f93817 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_path_param.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. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils import recorded_by_proxy +from testpreparer import PathParamClientTestBase, PathParamPreparer + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestPathParam(PathParamClientTestBase): + @PathParamPreparer() + @recorded_by_proxy + def test_with_query(self, pathparam_endpoint): + client = self.create_client(endpoint=pathparam_endpoint) + response = client.with_query() + + # please add some check logic here by yourself + # ... + + @PathParamPreparer() + @recorded_by_proxy + def test_get_standalone(self, pathparam_endpoint): + client = self.create_client(endpoint=pathparam_endpoint) + response = client.get_standalone() + + # please add some check logic here by yourself + # ... + + @PathParamPreparer() + @recorded_by_proxy + def test_delete_standalone(self, pathparam_endpoint): + client = self.create_client(endpoint=pathparam_endpoint) + response = client.delete_standalone() + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_path_param_async.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_path_param_async.py new file mode 100644 index 00000000000..43c3d4ebed8 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_path_param_async.py @@ -0,0 +1,41 @@ +# 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 PathParamPreparer +from testpreparer_async import PathParamClientTestBaseAsync + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestPathParamAsync(PathParamClientTestBaseAsync): + @PathParamPreparer() + @recorded_by_proxy_async + async def test_with_query(self, pathparam_endpoint): + client = self.create_async_client(endpoint=pathparam_endpoint) + response = await client.with_query() + + # please add some check logic here by yourself + # ... + + @PathParamPreparer() + @recorded_by_proxy_async + async def test_get_standalone(self, pathparam_endpoint): + client = self.create_async_client(endpoint=pathparam_endpoint) + response = await client.get_standalone() + + # please add some check logic here by yourself + # ... + + @PathParamPreparer() + @recorded_by_proxy_async + async def test_delete_standalone(self, pathparam_endpoint): + client = self.create_async_client(endpoint=pathparam_endpoint) + response = await client.delete_standalone() + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/testpreparer.py new file mode 100644 index 00000000000..3e8c51fbc43 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/testpreparer.py @@ -0,0 +1,96 @@ +# 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 devtools_testutils import AzureRecordedTestCase, PowerShellPreparer +import functools +from specs.azure.clientgenerator.core.clientinitialization import ( + HeaderParamClient, + MixedParamsClient, + MultipleParamsClient, + ParamAliasClient, + PathParamClient, +) + + +class HeaderParamClientTestBase(AzureRecordedTestCase): + + def create_client(self, endpoint): + credential = self.get_credential(HeaderParamClient) + return self.create_client_from_credential( + HeaderParamClient, + credential=credential, + endpoint=endpoint, + ) + + +HeaderParamPreparer = functools.partial( + PowerShellPreparer, "headerparam", headerparam_endpoint="https://fake_headerparam_endpoint.com" +) + + +class MultipleParamsClientTestBase(AzureRecordedTestCase): + + def create_client(self, endpoint): + credential = self.get_credential(MultipleParamsClient) + return self.create_client_from_credential( + MultipleParamsClient, + credential=credential, + endpoint=endpoint, + ) + + +MultipleParamsPreparer = functools.partial( + PowerShellPreparer, "multipleparams", multipleparams_endpoint="https://fake_multipleparams_endpoint.com" +) + + +class MixedParamsClientTestBase(AzureRecordedTestCase): + + def create_client(self, endpoint): + credential = self.get_credential(MixedParamsClient) + return self.create_client_from_credential( + MixedParamsClient, + credential=credential, + endpoint=endpoint, + ) + + +MixedParamsPreparer = functools.partial( + PowerShellPreparer, "mixedparams", mixedparams_endpoint="https://fake_mixedparams_endpoint.com" +) + + +class PathParamClientTestBase(AzureRecordedTestCase): + + def create_client(self, endpoint): + credential = self.get_credential(PathParamClient) + return self.create_client_from_credential( + PathParamClient, + credential=credential, + endpoint=endpoint, + ) + + +PathParamPreparer = functools.partial( + PowerShellPreparer, "pathparam", pathparam_endpoint="https://fake_pathparam_endpoint.com" +) + + +class ParamAliasClientTestBase(AzureRecordedTestCase): + + def create_client(self, endpoint): + credential = self.get_credential(ParamAliasClient) + return self.create_client_from_credential( + ParamAliasClient, + credential=credential, + endpoint=endpoint, + ) + + +ParamAliasPreparer = functools.partial( + PowerShellPreparer, "paramalias", paramalias_endpoint="https://fake_paramalias_endpoint.com" +) diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/testpreparer_async.py new file mode 100644 index 00000000000..7305c9a2e1b --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/testpreparer_async.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. +# -------------------------------------------------------------------------- +from devtools_testutils import AzureRecordedTestCase +from specs.azure.clientgenerator.core.clientinitialization.aio import ( + HeaderParamClient, + MixedParamsClient, + MultipleParamsClient, + ParamAliasClient, + PathParamClient, +) + + +class HeaderParamClientTestBaseAsync(AzureRecordedTestCase): + + def create_async_client(self, endpoint): + credential = self.get_credential(HeaderParamClient, is_async=True) + return self.create_client_from_credential( + HeaderParamClient, + credential=credential, + endpoint=endpoint, + ) + + +class MultipleParamsClientTestBaseAsync(AzureRecordedTestCase): + + def create_async_client(self, endpoint): + credential = self.get_credential(MultipleParamsClient, is_async=True) + return self.create_client_from_credential( + MultipleParamsClient, + credential=credential, + endpoint=endpoint, + ) + + +class MixedParamsClientTestBaseAsync(AzureRecordedTestCase): + + def create_async_client(self, endpoint): + credential = self.get_credential(MixedParamsClient, is_async=True) + return self.create_client_from_credential( + MixedParamsClient, + credential=credential, + endpoint=endpoint, + ) + + +class PathParamClientTestBaseAsync(AzureRecordedTestCase): + + def create_async_client(self, endpoint): + credential = self.get_credential(PathParamClient, is_async=True) + return self.create_client_from_credential( + PathParamClient, + credential=credential, + endpoint=endpoint, + ) + + +class ParamAliasClientTestBaseAsync(AzureRecordedTestCase): + + def create_async_client(self, endpoint): + credential = self.get_credential(ParamAliasClient, is_async=True) + return self.create_client_from_credential( + ParamAliasClient, + credential=credential, + endpoint=endpoint, + ) diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/setup.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/setup.py new file mode 100644 index 00000000000..91931c1dbe3 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/setup.py @@ -0,0 +1,72 @@ +# 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 = "specs-azure-clientgenerator-core-clientinitialization" +PACKAGE_PPRINT_NAME = "Specs Azure Clientgenerator Core Clientinitialization" + +# a-b-c => a/b/c +package_folder_path = PACKAGE_NAME.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 + "specs", + "specs.azure", + "specs.azure.clientgenerator", + "specs.azure.clientgenerator.core", + ] + ), + include_package_data=True, + package_data={ + "specs.azure.clientgenerator.core.clientinitialization": ["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/generated/azure-client-generator-core-client-initialization/specs/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/__init__.py new file mode 100644 index 00000000000..d55ccad1f57 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/__init__.py @@ -0,0 +1 @@ +__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/__init__.py new file mode 100644 index 00000000000..d55ccad1f57 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/__init__.py @@ -0,0 +1 @@ +__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/__init__.py new file mode 100644 index 00000000000..d55ccad1f57 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/__init__.py @@ -0,0 +1 @@ +__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/__init__.py new file mode 100644 index 00000000000..d55ccad1f57 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/__init__.py @@ -0,0 +1 @@ +__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/__init__.py new file mode 100644 index 00000000000..8ba41ec230d --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/__init__.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=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._client import HeaderParamClient # type: ignore +from ._client import MultipleParamsClient # type: ignore +from ._client import MixedParamsClient # type: ignore +from ._client import PathParamClient # type: ignore +from ._client import ParamAliasClient # 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__ = [ + "HeaderParamClient", + "MultipleParamsClient", + "MixedParamsClient", + "PathParamClient", + "ParamAliasClient", +] +__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/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_client.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_client.py new file mode 100644 index 00000000000..38434b9eb61 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_client.py @@ -0,0 +1,413 @@ +# 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.pipeline import policies +from azure.core.rest import HttpRequest, HttpResponse + +from ._configuration import ( + HeaderParamClientConfiguration, + MixedParamsClientConfiguration, + MultipleParamsClientConfiguration, + ParamAliasClientConfiguration, + PathParamClientConfiguration, +) +from ._operations import ( + HeaderParamClientOperationsMixin, + MixedParamsClientOperationsMixin, + MultipleParamsClientOperationsMixin, + ParamAliasClientOperationsMixin, + PathParamClientOperationsMixin, +) +from ._serialization import Deserializer, Serializer + + +class HeaderParamClient(HeaderParamClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Client for testing header parameter moved to client level. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, name: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = HeaderParamClientConfiguration(name=name, 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) + + +class MultipleParamsClient(MultipleParamsClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """MultipleParamsClient. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :param region: The region to use for all operations. This parameter is used as a query + parameter. Required. + :type region: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, name: str, region: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = MultipleParamsClientConfiguration(name=name, region=region, 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) + + +class MixedParamsClient(MixedParamsClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """MixedParamsClient. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, name: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = MixedParamsClientConfiguration(name=name, 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) + + +class PathParamClient(PathParamClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """PathParamClient. + + :param blob_name: The name of the blob. This parameter is used as a path parameter in all + operations. Required. + :type blob_name: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, blob_name: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = PathParamClientConfiguration(blob_name=blob_name, 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) + + +class ParamAliasClient(ParamAliasClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """ParamAliasClient. + + :param blob_name: Blob name for the client. Required. + :type blob_name: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, blob_name: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = ParamAliasClientConfiguration(blob_name=blob_name, 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/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_configuration.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_configuration.py new file mode 100644 index 00000000000..5e0e8378258 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_configuration.py @@ -0,0 +1,193 @@ +# 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.pipeline import policies + +from ._version import VERSION + + +class HeaderParamClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for HeaderParamClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, name: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if name is None: + raise ValueError("Parameter 'name' must not be None.") + + self.name = name + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-clientinitialization/{}".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") + + +class MultipleParamsClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for MultipleParamsClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :param region: The region to use for all operations. This parameter is used as a query + parameter. Required. + :type region: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, name: str, region: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if name is None: + raise ValueError("Parameter 'name' must not be None.") + if region is None: + raise ValueError("Parameter 'region' must not be None.") + + self.name = name + self.region = region + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-clientinitialization/{}".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") + + +class MixedParamsClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for MixedParamsClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, name: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if name is None: + raise ValueError("Parameter 'name' must not be None.") + + self.name = name + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-clientinitialization/{}".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") + + +class PathParamClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for PathParamClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param blob_name: The name of the blob. This parameter is used as a path parameter in all + operations. Required. + :type blob_name: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, blob_name: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if blob_name is None: + raise ValueError("Parameter 'blob_name' must not be None.") + + self.blob_name = blob_name + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-clientinitialization/{}".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") + + +class ParamAliasClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for ParamAliasClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param blob_name: Blob name for the client. Required. + :type blob_name: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, blob_name: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if blob_name is None: + raise ValueError("Parameter 'blob_name' must not be None.") + + self.blob_name = blob_name + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-clientinitialization/{}".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") diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_model_base.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_model_base.py new file mode 100644 index 00000000000..49d5c725938 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_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/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_operations/__init__.py new file mode 100644 index 00000000000..e5356103522 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_operations/__init__.py @@ -0,0 +1,33 @@ +# 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 HeaderParamClientOperationsMixin # type: ignore +from ._operations import MultipleParamsClientOperationsMixin # type: ignore +from ._operations import MixedParamsClientOperationsMixin # type: ignore +from ._operations import PathParamClientOperationsMixin # type: ignore +from ._operations import ParamAliasClientOperationsMixin # type: ignore + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "HeaderParamClientOperationsMixin", + "MultipleParamsClientOperationsMixin", + "MixedParamsClientOperationsMixin", + "PathParamClientOperationsMixin", + "ParamAliasClientOperationsMixin", +] +__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/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_operations/_operations.py new file mode 100644 index 00000000000..4f051b8f607 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_operations/_operations.py @@ -0,0 +1,951 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from collections.abc import MutableMapping +from io import IOBase +import json +from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + StreamClosedError, + StreamConsumedError, + map_error, +) +from azure.core.pipeline import PipelineResponse +from azure.core.rest import HttpRequest, HttpResponse +from azure.core.tracing.decorator import distributed_trace +from azure.core.utils import case_insensitive_dict + +from .. import models as _models +from .._model_base import SdkJSONEncoder, _deserialize +from .._serialization import Serializer +from .._vendor import ( + HeaderParamClientMixinABC, + MixedParamsClientMixinABC, + MultipleParamsClientMixinABC, + ParamAliasClientMixinABC, + PathParamClientMixinABC, +) + +JSON = MutableMapping[str, Any] +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +_SERIALIZER = Serializer() +_SERIALIZER.client_side_validation = False + + +def build_header_param_with_query_request(*, id: str, name: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + # Construct URL + _url = "/azure/client-generator-core/client-initialization/header-param/with-query" + + # Construct parameters + _params["id"] = _SERIALIZER.query("id", id, "str") + + # Construct headers + _headers["name"] = _SERIALIZER.header("name", name, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_header_param_with_body_request(*, name: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + # Construct URL + _url = "/azure/client-generator-core/client-initialization/header-param/with-body" + + # Construct headers + _headers["name"] = _SERIALIZER.header("name", name, "str") + if content_type is not None: + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + + return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) + + +def build_multiple_params_with_query_request(*, id: str, name: str, region: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + # Construct URL + _url = "/azure/client-generator-core/client-initialization/multiple-params/with-query" + + # Construct parameters + _params["region"] = _SERIALIZER.query("region", region, "str") + _params["id"] = _SERIALIZER.query("id", id, "str") + + # Construct headers + _headers["name"] = _SERIALIZER.header("name", name, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_multiple_params_with_body_request(*, name: str, region: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + # Construct URL + _url = "/azure/client-generator-core/client-initialization/multiple-params/with-body" + + # Construct parameters + _params["region"] = _SERIALIZER.query("region", region, "str") + + # Construct headers + _headers["name"] = _SERIALIZER.header("name", name, "str") + if content_type is not None: + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + + return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_mixed_params_with_query_request(*, region: str, id: str, name: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + # Construct URL + _url = "/azure/client-generator-core/client-initialization/mixed-params/with-query" + + # Construct parameters + _params["region"] = _SERIALIZER.query("region", region, "str") + _params["id"] = _SERIALIZER.query("id", id, "str") + + # Construct headers + _headers["name"] = _SERIALIZER.header("name", name, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_mixed_params_with_body_request(*, region: str, name: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + # Construct URL + _url = "/azure/client-generator-core/client-initialization/mixed-params/with-body" + + # Construct parameters + _params["region"] = _SERIALIZER.query("region", region, "str") + + # Construct headers + _headers["name"] = _SERIALIZER.header("name", name, "str") + if content_type is not None: + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + + return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_path_param_with_query_request(blob_name: str, *, format: Optional[str] = None, **kwargs: Any) -> HttpRequest: + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + # Construct URL + _url = "/azure/client-generator-core/client-initialization/path/{blobName}/with-query" + path_format_arguments = { + "blobName": _SERIALIZER.url("blob_name", blob_name, "str"), + } + + _url: str = _url.format(**path_format_arguments) # type: ignore + + # Construct parameters + if format is not None: + _params["format"] = _SERIALIZER.query("format", format, "str") + + return HttpRequest(method="GET", url=_url, params=_params, **kwargs) + + +def build_path_param_get_standalone_request(blob_name: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + accept = _headers.pop("Accept", "application/json") + + # Construct URL + _url = "/azure/client-generator-core/client-initialization/path/{blobName}/get-standalone" + path_format_arguments = { + "blobName": _SERIALIZER.url("blob_name", blob_name, "str"), + } + + _url: str = _url.format(**path_format_arguments) # type: ignore + + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) + + +def build_path_param_delete_standalone_request( # pylint: disable=name-too-long + blob_name: str, **kwargs: Any +) -> HttpRequest: + # Construct URL + _url = "/azure/client-generator-core/client-initialization/path/{blobName}" + path_format_arguments = { + "blobName": _SERIALIZER.url("blob_name", blob_name, "str"), + } + + _url: str = _url.format(**path_format_arguments) # type: ignore + + return HttpRequest(method="DELETE", url=_url, **kwargs) + + +def build_param_alias_with_aliased_name_request( # pylint: disable=name-too-long + blob: str, **kwargs: Any +) -> HttpRequest: + # Construct URL + _url = "/azure/client-generator-core/client-initialization/param-alias/{blob}/with-aliased-name" + path_format_arguments = { + "blob": _SERIALIZER.url("blob", blob, "str"), + } + + _url: str = _url.format(**path_format_arguments) # type: ignore + + return HttpRequest(method="GET", url=_url, **kwargs) + + +def build_param_alias_with_original_name_request( # pylint: disable=name-too-long + blob_name: str, **kwargs: Any +) -> HttpRequest: + # Construct URL + _url = "/azure/client-generator-core/client-initialization/param-alias/{blobName}/with-original-name" + path_format_arguments = { + "blobName": _SERIALIZER.url("blob_name", blob_name, "str"), + } + + _url: str = _url.format(**path_format_arguments) # type: ignore + + return HttpRequest(method="GET", url=_url, **kwargs) + + +class HeaderParamClientOperationsMixin(HeaderParamClientMixinABC): + + @distributed_trace + def with_query(self, *, id: str, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + """with_query. + + :keyword id: Required. + :paramtype id: str + :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_header_param_with_query_request( + id=id, + name=self._config.name, + 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 + + @overload + def with_body(self, body: _models.Input, *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: ~specs.azure.clientgenerator.core.clientinitialization.models.Input + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def with_body(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: JSON + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def with_body(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace + def with_body( # pylint: disable=inconsistent-return-statements + self, body: Union[_models.Input, JSON, IO[bytes]], **kwargs: Any + ) -> None: + """with_body. + + :param body: Is one of the following types: Input, JSON, IO[bytes] Required. + :type body: ~specs.azure.clientgenerator.core.clientinitialization.models.Input or JSON or + IO[bytes] + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = kwargs.pop("params", {}) or {} + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[None] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(body, (IOBase, bytes)): + _content = body + else: + _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_header_param_with_body_request( + name=self._config.name, + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + +class MultipleParamsClientOperationsMixin(MultipleParamsClientMixinABC): + + @distributed_trace + def with_query(self, *, id: str, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + """with_query. + + :keyword id: Required. + :paramtype id: str + :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_multiple_params_with_query_request( + id=id, + name=self._config.name, + region=self._config.region, + 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 + + @overload + def with_body(self, body: _models.Input, *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: ~specs.azure.clientgenerator.core.clientinitialization.models.Input + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def with_body(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: JSON + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def with_body(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace + def with_body( # pylint: disable=inconsistent-return-statements + self, body: Union[_models.Input, JSON, IO[bytes]], **kwargs: Any + ) -> None: + """with_body. + + :param body: Is one of the following types: Input, JSON, IO[bytes] Required. + :type body: ~specs.azure.clientgenerator.core.clientinitialization.models.Input or JSON or + IO[bytes] + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = kwargs.pop("params", {}) or {} + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[None] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(body, (IOBase, bytes)): + _content = body + else: + _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_multiple_params_with_body_request( + name=self._config.name, + region=self._config.region, + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + +class MixedParamsClientOperationsMixin(MixedParamsClientMixinABC): + + @distributed_trace + def with_query( # pylint: disable=inconsistent-return-statements + self, *, region: str, id: str, **kwargs: Any + ) -> None: + """with_query. + + :keyword region: Required. + :paramtype region: str + :keyword id: Required. + :paramtype id: str + :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_mixed_params_with_query_request( + region=region, + id=id, + name=self._config.name, + 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 + + @overload + def with_body( + self, body: _models.WithBodyRequest, *, region: str, content_type: str = "application/json", **kwargs: Any + ) -> None: + """with_body. + + :param body: Required. + :type body: ~specs.azure.clientgenerator.core.clientinitialization.models.WithBodyRequest + :keyword region: Required. + :paramtype region: str + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def with_body(self, body: JSON, *, region: str, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: JSON + :keyword region: Required. + :paramtype region: str + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def with_body(self, body: IO[bytes], *, region: str, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: IO[bytes] + :keyword region: Required. + :paramtype region: str + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace + def with_body( # pylint: disable=inconsistent-return-statements + self, body: Union[_models.WithBodyRequest, JSON, IO[bytes]], *, region: str, **kwargs: Any + ) -> None: + """with_body. + + :param body: Is one of the following types: WithBodyRequest, JSON, IO[bytes] Required. + :type body: ~specs.azure.clientgenerator.core.clientinitialization.models.WithBodyRequest or + JSON or IO[bytes] + :keyword region: Required. + :paramtype region: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = kwargs.pop("params", {}) or {} + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[None] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(body, (IOBase, bytes)): + _content = body + else: + _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_mixed_params_with_body_request( + region=region, + name=self._config.name, + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + +class PathParamClientOperationsMixin(PathParamClientMixinABC): + + @distributed_trace + def with_query( # pylint: disable=inconsistent-return-statements + self, *, format: Optional[str] = None, **kwargs: Any + ) -> None: + """with_query. + + :keyword format: Default value is None. + :paramtype format: str + :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_path_param_with_query_request( + blob_name=self._config.blob_name, + format=format, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + @distributed_trace + def get_standalone(self, **kwargs: Any) -> _models.BlobProperties: + """get_standalone. + + :return: BlobProperties. The BlobProperties is compatible with MutableMapping + :rtype: ~specs.azure.clientgenerator.core.clientinitialization.models.BlobProperties + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[_models.BlobProperties] = kwargs.pop("cls", None) + + _request = build_path_param_get_standalone_request( + blob_name=self._config.blob_name, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = kwargs.pop("stream", False) + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + if _stream: + try: + response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if _stream: + deserialized = response.iter_bytes() + else: + deserialized = _deserialize(_models.BlobProperties, response.json()) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore + + @distributed_trace + def delete_standalone(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + """delete_standalone. + + :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_path_param_delete_standalone_request( + blob_name=self._config.blob_name, + 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 + + +class ParamAliasClientOperationsMixin(ParamAliasClientMixinABC): + + @distributed_trace + def with_aliased_name(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + """with_aliased_name. + + :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_param_alias_with_aliased_name_request( + blob=self._config.blob, + 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 with_original_name(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + """with_original_name. + + :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_param_alias_with_original_name_request( + blob_name=self._config.blob_name, + 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 diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_operations/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_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/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_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/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_serialization.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_serialization.py new file mode 100644 index 00000000000..eb86ea23c96 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_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/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_vendor.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_vendor.py new file mode 100644 index 00000000000..0bf891fe013 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_vendor.py @@ -0,0 +1,67 @@ +# -------------------------------------------------------------------------- +# 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 TYPE_CHECKING + +from ._configuration import ( + HeaderParamClientConfiguration, + MixedParamsClientConfiguration, + MultipleParamsClientConfiguration, + ParamAliasClientConfiguration, + PathParamClientConfiguration, +) + +if TYPE_CHECKING: + from azure.core import PipelineClient + + from ._serialization import Deserializer, Serializer + + +class HeaderParamClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "PipelineClient" + _config: HeaderParamClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" + + +class MultipleParamsClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "PipelineClient" + _config: MultipleParamsClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" + + +class MixedParamsClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "PipelineClient" + _config: MixedParamsClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" + + +class PathParamClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "PipelineClient" + _config: PathParamClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" + + +class ParamAliasClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "PipelineClient" + _config: ParamAliasClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_version.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_version.py new file mode 100644 index 00000000000..be71c81bd28 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_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/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/__init__.py new file mode 100644 index 00000000000..1a48c35e178 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/__init__.py @@ -0,0 +1,37 @@ +# 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 HeaderParamClient # type: ignore +from ._client import MultipleParamsClient # type: ignore +from ._client import MixedParamsClient # type: ignore +from ._client import PathParamClient # type: ignore +from ._client import ParamAliasClient # 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__ = [ + "HeaderParamClient", + "MultipleParamsClient", + "MixedParamsClient", + "PathParamClient", + "ParamAliasClient", +] +__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/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_client.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_client.py new file mode 100644 index 00000000000..e088980e696 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_client.py @@ -0,0 +1,423 @@ +# 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.pipeline import policies +from azure.core.rest import AsyncHttpResponse, HttpRequest + +from .._serialization import Deserializer, Serializer +from ._configuration import ( + HeaderParamClientConfiguration, + MixedParamsClientConfiguration, + MultipleParamsClientConfiguration, + ParamAliasClientConfiguration, + PathParamClientConfiguration, +) +from ._operations import ( + HeaderParamClientOperationsMixin, + MixedParamsClientOperationsMixin, + MultipleParamsClientOperationsMixin, + ParamAliasClientOperationsMixin, + PathParamClientOperationsMixin, +) + + +class HeaderParamClient(HeaderParamClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Client for testing header parameter moved to client level. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, name: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = HeaderParamClientConfiguration(name=name, 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) + + +class MultipleParamsClient(MultipleParamsClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """MultipleParamsClient. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :param region: The region to use for all operations. This parameter is used as a query + parameter. Required. + :type region: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, name: str, region: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = MultipleParamsClientConfiguration(name=name, region=region, 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) + + +class MixedParamsClient(MixedParamsClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """MixedParamsClient. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, name: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = MixedParamsClientConfiguration(name=name, 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) + + +class PathParamClient(PathParamClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """PathParamClient. + + :param blob_name: The name of the blob. This parameter is used as a path parameter in all + operations. Required. + :type blob_name: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, blob_name: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = PathParamClientConfiguration(blob_name=blob_name, 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) + + +class ParamAliasClient(ParamAliasClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """ParamAliasClient. + + :param blob_name: Blob name for the client. Required. + :type blob_name: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, blob_name: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = ParamAliasClientConfiguration(blob_name=blob_name, 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/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_configuration.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_configuration.py new file mode 100644 index 00000000000..4de3a163d4b --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_configuration.py @@ -0,0 +1,193 @@ +# 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.pipeline import policies + +from .._version import VERSION + + +class HeaderParamClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for HeaderParamClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, name: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if name is None: + raise ValueError("Parameter 'name' must not be None.") + + self.name = name + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-clientinitialization/{}".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") + + +class MultipleParamsClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for MultipleParamsClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :param region: The region to use for all operations. This parameter is used as a query + parameter. Required. + :type region: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, name: str, region: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if name is None: + raise ValueError("Parameter 'name' must not be None.") + if region is None: + raise ValueError("Parameter 'region' must not be None.") + + self.name = name + self.region = region + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-clientinitialization/{}".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") + + +class MixedParamsClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for MixedParamsClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, name: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if name is None: + raise ValueError("Parameter 'name' must not be None.") + + self.name = name + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-clientinitialization/{}".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") + + +class PathParamClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for PathParamClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param blob_name: The name of the blob. This parameter is used as a path parameter in all + operations. Required. + :type blob_name: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, blob_name: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if blob_name is None: + raise ValueError("Parameter 'blob_name' must not be None.") + + self.blob_name = blob_name + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-clientinitialization/{}".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") + + +class ParamAliasClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for ParamAliasClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param blob_name: Blob name for the client. Required. + :type blob_name: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, blob_name: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if blob_name is None: + raise ValueError("Parameter 'blob_name' must not be None.") + + self.blob_name = blob_name + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-clientinitialization/{}".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") diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_operations/__init__.py new file mode 100644 index 00000000000..e5356103522 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_operations/__init__.py @@ -0,0 +1,33 @@ +# 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 HeaderParamClientOperationsMixin # type: ignore +from ._operations import MultipleParamsClientOperationsMixin # type: ignore +from ._operations import MixedParamsClientOperationsMixin # type: ignore +from ._operations import PathParamClientOperationsMixin # type: ignore +from ._operations import ParamAliasClientOperationsMixin # type: ignore + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "HeaderParamClientOperationsMixin", + "MultipleParamsClientOperationsMixin", + "MixedParamsClientOperationsMixin", + "PathParamClientOperationsMixin", + "ParamAliasClientOperationsMixin", +] +__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/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_operations/_operations.py new file mode 100644 index 00000000000..72a9c9d38e9 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_operations/_operations.py @@ -0,0 +1,775 @@ +# pylint: disable=line-too-long,useless-suppression +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from collections.abc import MutableMapping +from io import IOBase +import json +from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + StreamClosedError, + StreamConsumedError, + map_error, +) +from azure.core.pipeline import PipelineResponse +from azure.core.rest import AsyncHttpResponse, HttpRequest +from azure.core.tracing.decorator_async import distributed_trace_async +from azure.core.utils import case_insensitive_dict + +from ... import models as _models +from ..._model_base import SdkJSONEncoder, _deserialize +from ..._operations._operations import ( + build_header_param_with_body_request, + build_header_param_with_query_request, + build_mixed_params_with_body_request, + build_mixed_params_with_query_request, + build_multiple_params_with_body_request, + build_multiple_params_with_query_request, + build_param_alias_with_aliased_name_request, + build_param_alias_with_original_name_request, + build_path_param_delete_standalone_request, + build_path_param_get_standalone_request, + build_path_param_with_query_request, +) +from .._vendor import ( + HeaderParamClientMixinABC, + MixedParamsClientMixinABC, + MultipleParamsClientMixinABC, + ParamAliasClientMixinABC, + PathParamClientMixinABC, +) + +JSON = MutableMapping[str, Any] +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + + +class HeaderParamClientOperationsMixin(HeaderParamClientMixinABC): + + @distributed_trace_async + async def with_query(self, *, id: str, **kwargs: Any) -> None: + """with_query. + + :keyword id: Required. + :paramtype id: str + :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_header_param_with_query_request( + id=id, + name=self._config.name, + 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 + + @overload + async def with_body(self, body: _models.Input, *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: ~specs.azure.clientgenerator.core.clientinitialization.models.Input + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def with_body(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: JSON + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def with_body(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace_async + async def with_body(self, body: Union[_models.Input, JSON, IO[bytes]], **kwargs: Any) -> None: + """with_body. + + :param body: Is one of the following types: Input, JSON, IO[bytes] Required. + :type body: ~specs.azure.clientgenerator.core.clientinitialization.models.Input or JSON or + IO[bytes] + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = kwargs.pop("params", {}) or {} + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[None] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(body, (IOBase, bytes)): + _content = body + else: + _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_header_param_with_body_request( + name=self._config.name, + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + +class MultipleParamsClientOperationsMixin(MultipleParamsClientMixinABC): + + @distributed_trace_async + async def with_query(self, *, id: str, **kwargs: Any) -> None: + """with_query. + + :keyword id: Required. + :paramtype id: str + :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_multiple_params_with_query_request( + id=id, + name=self._config.name, + region=self._config.region, + 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 + + @overload + async def with_body(self, body: _models.Input, *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: ~specs.azure.clientgenerator.core.clientinitialization.models.Input + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def with_body(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: JSON + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def with_body(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace_async + async def with_body(self, body: Union[_models.Input, JSON, IO[bytes]], **kwargs: Any) -> None: + """with_body. + + :param body: Is one of the following types: Input, JSON, IO[bytes] Required. + :type body: ~specs.azure.clientgenerator.core.clientinitialization.models.Input or JSON or + IO[bytes] + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = kwargs.pop("params", {}) or {} + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[None] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(body, (IOBase, bytes)): + _content = body + else: + _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_multiple_params_with_body_request( + name=self._config.name, + region=self._config.region, + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + +class MixedParamsClientOperationsMixin(MixedParamsClientMixinABC): + + @distributed_trace_async + async def with_query(self, *, region: str, id: str, **kwargs: Any) -> None: + """with_query. + + :keyword region: Required. + :paramtype region: str + :keyword id: Required. + :paramtype id: str + :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_mixed_params_with_query_request( + region=region, + id=id, + name=self._config.name, + 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 + + @overload + async def with_body( + self, body: _models.WithBodyRequest, *, region: str, content_type: str = "application/json", **kwargs: Any + ) -> None: + """with_body. + + :param body: Required. + :type body: ~specs.azure.clientgenerator.core.clientinitialization.models.WithBodyRequest + :keyword region: Required. + :paramtype region: str + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def with_body( + self, body: JSON, *, region: str, content_type: str = "application/json", **kwargs: Any + ) -> None: + """with_body. + + :param body: Required. + :type body: JSON + :keyword region: Required. + :paramtype region: str + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def with_body( + self, body: IO[bytes], *, region: str, content_type: str = "application/json", **kwargs: Any + ) -> None: + """with_body. + + :param body: Required. + :type body: IO[bytes] + :keyword region: Required. + :paramtype region: str + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace_async + async def with_body( + self, body: Union[_models.WithBodyRequest, JSON, IO[bytes]], *, region: str, **kwargs: Any + ) -> None: + """with_body. + + :param body: Is one of the following types: WithBodyRequest, JSON, IO[bytes] Required. + :type body: ~specs.azure.clientgenerator.core.clientinitialization.models.WithBodyRequest or + JSON or IO[bytes] + :keyword region: Required. + :paramtype region: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = kwargs.pop("params", {}) or {} + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[None] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(body, (IOBase, bytes)): + _content = body + else: + _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_mixed_params_with_body_request( + region=region, + name=self._config.name, + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + +class PathParamClientOperationsMixin(PathParamClientMixinABC): + + @distributed_trace_async + async def with_query(self, *, format: Optional[str] = None, **kwargs: Any) -> None: + """with_query. + + :keyword format: Default value is None. + :paramtype format: str + :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_path_param_with_query_request( + blob_name=self._config.blob_name, + format=format, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + @distributed_trace_async + async def get_standalone(self, **kwargs: Any) -> _models.BlobProperties: + """get_standalone. + + :return: BlobProperties. The BlobProperties is compatible with MutableMapping + :rtype: ~specs.azure.clientgenerator.core.clientinitialization.models.BlobProperties + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[_models.BlobProperties] = kwargs.pop("cls", None) + + _request = build_path_param_get_standalone_request( + blob_name=self._config.blob_name, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = kwargs.pop("stream", False) + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + if _stream: + try: + await response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if _stream: + deserialized = response.iter_bytes() + else: + deserialized = _deserialize(_models.BlobProperties, response.json()) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore + + @distributed_trace_async + async def delete_standalone(self, **kwargs: Any) -> None: + """delete_standalone. + + :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_path_param_delete_standalone_request( + blob_name=self._config.blob_name, + 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 + + +class ParamAliasClientOperationsMixin(ParamAliasClientMixinABC): + + @distributed_trace_async + async def with_aliased_name(self, **kwargs: Any) -> None: + """with_aliased_name. + + :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_param_alias_with_aliased_name_request( + blob=self._config.blob, + 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 with_original_name(self, **kwargs: Any) -> None: + """with_original_name. + + :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_param_alias_with_original_name_request( + blob_name=self._config.blob_name, + 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 diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_operations/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/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/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/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/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_vendor.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_vendor.py new file mode 100644 index 00000000000..8eb2c6bd696 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_vendor.py @@ -0,0 +1,67 @@ +# -------------------------------------------------------------------------- +# 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 TYPE_CHECKING + +from ._configuration import ( + HeaderParamClientConfiguration, + MixedParamsClientConfiguration, + MultipleParamsClientConfiguration, + ParamAliasClientConfiguration, + PathParamClientConfiguration, +) + +if TYPE_CHECKING: + from azure.core import AsyncPipelineClient + + from .._serialization import Deserializer, Serializer + + +class HeaderParamClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "AsyncPipelineClient" + _config: HeaderParamClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" + + +class MultipleParamsClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "AsyncPipelineClient" + _config: MultipleParamsClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" + + +class MixedParamsClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "AsyncPipelineClient" + _config: MixedParamsClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" + + +class PathParamClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "AsyncPipelineClient" + _config: PathParamClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" + + +class ParamAliasClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "AsyncPipelineClient" + _config: ParamAliasClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/models/__init__.py new file mode 100644 index 00000000000..08806180ab5 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/models/__init__.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. +# -------------------------------------------------------------------------- +# 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 + BlobProperties, + Input, + WithBodyRequest, +) +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "BlobProperties", + "Input", + "WithBodyRequest", +] +__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/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/models/_models.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/models/_models.py new file mode 100644 index 00000000000..dc2e5935ad1 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/models/_models.py @@ -0,0 +1,115 @@ +# 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 + +import datetime +from typing import Any, Mapping, overload + +from .. import _model_base +from .._model_base import rest_field + + +class BlobProperties(_model_base.Model): + """Properties of a blob. + + :ivar name: Required. + :vartype name: str + :ivar size: Required. + :vartype size: int + :ivar content_type: Required. + :vartype content_type: str + :ivar created_on: Required. + :vartype created_on: ~datetime.datetime + """ + + name: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) + """Required.""" + size: int = rest_field(visibility=["read", "create", "update", "delete", "query"]) + """Required.""" + content_type: str = rest_field(name="contentType", visibility=["read", "create", "update", "delete", "query"]) + """Required.""" + created_on: datetime.datetime = rest_field( + name="createdOn", visibility=["read", "create", "update", "delete", "query"], format="rfc3339" + ) + """Required.""" + + @overload + def __init__( + self, + *, + name: str, + size: int, + content_type: str, + created_on: datetime.datetime, + ) -> None: ... + + @overload + def __init__(self, mapping: Mapping[str, Any]) -> None: + """ + :param mapping: raw JSON to initialize the model. + :type mapping: Mapping[str, Any] + """ + + def __init__(self, *args: Any, **kwargs: Any) -> None: + super().__init__(*args, **kwargs) + + +class Input(_model_base.Model): + """Input. + + :ivar name: Required. + :vartype name: str + """ + + name: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) + """Required.""" + + @overload + def __init__( + self, + *, + name: 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) + + +class WithBodyRequest(_model_base.Model): + """WithBodyRequest. + + :ivar name: Required. + :vartype name: str + """ + + name: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) + """Required.""" + + @overload + def __init__( + self, + *, + name: 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-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/models/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/models/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/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/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/py.typed b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/py.typed new file mode 100644 index 00000000000..e5aff4f83af --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/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/azure-core-page/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-core-page/apiview-properties.json index caf1fe5f707..7cce33259b0 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-core-page/apiview-properties.json @@ -11,6 +11,7 @@ "specs.azure.core.page.PageClient.two_models_as_page_item.list_second_item": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listSecondItem", "specs.azure.core.page.PageClient.list_with_page": "_Specs_.Azure.Core.Page.listWithPage", "specs.azure.core.page.PageClient.list_with_parameters": "_Specs_.Azure.Core.Page.listWithParameters", - "specs.azure.core.page.PageClient.list_with_custom_page_model": "_Specs_.Azure.Core.Page.listWithCustomPageModel" + "specs.azure.core.page.PageClient.list_with_custom_page_model": "_Specs_.Azure.Core.Page.listWithCustomPageModel", + "specs.azure.core.page.PageClient.with_parameterized_next_link": "_Specs_.Azure.Core.Page.withParameterizedNextLink" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/test_page.py b/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/test_page.py index 053081e9ec6..d5d0ff8efdf 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/test_page.py +++ b/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/test_page.py @@ -40,3 +40,14 @@ def test_list_with_custom_page_model(self, page_endpoint): result = [r for r in response] # please add some check logic here by yourself # ... + + @PagePreparer() + @recorded_by_proxy + def test_with_parameterized_next_link(self, page_endpoint): + client = self.create_client(endpoint=page_endpoint) + response = client.with_parameterized_next_link( + select="str", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/test_page_async.py b/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/test_page_async.py index 3bfc3a98048..070af410263 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/test_page_async.py +++ b/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/test_page_async.py @@ -41,3 +41,14 @@ async def test_list_with_custom_page_model(self, page_endpoint): result = [r async for r in response] # please add some check logic here by yourself # ... + + @PagePreparer() + @recorded_by_proxy_async + async def test_with_parameterized_next_link(self, page_endpoint): + client = self.create_async_client(endpoint=page_endpoint) + response = client.with_parameterized_next_link( + select="str", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/operations/_operations.py index 56b88c9b3be..0e8adcd0594 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/operations/_operations.py @@ -34,6 +34,7 @@ build_page_list_with_custom_page_model_request, build_page_list_with_page_request, build_page_list_with_parameters_request, + build_page_with_parameterized_next_link_request, build_two_models_as_page_item_list_first_item_request, build_two_models_as_page_item_list_second_item_request, ) @@ -570,3 +571,92 @@ async def get_next(next_link=None): return pipeline_response return AsyncItemPaged(get_next, extract_data) + + @distributed_trace + def with_parameterized_next_link( + self, *, select: str, include_pending: Optional[bool] = None, **kwargs: Any + ) -> AsyncIterable["_models.User"]: + """List with parameterized next link that re-injects parameters. + + :keyword select: Required. + :paramtype select: str + :keyword include_pending: Default value is None. + :paramtype include_pending: bool + :return: An iterator like instance of User + :rtype: ~azure.core.async_paging.AsyncItemPaged[~specs.azure.core.page.models.User] + :raises ~azure.core.exceptions.HttpResponseError: + """ + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[List[_models.User]] = kwargs.pop("cls", None) + + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + def prepare_request(next_link=None): + if not next_link: + + _request = build_page_with_parameterized_next_link_request( + select=select, + include_pending=include_pending, + 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) + + else: + # make call to next link with the client's api-version + _parsed_next_link = urllib.parse.urlparse(next_link) + _next_request_params = case_insensitive_dict( + { + key: [urllib.parse.quote(v) for v in value] + for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() + } + ) + _next_request_params["api-version"] = self._config.api_version + _request = HttpRequest( + "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_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) + + return _request + + async def extract_data(pipeline_response): + deserialized = pipeline_response.http_response.json() + list_of_elem = _deserialize(List[_models.User], deserialized.get("values", [])) + if cls: + list_of_elem = cls(list_of_elem) # type: ignore + return deserialized.get("nextLink") or None, AsyncList(list_of_elem) + + async def get_next(next_link=None): + _request = prepare_request(next_link) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + return pipeline_response + + return AsyncItemPaged(get_next, extract_data) diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/operations/_operations.py index 1021c6f8c61..1a38213c3f0 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/operations/_operations.py @@ -146,6 +146,28 @@ def build_page_list_with_custom_page_model_request(**kwargs: Any) -> HttpRequest return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) +def build_page_with_parameterized_next_link_request( # pylint: disable=name-too-long + *, select: str, include_pending: Optional[bool] = None, **kwargs: Any +) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + accept = _headers.pop("Accept", "application/json") + + # Construct URL + _url = "/azure/core/page/with-parameterized-next-link" + + # Construct parameters + if include_pending is not None: + _params["includePending"] = _SERIALIZER.query("include_pending", include_pending, "bool") + _params["select"] = _SERIALIZER.query("select", select, "str") + + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + class TwoModelsAsPageItemOperations: """ .. warning:: @@ -671,3 +693,92 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) + + @distributed_trace + def with_parameterized_next_link( + self, *, select: str, include_pending: Optional[bool] = None, **kwargs: Any + ) -> Iterable["_models.User"]: + """List with parameterized next link that re-injects parameters. + + :keyword select: Required. + :paramtype select: str + :keyword include_pending: Default value is None. + :paramtype include_pending: bool + :return: An iterator like instance of User + :rtype: ~azure.core.paging.ItemPaged[~specs.azure.core.page.models.User] + :raises ~azure.core.exceptions.HttpResponseError: + """ + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[List[_models.User]] = kwargs.pop("cls", None) + + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + def prepare_request(next_link=None): + if not next_link: + + _request = build_page_with_parameterized_next_link_request( + select=select, + include_pending=include_pending, + 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) + + else: + # make call to next link with the client's api-version + _parsed_next_link = urllib.parse.urlparse(next_link) + _next_request_params = case_insensitive_dict( + { + key: [urllib.parse.quote(v) for v in value] + for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() + } + ) + _next_request_params["api-version"] = self._config.api_version + _request = HttpRequest( + "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_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) + + return _request + + def extract_data(pipeline_response): + deserialized = pipeline_response.http_response.json() + list_of_elem = _deserialize(List[_models.User], deserialized.get("values", [])) + if cls: + list_of_elem = cls(list_of_elem) # type: ignore + return deserialized.get("nextLink") or None, iter(list_of_elem) + + def get_next(next_link=None): + _request = prepare_request(next_link) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + return pipeline_response + + return ItemPaged(get_next, extract_data) diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/apiview-properties.json index a4d80c3dc3a..860722b0184 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/apiview-properties.json @@ -7,6 +7,7 @@ "azure.resourcemanager.operationtemplates.models.ErrorDetail": "Azure.ResourceManager.CommonTypes.ErrorDetail", "azure.resourcemanager.operationtemplates.models.ErrorResponse": "Azure.ResourceManager.CommonTypes.ErrorResponse", "azure.resourcemanager.operationtemplates.models.ExportRequest": "Azure.ResourceManager.OperationTemplates.ExportRequest", + "azure.resourcemanager.operationtemplates.models.ExportResult": "Azure.ResourceManager.OperationTemplates.ExportResult", "azure.resourcemanager.operationtemplates.models.Operation": "Azure.ResourceManager.CommonTypes.Operation", "azure.resourcemanager.operationtemplates.models.OperationDisplay": "Azure.ResourceManager.CommonTypes.OperationDisplay", "azure.resourcemanager.operationtemplates.models.Resource": "Azure.ResourceManager.CommonTypes.Resource", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/aio/operations/_operations.py index 93e1da2a2f1..0ee9a00adf7 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/aio/operations/_operations.py @@ -767,7 +767,7 @@ async def begin_export( *, content_type: str = "application/json", **kwargs: Any - ) -> AsyncLROPoller[None]: + ) -> AsyncLROPoller[_models.ExportResult]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -780,8 +780,10 @@ async def begin_export( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :return: An instance of AsyncLROPoller that returns None - :rtype: ~azure.core.polling.AsyncLROPoller[None] + :return: An instance of AsyncLROPoller that returns ExportResult. The ExportResult is + compatible with MutableMapping + :rtype: + ~azure.core.polling.AsyncLROPoller[~azure.resourcemanager.operationtemplates.models.ExportResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -794,7 +796,7 @@ async def begin_export( *, content_type: str = "application/json", **kwargs: Any - ) -> AsyncLROPoller[None]: + ) -> AsyncLROPoller[_models.ExportResult]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -807,8 +809,10 @@ async def begin_export( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :return: An instance of AsyncLROPoller that returns None - :rtype: ~azure.core.polling.AsyncLROPoller[None] + :return: An instance of AsyncLROPoller that returns ExportResult. The ExportResult is + compatible with MutableMapping + :rtype: + ~azure.core.polling.AsyncLROPoller[~azure.resourcemanager.operationtemplates.models.ExportResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -821,7 +825,7 @@ async def begin_export( *, content_type: str = "application/json", **kwargs: Any - ) -> AsyncLROPoller[None]: + ) -> AsyncLROPoller[_models.ExportResult]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -834,8 +838,10 @@ async def begin_export( :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :return: An instance of AsyncLROPoller that returns None - :rtype: ~azure.core.polling.AsyncLROPoller[None] + :return: An instance of AsyncLROPoller that returns ExportResult. The ExportResult is + compatible with MutableMapping + :rtype: + ~azure.core.polling.AsyncLROPoller[~azure.resourcemanager.operationtemplates.models.ExportResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -846,7 +852,7 @@ async def begin_export( order_name: str, body: Union[_models.ExportRequest, JSON, IO[bytes]], **kwargs: Any - ) -> AsyncLROPoller[None]: + ) -> AsyncLROPoller[_models.ExportResult]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -857,15 +863,17 @@ async def begin_export( :param body: The content of the action request. Is one of the following types: ExportRequest, JSON, IO[bytes] Required. :type body: ~azure.resourcemanager.operationtemplates.models.ExportRequest or JSON or IO[bytes] - :return: An instance of AsyncLROPoller that returns None - :rtype: ~azure.core.polling.AsyncLROPoller[None] + :return: An instance of AsyncLROPoller that returns ExportResult. The ExportResult is + compatible with MutableMapping + :rtype: + ~azure.core.polling.AsyncLROPoller[~azure.resourcemanager.operationtemplates.models.ExportResult] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) + cls: ClsType[_models.ExportResult] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token: Optional[str] = kwargs.pop("continuation_token", None) @@ -883,9 +891,19 @@ async def begin_export( await raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) - def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements + def get_long_running_output(pipeline_response): + response_headers = {} + response = pipeline_response.http_response + response_headers["Azure-AsyncOperation"] = self._deserialize( + "str", response.headers.get("Azure-AsyncOperation") + ) + response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) + + deserialized = _deserialize(_models.ExportResult, response.json()) if cls: - return cls(pipeline_response, None, {}) # type: ignore + return cls(pipeline_response, deserialized, response_headers) # type: ignore + return deserialized path_format_arguments = { "endpoint": self._serialize.url("self._config.base_url", self._config.base_url, "str", skip_quote=True), @@ -900,13 +918,15 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent- else: polling_method = polling if cont_token: - return AsyncLROPoller[None].from_continuation_token( + return AsyncLROPoller[_models.ExportResult].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore + return AsyncLROPoller[_models.ExportResult]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) async def _delete_initial(self, resource_group_name: str, order_name: str, **kwargs: Any) -> AsyncIterator[bytes]: error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/__init__.py index 7b636e9a55d..38d45321f5f 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/__init__.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/__init__.py @@ -20,6 +20,7 @@ ErrorDetail, ErrorResponse, ExportRequest, + ExportResult, Operation, OperationDisplay, Order, @@ -46,6 +47,7 @@ "ErrorDetail", "ErrorResponse", "ExportRequest", + "ExportResult", "Operation", "OperationDisplay", "Order", 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 43fed9e0a8f..8fb824dab0e 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 @@ -198,6 +198,34 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) +class ExportResult(_model_base.Model): + """ExportResult. + + :ivar content: Content of the exported order. Required. + :vartype content: str + """ + + content: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) + """Content of the exported order. Required.""" + + @overload + def __init__( + self, + *, + content: 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) + + class Operation(_model_base.Model): """Details of a REST API operation, returned from the Resource Provider Operations API. 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 cf6659db784..b2906cb9406 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 @@ -925,7 +925,7 @@ def begin_export( *, content_type: str = "application/json", **kwargs: Any - ) -> LROPoller[None]: + ) -> LROPoller[_models.ExportResult]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -938,8 +938,10 @@ def begin_export( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :return: An instance of LROPoller that returns None - :rtype: ~azure.core.polling.LROPoller[None] + :return: An instance of LROPoller that returns ExportResult. The ExportResult is compatible + with MutableMapping + :rtype: + ~azure.core.polling.LROPoller[~azure.resourcemanager.operationtemplates.models.ExportResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -952,7 +954,7 @@ def begin_export( *, content_type: str = "application/json", **kwargs: Any - ) -> LROPoller[None]: + ) -> LROPoller[_models.ExportResult]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -965,8 +967,10 @@ def begin_export( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :return: An instance of LROPoller that returns None - :rtype: ~azure.core.polling.LROPoller[None] + :return: An instance of LROPoller that returns ExportResult. The ExportResult is compatible + with MutableMapping + :rtype: + ~azure.core.polling.LROPoller[~azure.resourcemanager.operationtemplates.models.ExportResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -979,7 +983,7 @@ def begin_export( *, content_type: str = "application/json", **kwargs: Any - ) -> LROPoller[None]: + ) -> LROPoller[_models.ExportResult]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -992,8 +996,10 @@ def begin_export( :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :return: An instance of LROPoller that returns None - :rtype: ~azure.core.polling.LROPoller[None] + :return: An instance of LROPoller that returns ExportResult. The ExportResult is compatible + with MutableMapping + :rtype: + ~azure.core.polling.LROPoller[~azure.resourcemanager.operationtemplates.models.ExportResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1004,7 +1010,7 @@ def begin_export( order_name: str, body: Union[_models.ExportRequest, JSON, IO[bytes]], **kwargs: Any - ) -> LROPoller[None]: + ) -> LROPoller[_models.ExportResult]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -1015,15 +1021,17 @@ def begin_export( :param body: The content of the action request. Is one of the following types: ExportRequest, JSON, IO[bytes] Required. :type body: ~azure.resourcemanager.operationtemplates.models.ExportRequest or JSON or IO[bytes] - :return: An instance of LROPoller that returns None - :rtype: ~azure.core.polling.LROPoller[None] + :return: An instance of LROPoller that returns ExportResult. The ExportResult is compatible + with MutableMapping + :rtype: + ~azure.core.polling.LROPoller[~azure.resourcemanager.operationtemplates.models.ExportResult] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) + cls: ClsType[_models.ExportResult] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token: Optional[str] = kwargs.pop("continuation_token", None) @@ -1041,9 +1049,19 @@ def begin_export( raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) - def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements + def get_long_running_output(pipeline_response): + response_headers = {} + response = pipeline_response.http_response + response_headers["Azure-AsyncOperation"] = self._deserialize( + "str", response.headers.get("Azure-AsyncOperation") + ) + response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) + + deserialized = _deserialize(_models.ExportResult, response.json()) if cls: - return cls(pipeline_response, None, {}) # type: ignore + return cls(pipeline_response, deserialized, response_headers) # type: ignore + return deserialized path_format_arguments = { "endpoint": self._serialize.url("self._config.base_url", self._config.base_url, "str", skip_quote=True), @@ -1058,13 +1076,15 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent- else: polling_method = polling if cont_token: - return LROPoller[None].from_continuation_token( + return LROPoller[_models.ExportResult].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore + return LROPoller[_models.ExportResult]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) def _delete_initial(self, resource_group_name: str, order_name: str, **kwargs: Any) -> Iterator[bytes]: error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/parameters-path/CHANGELOG.md b/packages/typespec-python/test/azure/generated/parameters-path/CHANGELOG.md new file mode 100644 index 00000000000..628743d283a --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/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/parameters-path/LICENSE b/packages/typespec-python/test/azure/generated/parameters-path/LICENSE new file mode 100644 index 00000000000..63447fd8bbb --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/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/parameters-path/MANIFEST.in b/packages/typespec-python/test/azure/generated/parameters-path/MANIFEST.in new file mode 100644 index 00000000000..e45803b3814 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/MANIFEST.in @@ -0,0 +1,6 @@ +include *.md +include LICENSE +include parameters/path/py.typed +recursive-include tests *.py +recursive-include samples *.py *.md +include parameters/__init__.py diff --git a/packages/typespec-python/test/azure/generated/parameters-path/README.md b/packages/typespec-python/test/azure/generated/parameters-path/README.md new file mode 100644 index 00000000000..8c699262a2c --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/README.md @@ -0,0 +1,43 @@ +# Parameters Path client library for Python + + +## Getting started + +### Install the package + +```bash +python -m pip install parameters-path +``` + +#### 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 Parameters Path 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/parameters-path/apiview-properties.json b/packages/typespec-python/test/azure/generated/parameters-path/apiview-properties.json new file mode 100644 index 00000000000..866435a7de3 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/apiview-properties.json @@ -0,0 +1,7 @@ +{ + "CrossLanguagePackageId": "Parameters.Path", + "CrossLanguageDefinitionId": { + "parameters.path.PathClient.normal": "Parameters.Path.normal", + "parameters.path.PathClient.optional": "Parameters.Path.optional" + } +} \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/parameters-path/dev_requirements.txt b/packages/typespec-python/test/azure/generated/parameters-path/dev_requirements.txt new file mode 100644 index 00000000000..10548647144 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/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/parameters-path/generated_tests/conftest.py b/packages/typespec-python/test/azure/generated/parameters-path/generated_tests/conftest.py new file mode 100644 index 00000000000..5776acd6a2d --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/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): + path_subscription_id = os.environ.get("PATH_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") + path_tenant_id = os.environ.get("PATH_TENANT_ID", "00000000-0000-0000-0000-000000000000") + path_client_id = os.environ.get("PATH_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + path_client_secret = os.environ.get("PATH_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=path_subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=path_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=path_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=path_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/parameters-path/generated_tests/test_path.py b/packages/typespec-python/test/azure/generated/parameters-path/generated_tests/test_path.py new file mode 100644 index 00000000000..8f7534a33db --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/generated_tests/test_path.py @@ -0,0 +1,33 @@ +# 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 PathClientTestBase, PathPreparer + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestPath(PathClientTestBase): + @PathPreparer() + @recorded_by_proxy + def test_normal(self, path_endpoint): + client = self.create_client(endpoint=path_endpoint) + response = client.normal( + name="str", + ) + + # please add some check logic here by yourself + # ... + + @PathPreparer() + @recorded_by_proxy + def test_optional(self, path_endpoint): + client = self.create_client(endpoint=path_endpoint) + response = client.optional() + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/parameters-path/generated_tests/test_path_async.py b/packages/typespec-python/test/azure/generated/parameters-path/generated_tests/test_path_async.py new file mode 100644 index 00000000000..d66d5ba5c6b --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/generated_tests/test_path_async.py @@ -0,0 +1,34 @@ +# 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 PathPreparer +from testpreparer_async import PathClientTestBaseAsync + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestPathAsync(PathClientTestBaseAsync): + @PathPreparer() + @recorded_by_proxy_async + async def test_normal(self, path_endpoint): + client = self.create_async_client(endpoint=path_endpoint) + response = await client.normal( + name="str", + ) + + # please add some check logic here by yourself + # ... + + @PathPreparer() + @recorded_by_proxy_async + async def test_optional(self, path_endpoint): + client = self.create_async_client(endpoint=path_endpoint) + response = await client.optional() + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/parameters-path/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/parameters-path/generated_tests/testpreparer.py new file mode 100644 index 00000000000..d39cb0c6446 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/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 devtools_testutils import AzureRecordedTestCase, PowerShellPreparer +import functools +from parameters.path import PathClient + + +class PathClientTestBase(AzureRecordedTestCase): + + def create_client(self, endpoint): + credential = self.get_credential(PathClient) + return self.create_client_from_credential( + PathClient, + credential=credential, + endpoint=endpoint, + ) + + +PathPreparer = functools.partial(PowerShellPreparer, "path", path_endpoint="https://fake_path_endpoint.com") diff --git a/packages/typespec-python/test/azure/generated/parameters-path/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/parameters-path/generated_tests/testpreparer_async.py new file mode 100644 index 00000000000..fef825f424d --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/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 devtools_testutils import AzureRecordedTestCase +from parameters.path.aio import PathClient + + +class PathClientTestBaseAsync(AzureRecordedTestCase): + + def create_async_client(self, endpoint): + credential = self.get_credential(PathClient, is_async=True) + return self.create_client_from_credential( + PathClient, + credential=credential, + endpoint=endpoint, + ) diff --git a/packages/typespec-python/test/azure/generated/parameters-path/parameters/__init__.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/__init__.py new file mode 100644 index 00000000000..d55ccad1f57 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/__init__.py @@ -0,0 +1 @@ +__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/__init__.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/__init__.py new file mode 100644 index 00000000000..2b63a50720f --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/__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 PathClient # 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__ = [ + "PathClient", +] +__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/parameters-path/parameters/path/_client.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_client.py new file mode 100644 index 00000000000..62eaef2b044 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_client.py @@ -0,0 +1,92 @@ +# 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.pipeline import policies +from azure.core.rest import HttpRequest, HttpResponse + +from ._configuration import PathClientConfiguration +from ._operations import PathClientOperationsMixin +from ._serialization import Deserializer, Serializer + + +class PathClient(PathClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Test for path parameters cases. + + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = PathClientConfiguration(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/parameters-path/parameters/path/_configuration.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_configuration.py new file mode 100644 index 00000000000..2c6f070f2ce --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_configuration.py @@ -0,0 +1,42 @@ +# 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.pipeline import policies + +from ._version import VERSION + + +class PathClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for PathClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "parameters-path/{}".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") diff --git a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_model_base.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_model_base.py new file mode 100644 index 00000000000..49d5c725938 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_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/parameters-path/parameters/path/_operations/__init__.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/__init__.py new file mode 100644 index 00000000000..2674f45390d --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/__init__.py @@ -0,0 +1,25 @@ +# 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 PathClientOperationsMixin # type: ignore + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "PathClientOperationsMixin", +] +__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/parameters-path/parameters/path/_operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/_operations.py new file mode 100644 index 00000000000..16dbd391de4 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/_operations.py @@ -0,0 +1,153 @@ +# 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.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 .._serialization import Serializer +from .._vendor import PathClientMixinABC + +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +_SERIALIZER = Serializer() +_SERIALIZER.client_side_validation = False + + +def build_path_normal_request(name: str, **kwargs: Any) -> HttpRequest: + # Construct URL + _url = "/parameters/path/normal/{name}" + path_format_arguments = { + "name": _SERIALIZER.url("name", name, "str"), + } + + _url: str = _url.format(**path_format_arguments) # type: ignore + + return HttpRequest(method="GET", url=_url, **kwargs) + + +def build_path_optional_request(name: Optional[str] = None, **kwargs: Any) -> HttpRequest: + # Construct URL + _url = "/parameters/path/optional{name}" + path_format_arguments = { + "name": _SERIALIZER.url("name", name, "str"), + } + + _url: str = _url.format(**path_format_arguments) # type: ignore + + return HttpRequest(method="GET", url=_url, **kwargs) + + +class PathClientOperationsMixin(PathClientMixinABC): + + @distributed_trace + def normal(self, name: str, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + """normal. + + :param name: Required. + :type name: str + :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_path_normal_request( + name=name, + 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 optional( # pylint: disable=inconsistent-return-statements + self, name: Optional[str] = None, **kwargs: Any + ) -> None: + """optional. + + :param name: Default value is None. + :type name: str + :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_path_optional_request( + name=name, + 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 diff --git a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/_patch.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_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/parameters-path/parameters/path/_patch.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_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/parameters-path/parameters/path/_serialization.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_serialization.py new file mode 100644 index 00000000000..eb86ea23c96 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_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/parameters-path/parameters/path/_vendor.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_vendor.py new file mode 100644 index 00000000000..745b900e6f6 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_vendor.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 TYPE_CHECKING + +from ._configuration import PathClientConfiguration + +if TYPE_CHECKING: + from azure.core import PipelineClient + + from ._serialization import Deserializer, Serializer + + +class PathClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "PipelineClient" + _config: PathClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_version.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_version.py new file mode 100644 index 00000000000..be71c81bd28 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_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/parameters-path/parameters/path/aio/__init__.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/__init__.py new file mode 100644 index 00000000000..c65d4008d6f --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/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 PathClient # 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__ = [ + "PathClient", +] +__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/parameters-path/parameters/path/aio/_client.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_client.py new file mode 100644 index 00000000000..a98956660c2 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_client.py @@ -0,0 +1,94 @@ +# 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.pipeline import policies +from azure.core.rest import AsyncHttpResponse, HttpRequest + +from .._serialization import Deserializer, Serializer +from ._configuration import PathClientConfiguration +from ._operations import PathClientOperationsMixin + + +class PathClient(PathClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Test for path parameters cases. + + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = PathClientConfiguration(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/parameters-path/parameters/path/aio/_configuration.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_configuration.py new file mode 100644 index 00000000000..125296364b2 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_configuration.py @@ -0,0 +1,42 @@ +# 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.pipeline import policies + +from .._version import VERSION + + +class PathClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for PathClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "parameters-path/{}".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") diff --git a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/__init__.py new file mode 100644 index 00000000000..2674f45390d --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/__init__.py @@ -0,0 +1,25 @@ +# 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 PathClientOperationsMixin # type: ignore + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "PathClientOperationsMixin", +] +__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/parameters-path/parameters/path/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/_operations.py new file mode 100644 index 00000000000..79e4fd3f35c --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/_operations.py @@ -0,0 +1,125 @@ +# 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.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 ..._operations._operations import build_path_normal_request, build_path_optional_request +from .._vendor import PathClientMixinABC + +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + + +class PathClientOperationsMixin(PathClientMixinABC): + + @distributed_trace_async + async def normal(self, name: str, **kwargs: Any) -> None: + """normal. + + :param name: Required. + :type name: str + :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_path_normal_request( + name=name, + 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 optional(self, name: Optional[str] = None, **kwargs: Any) -> None: + """optional. + + :param name: Default value is None. + :type name: str + :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_path_optional_request( + name=name, + 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 diff --git a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/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/parameters-path/parameters/path/aio/_patch.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/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/parameters-path/parameters/path/aio/_vendor.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_vendor.py new file mode 100644 index 00000000000..1373fa6986b --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_vendor.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 TYPE_CHECKING + +from ._configuration import PathClientConfiguration + +if TYPE_CHECKING: + from azure.core import AsyncPipelineClient + + from .._serialization import Deserializer, Serializer + + +class PathClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "AsyncPipelineClient" + _config: PathClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/py.typed b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/py.typed new file mode 100644 index 00000000000..e5aff4f83af --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/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/parameters-path/setup.py b/packages/typespec-python/test/azure/generated/parameters-path/setup.py new file mode 100644 index 00000000000..f3ec11ac660 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/parameters-path/setup.py @@ -0,0 +1,69 @@ +# 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 = "parameters-path" +PACKAGE_PPRINT_NAME = "Parameters Path" + +# a-b-c => a/b/c +package_folder_path = PACKAGE_NAME.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 + "parameters", + ] + ), + include_package_data=True, + package_data={ + "parameters.path": ["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/asynctests/test_azure_client_generator_core_client_initialization_async.py b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_initialization_async.py new file mode 100644 index 00000000000..9de3a790f41 --- /dev/null +++ b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_initialization_async.py @@ -0,0 +1,50 @@ +# ------------------------------------------------------------------------- +# 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 specs.azure.clientgenerator.core.clientinitialization.aio import ( + HeaderParamClient, + MultipleParamsClient, + MixedParamsClient, + PathParamClient, + ParamAliasClient, +) +from specs.azure.clientgenerator.core.clientinitialization.models import Input + + +@pytest.mark.asyncio +async def test_header_param_client(): + async with HeaderParamClient("test-name-value") as client: + await client.with_query(id="test-id") + await client.with_body(Input(name="test-name")) + + +@pytest.mark.asyncio +async def test_multiple_params_client(): + async with MultipleParamsClient("test-name-value", "us-west") as client: + await client.with_query(id="test-id") + await client.with_body(Input(name="test-name")) + + +@pytest.mark.asyncio +async def test_mixed_params_client(): + async with MixedParamsClient("test-name-value") as client: + await client.with_query(region="us-west", id="test-id") + await client.with_body(Input(name="test-name"), region="us-west") + + +@pytest.mark.asyncio +async def test_path_param_client(): + async with PathParamClient("sample-blob") as client: + await client.with_query(format="text") + await client.get_standalone() + await client.delete_standalone() + + +@pytest.mark.asyncio +async def test_param_alias_client(): + async with ParamAliasClient("sample-blob") as client: + await client.with_aliased_name() + await client.with_original_name() \ No newline at end of file diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_client_initialization.py b/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_client_initialization.py new file mode 100644 index 00000000000..ce2a4de3d2a --- /dev/null +++ b/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_client_initialization.py @@ -0,0 +1,44 @@ +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +from specs.azure.clientgenerator.core.clientinitialization import ( + HeaderParamClient, + MultipleParamsClient, + MixedParamsClient, + PathParamClient, + ParamAliasClient, +) +from specs.azure.clientgenerator.core.clientinitialization.models import Input + + +def test_header_param_client(): + with HeaderParamClient("test-name-value") as client: + client.with_query(id="test-id") + client.with_body(Input(name="test-name")) + + +def test_multiple_params_client(): + with MultipleParamsClient("test-name-value", "us-west") as client: + client.with_query(id="test-id") + client.with_body(Input(name="test-name")) + + +def test_mixed_params_client(): + with MixedParamsClient("test-name-value") as client: + client.with_query(region="us-west", id="test-id") + client.with_body(Input(name="test-name"), region="us-west") + + +def test_path_param_client(): + with PathParamClient("sample-blob") as client: + client.with_query(format="text") + client.get_standalone() + client.delete_standalone() + + +def test_param_alias_client(): + with ParamAliasClient("sample-blob") as client: + client.with_aliased_name() + client.with_original_name() \ 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 e9163a6df96..da1cb2fa2e7 100644 --- a/packages/typespec-python/test/azure/requirements.txt +++ b/packages/typespec-python/test/azure/requirements.txt @@ -5,8 +5,9 @@ pytest-asyncio==0.14.0;python_full_version>="3.5.2" azure-mgmt-core==1.5.0 # only for azure -e ./generated/azure-client-generator-core-access --e ./generated/azure-client-generator-core-usage +-e ./generated/azure-client-generator-core-client-initialization -e ./generated/azure-client-generator-core-flatten-property +-e ./generated/azure-client-generator-core-usage -e ./generated/azure-core-basic -e ./generated/azure-core-scalar -e ./generated/azure-core-lro-rpc @@ -37,6 +38,7 @@ azure-mgmt-core==1.5.0 -e ./generated/encode-numeric -e ./generated/parameters-basic -e ./generated/parameters-collection-format +-e ./generated/parameters-path -e ./generated/parameters-spread -e ./generated/serialization-encoded-name-json -e ./generated/server-endpoint-not-defined diff --git a/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_parameters_path_async.py b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_parameters_path_async.py new file mode 100644 index 00000000000..9b531be2a9c --- /dev/null +++ b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_parameters_path_async.py @@ -0,0 +1,24 @@ +# ------------------------------------------------------------------------- +# 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 parameters.path.aio import PathClient + + +@pytest.fixture +async def client(): + async with PathClient() as client: + yield client + + +@pytest.mark.asyncio +async def test_normal(client: PathClient): + await client.normal("foo") + + +@pytest.mark.asyncio +async def test_optional(client: PathClient): + await client.optional() + await client.optional(name="foo") \ No newline at end of file diff --git a/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_payload_json_merge_patch_async.py b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_payload_json_merge_patch_async.py index 601a64482b3..e276944be33 100644 --- a/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_payload_json_merge_patch_async.py +++ b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_payload_json_merge_patch_async.py @@ -28,7 +28,7 @@ async def test_create_resource(client: JsonMergePatchClient): map={"key": inner_madge}, array=[inner_madge], int_value=1, - float_value=1.1, + float_value=1.25, inner_model=inner_madge, int_array=[1, 2, 3], ) diff --git a/packages/typespec-python/test/generic_mock_api_tests/test_parameters_path.py b/packages/typespec-python/test/generic_mock_api_tests/test_parameters_path.py new file mode 100644 index 00000000000..0e5ebf1cd16 --- /dev/null +++ b/packages/typespec-python/test/generic_mock_api_tests/test_parameters_path.py @@ -0,0 +1,22 @@ +# ------------------------------------------------------------------------- +# 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 parameters.path import PathClient + + +@pytest.fixture +def client(): + with PathClient() as client: + yield client + + +def test_normal(client: PathClient): + client.normal("foo") + + +def test_optional(client: PathClient): + client.optional() + client.optional(name="foo") \ No newline at end of file diff --git a/packages/typespec-python/test/generic_mock_api_tests/test_payload_json_merge_patch.py b/packages/typespec-python/test/generic_mock_api_tests/test_payload_json_merge_patch.py index af0a9afea8c..d4dcbedc036 100644 --- a/packages/typespec-python/test/generic_mock_api_tests/test_payload_json_merge_patch.py +++ b/packages/typespec-python/test/generic_mock_api_tests/test_payload_json_merge_patch.py @@ -27,7 +27,7 @@ def test_create_resource(client: JsonMergePatchClient): map={"key": inner_madge}, array=[inner_madge], int_value=1, - float_value=1.1, + float_value=1.25, inner_model=inner_madge, int_array=[1, 2, 3], ) diff --git a/packages/typespec-python/test/unbranded/generated/parameters-path/CHANGELOG.md b/packages/typespec-python/test/unbranded/generated/parameters-path/CHANGELOG.md new file mode 100644 index 00000000000..628743d283a --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/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/parameters-path/MANIFEST.in b/packages/typespec-python/test/unbranded/generated/parameters-path/MANIFEST.in new file mode 100644 index 00000000000..e45803b3814 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/MANIFEST.in @@ -0,0 +1,6 @@ +include *.md +include LICENSE +include parameters/path/py.typed +recursive-include tests *.py +recursive-include samples *.py *.md +include parameters/__init__.py diff --git a/packages/typespec-python/test/unbranded/generated/parameters-path/README.md b/packages/typespec-python/test/unbranded/generated/parameters-path/README.md new file mode 100644 index 00000000000..e69de29bb2d diff --git a/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/__init__.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/__init__.py new file mode 100644 index 00000000000..d55ccad1f57 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/__init__.py @@ -0,0 +1 @@ +__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/__init__.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/__init__.py new file mode 100644 index 00000000000..508e710f67f --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/__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 PathClient # 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__ = [ + "PathClient", +] +__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/parameters-path/parameters/path/_client.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_client.py new file mode 100644 index 00000000000..c1d582d471d --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_client.py @@ -0,0 +1,79 @@ +# coding=utf-8 + +from copy import deepcopy +from typing import Any +from typing_extensions import Self + +from corehttp.rest import HttpRequest, HttpResponse +from corehttp.runtime import PipelineClient, policies + +from ._configuration import PathClientConfiguration +from ._operations import PathClientOperationsMixin +from ._serialization import Deserializer, Serializer + + +class PathClient(PathClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Test for path parameters cases. + + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = PathClientConfiguration(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/parameters-path/parameters/path/_configuration.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_configuration.py new file mode 100644 index 00000000000..d8efc2a811d --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_configuration.py @@ -0,0 +1,33 @@ +# coding=utf-8 + +from typing import Any + +from corehttp.runtime import policies + +from ._version import VERSION + + +class PathClientConfiguration: + """Configuration for PathClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "parameters-path/{}".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") diff --git a/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_model_base.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_model_base.py new file mode 100644 index 00000000000..e69ff2ca36d --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_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/parameters-path/parameters/path/_operations/__init__.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_operations/__init__.py new file mode 100644 index 00000000000..5580c02c816 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_operations/__init__.py @@ -0,0 +1,19 @@ +# 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 ._operations import PathClientOperationsMixin # type: ignore + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "PathClientOperationsMixin", +] +__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/parameters-path/parameters/path/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_operations/_operations.py new file mode 100644 index 00000000000..5268809f58e --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_operations/_operations.py @@ -0,0 +1,140 @@ +# 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.pipeline import PipelineResponse + +from .._serialization import Serializer +from .._vendor import PathClientMixinABC + +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +_SERIALIZER = Serializer() +_SERIALIZER.client_side_validation = False + + +def build_path_normal_request(name: str, **kwargs: Any) -> HttpRequest: + # Construct URL + _url = "/parameters/path/normal/{name}" + path_format_arguments = { + "name": _SERIALIZER.url("name", name, "str"), + } + + _url: str = _url.format(**path_format_arguments) # type: ignore + + return HttpRequest(method="GET", url=_url, **kwargs) + + +def build_path_optional_request(name: Optional[str] = None, **kwargs: Any) -> HttpRequest: + # Construct URL + _url = "/parameters/path/optional{name}" + path_format_arguments = { + "name": _SERIALIZER.url("name", name, "str"), + } + + _url: str = _url.format(**path_format_arguments) # type: ignore + + return HttpRequest(method="GET", url=_url, **kwargs) + + +class PathClientOperationsMixin(PathClientMixinABC): + + def normal(self, name: str, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + """normal. + + :param name: Required. + :type name: str + :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_path_normal_request( + name=name, + 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 optional( # pylint: disable=inconsistent-return-statements + self, name: Optional[str] = None, **kwargs: Any + ) -> None: + """optional. + + :param name: Default value is None. + :type name: str + :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_path_optional_request( + name=name, + 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 diff --git a/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_operations/_patch.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_operations/_patch.py new file mode 100644 index 00000000000..894b28a174c --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_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/parameters-path/parameters/path/_patch.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_patch.py new file mode 100644 index 00000000000..894b28a174c --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_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/parameters-path/parameters/path/_serialization.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_serialization.py new file mode 100644 index 00000000000..99f537b5eb6 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_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/parameters-path/parameters/path/_vendor.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_vendor.py new file mode 100644 index 00000000000..8a31b59a1ef --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_vendor.py @@ -0,0 +1,18 @@ +from abc import ABC +from typing import TYPE_CHECKING + +from ._configuration import PathClientConfiguration + +if TYPE_CHECKING: + from corehttp.runtime import PipelineClient + + from ._serialization import Deserializer, Serializer + + +class PathClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "PipelineClient" + _config: PathClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_version.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_version.py new file mode 100644 index 00000000000..9f6458b8cda --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_version.py @@ -0,0 +1,3 @@ +# coding=utf-8 + +VERSION = "1.0.0b1" diff --git a/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/__init__.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/__init__.py new file mode 100644 index 00000000000..bb4f6c6a653 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/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 PathClient # 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__ = [ + "PathClient", +] +__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/parameters-path/parameters/path/aio/_client.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_client.py new file mode 100644 index 00000000000..52b7d74c20e --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_client.py @@ -0,0 +1,81 @@ +# coding=utf-8 + +from copy import deepcopy +from typing import Any, Awaitable +from typing_extensions import Self + +from corehttp.rest import AsyncHttpResponse, HttpRequest +from corehttp.runtime import AsyncPipelineClient, policies + +from .._serialization import Deserializer, Serializer +from ._configuration import PathClientConfiguration +from ._operations import PathClientOperationsMixin + + +class PathClient(PathClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Test for path parameters cases. + + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = PathClientConfiguration(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/parameters-path/parameters/path/aio/_configuration.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_configuration.py new file mode 100644 index 00000000000..93b9fc2a084 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_configuration.py @@ -0,0 +1,33 @@ +# coding=utf-8 + +from typing import Any + +from corehttp.runtime import policies + +from .._version import VERSION + + +class PathClientConfiguration: + """Configuration for PathClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "parameters-path/{}".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") diff --git a/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_operations/__init__.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_operations/__init__.py new file mode 100644 index 00000000000..5580c02c816 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_operations/__init__.py @@ -0,0 +1,19 @@ +# 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 ._operations import PathClientOperationsMixin # type: ignore + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "PathClientOperationsMixin", +] +__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/parameters-path/parameters/path/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_operations/_operations.py new file mode 100644 index 00000000000..3c0e6fa38ea --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_operations/_operations.py @@ -0,0 +1,115 @@ +# 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.pipeline import PipelineResponse + +from ..._operations._operations import build_path_normal_request, build_path_optional_request +from .._vendor import PathClientMixinABC + +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + + +class PathClientOperationsMixin(PathClientMixinABC): + + async def normal(self, name: str, **kwargs: Any) -> None: + """normal. + + :param name: Required. + :type name: str + :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_path_normal_request( + name=name, + 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 optional(self, name: Optional[str] = None, **kwargs: Any) -> None: + """optional. + + :param name: Default value is None. + :type name: str + :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_path_optional_request( + name=name, + 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 diff --git a/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_operations/_patch.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_operations/_patch.py new file mode 100644 index 00000000000..894b28a174c --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/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/parameters-path/parameters/path/aio/_patch.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_patch.py new file mode 100644 index 00000000000..894b28a174c --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/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/parameters-path/parameters/path/aio/_vendor.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_vendor.py new file mode 100644 index 00000000000..a5607590621 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_vendor.py @@ -0,0 +1,18 @@ +from abc import ABC +from typing import TYPE_CHECKING + +from ._configuration import PathClientConfiguration + +if TYPE_CHECKING: + from corehttp.runtime import AsyncPipelineClient + + from .._serialization import Deserializer, Serializer + + +class PathClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "AsyncPipelineClient" + _config: PathClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/py.typed b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/py.typed new file mode 100644 index 00000000000..e5aff4f83af --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/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/parameters-path/setup.py b/packages/typespec-python/test/unbranded/generated/parameters-path/setup.py new file mode 100644 index 00000000000..4f63d98d66d --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/setup.py @@ -0,0 +1,60 @@ +# coding=utf-8 + + +import os +import re +from setuptools import setup, find_packages + + +PACKAGE_NAME = "parameters-path" +PACKAGE_PPRINT_NAME = "Parameters Path" + +# a-b-c => a/b/c +package_folder_path = PACKAGE_NAME.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 + "parameters", + ] + ), + include_package_data=True, + package_data={ + "parameters.path": ["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/requirements.txt b/packages/typespec-python/test/unbranded/requirements.txt index 223e748ed5e..92b3af2feb9 100644 --- a/packages/typespec-python/test/unbranded/requirements.txt +++ b/packages/typespec-python/test/unbranded/requirements.txt @@ -12,6 +12,7 @@ pytest-asyncio==0.14.0;python_full_version>="3.5.2" -e ./generated/encode-numeric -e ./generated/parameters-basic -e ./generated/parameters-collection-format +-e ./generated/parameters-path -e ./generated/parameters-spread -e ./generated/serialization-encoded-name-json -e ./generated/server-endpoint-not-defined diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 60ffb442f64..92999f15889 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -58,7 +58,7 @@ importers: version: 1.0.2 '@typespec/http-client-python': specifier: ~0.10.0 - version: 0.10.0(2ivfmxvrftapo7cbuxsaae6yq4) + version: 0.10.0(snncae6gzwxjtoyf2aptgh5sru) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -80,7 +80,7 @@ importers: dependencies: '@typespec/http-client-python': specifier: ~0.10.0 - version: 0.10.0(2ivfmxvrftapo7cbuxsaae6yq4) + version: 0.10.0(snncae6gzwxjtoyf2aptgh5sru) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -95,11 +95,11 @@ importers: version: 4.19.3 devDependencies: '@azure-tools/azure-http-specs': - specifier: 0.1.0-alpha.13 - version: 0.1.0-alpha.13(gfm3f7krb5pm5nvwh6qqwmbzcy) + specifier: 0.1.0-alpha.14 + version: 0.1.0-alpha.14(gfm3f7krb5pm5nvwh6qqwmbzcy) '@azure-tools/typespec-autorest': specifier: ~0.54.0 - version: 0.54.0(eijwshhpe4ydfv4uxokr3dajqe) + version: 0.54.0(psqtwvjmgth7tsukc2x2eth2za) '@azure-tools/typespec-azure-core': specifier: ~0.54.0 version: 0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))) @@ -108,10 +108,10 @@ importers: version: 0.54.0(sq74qt2k6r4fvjwy37msq4cl7a) '@azure-tools/typespec-azure-rulesets': specifier: ~0.54.0 - version: 0.54.0(@azure-tools/typespec-azure-core@0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))))(@azure-tools/typespec-azure-resource-manager@0.54.0(sq74qt2k6r4fvjwy37msq4cl7a))(@azure-tools/typespec-client-generator-core@0.54.0(qizmnx62cykc7f5nejydwkmymm))(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)) + version: 0.54.0(@azure-tools/typespec-azure-core@0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))))(@azure-tools/typespec-azure-resource-manager@0.54.0(sq74qt2k6r4fvjwy37msq4cl7a))(@azure-tools/typespec-client-generator-core@0.54.2(qizmnx62cykc7f5nejydwkmymm))(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)) '@azure-tools/typespec-client-generator-core': - specifier: ~0.54.0 - version: 0.54.0(qizmnx62cykc7f5nejydwkmymm) + specifier: ~0.54.2 + version: 0.54.2(qizmnx62cykc7f5nejydwkmymm) '@types/fs-extra': specifier: 11.0.4 version: 11.0.4 @@ -137,8 +137,8 @@ importers: specifier: ^1.0.0-0 version: 1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))) '@typespec/http-specs': - specifier: 0.1.0-alpha.17 - version: 0.1.0-alpha.17(@types/node@22.13.17)(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))(@typespec/versioning@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))(@typespec/xml@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))) + specifier: 0.1.0-alpha.19 + version: 0.1.0-alpha.19(@types/node@22.13.17)(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))(@typespec/versioning@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))(@typespec/xml@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))) '@typespec/openapi': specifier: ^1.0.0-0 version: 1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))) @@ -191,8 +191,8 @@ packages: resolution: {integrity: sha512-T21naRb6JDdjjn2s/zwr9iCIv/9jviL/PRtiWAhi+3UA2WKH2wrId2VqJa4uVD7iEV8BLkuGgFmMkaMBG26hFw==} engines: {node: '>=12.0.0'} - '@azure-tools/azure-http-specs@0.1.0-alpha.13': - resolution: {integrity: sha512-viKd9OK5rQbuwIiH9ihYQBjvXg/14XH94d3YdeMuTzGaceCbJxqrj/mm/XLPWrT+kHt3rEUhf06TEsmLGdqECQ==} + '@azure-tools/azure-http-specs@0.1.0-alpha.14': + resolution: {integrity: sha512-bVvVVG69Dh+1uMLV6sWpXS/awz84J8irs3w/NzE+NOE6qyWt0ZlOcp5hLU2gCp0LjxA0k0jq7OAkHJ2APsUS7Q==} engines: {node: '>=20.0.0'} peerDependencies: '@azure-tools/typespec-azure-core': ^0.54.0 @@ -243,8 +243,8 @@ packages: '@azure-tools/typespec-client-generator-core': ^0.54.0 '@typespec/compiler': ^1.0.0-rc.0 - '@azure-tools/typespec-client-generator-core@0.54.0': - resolution: {integrity: sha512-qZR6FgB+wKfF5aRQtEwjUo6xgw1MomqyFwJf6WL+xstHDs7np3jBja43OCdJaooPzAknYWh2V+Hv77/fLFd9Aw==} + '@azure-tools/typespec-client-generator-core@0.54.2': + resolution: {integrity: sha512-Ca6uqichXdFvB+ZoXaF3sBrVVlp8r8HNf9v5sBRnfEBM9yRte8+cp04vrEHuPKyvbOTBJPldWqFEhIK7SpnywA==} engines: {node: '>=20.0.0'} peerDependencies: '@azure-tools/typespec-azure-core': ^0.54.0 @@ -1557,8 +1557,8 @@ packages: '@typespec/versioning': '>=0.68.0 <1.0.0' '@typespec/xml': '>=0.68.0 <1.0.0' - '@typespec/http-specs@0.1.0-alpha.17': - resolution: {integrity: sha512-nwifWlVfq5vDpfrLufaRAOw+vT9owBU9qlrJ2wtrki8Y5dognGnFwi7pEz23KgbySL3x/WmtwY6x40kSH4tHlg==} + '@typespec/http-specs@0.1.0-alpha.19': + resolution: {integrity: sha512-kx3uOAQT3xJCYGuloVGG9kvDCKzw1SjYsqONFCm1BII06DCbDfkp1M/yrol/uGwNK3N23ITPC/rgErW8rtYRQg==} engines: {node: '>=16.0.0'} peerDependencies: '@typespec/compiler': ^1.0.0-rc.0 @@ -4438,7 +4438,7 @@ snapshots: command-exists: 1.2.9 semver: 7.6.3 - '@azure-tools/azure-http-specs@0.1.0-alpha.13(gfm3f7krb5pm5nvwh6qqwmbzcy)': + '@azure-tools/azure-http-specs@0.1.0-alpha.14(gfm3f7krb5pm5nvwh6qqwmbzcy)': dependencies: '@azure-tools/typespec-azure-core': 0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))) '@typespec/compiler': 1.0.0-rc.0(@types/node@22.13.17) @@ -4453,11 +4453,11 @@ snapshots: - '@typespec/streams' - supports-color - '@azure-tools/typespec-autorest@0.54.0(eijwshhpe4ydfv4uxokr3dajqe)': + '@azure-tools/typespec-autorest@0.54.0(psqtwvjmgth7tsukc2x2eth2za)': dependencies: '@azure-tools/typespec-azure-core': 0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))) '@azure-tools/typespec-azure-resource-manager': 0.54.0(sq74qt2k6r4fvjwy37msq4cl7a) - '@azure-tools/typespec-client-generator-core': 0.54.0(qizmnx62cykc7f5nejydwkmymm) + '@azure-tools/typespec-client-generator-core': 0.54.2(qizmnx62cykc7f5nejydwkmymm) '@typespec/compiler': 1.0.0-rc.0(@types/node@22.13.17) '@typespec/http': 1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))) '@typespec/openapi': 1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))) @@ -4481,14 +4481,14 @@ snapshots: change-case: 5.4.4 pluralize: 8.0.0 - '@azure-tools/typespec-azure-rulesets@0.54.0(@azure-tools/typespec-azure-core@0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))))(@azure-tools/typespec-azure-resource-manager@0.54.0(sq74qt2k6r4fvjwy37msq4cl7a))(@azure-tools/typespec-client-generator-core@0.54.0(qizmnx62cykc7f5nejydwkmymm))(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))': + '@azure-tools/typespec-azure-rulesets@0.54.0(@azure-tools/typespec-azure-core@0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))))(@azure-tools/typespec-azure-resource-manager@0.54.0(sq74qt2k6r4fvjwy37msq4cl7a))(@azure-tools/typespec-client-generator-core@0.54.2(qizmnx62cykc7f5nejydwkmymm))(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))': dependencies: '@azure-tools/typespec-azure-core': 0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))) '@azure-tools/typespec-azure-resource-manager': 0.54.0(sq74qt2k6r4fvjwy37msq4cl7a) - '@azure-tools/typespec-client-generator-core': 0.54.0(qizmnx62cykc7f5nejydwkmymm) + '@azure-tools/typespec-client-generator-core': 0.54.2(qizmnx62cykc7f5nejydwkmymm) '@typespec/compiler': 1.0.0-rc.0(@types/node@22.13.17) - '@azure-tools/typespec-client-generator-core@0.54.0(qizmnx62cykc7f5nejydwkmymm)': + '@azure-tools/typespec-client-generator-core@0.54.2(qizmnx62cykc7f5nejydwkmymm)': dependencies: '@azure-tools/typespec-azure-core': 0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))) '@typespec/compiler': 1.0.0-rc.0(@types/node@22.13.17) @@ -5893,13 +5893,13 @@ snapshots: dependencies: '@typespec/compiler': 1.0.0-rc.0(@types/node@22.13.17) - '@typespec/http-client-python@0.10.0(2ivfmxvrftapo7cbuxsaae6yq4)': + '@typespec/http-client-python@0.10.0(snncae6gzwxjtoyf2aptgh5sru)': dependencies: - '@azure-tools/typespec-autorest': 0.54.0(eijwshhpe4ydfv4uxokr3dajqe) + '@azure-tools/typespec-autorest': 0.54.0(psqtwvjmgth7tsukc2x2eth2za) '@azure-tools/typespec-azure-core': 0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))) '@azure-tools/typespec-azure-resource-manager': 0.54.0(sq74qt2k6r4fvjwy37msq4cl7a) - '@azure-tools/typespec-azure-rulesets': 0.54.0(@azure-tools/typespec-azure-core@0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))))(@azure-tools/typespec-azure-resource-manager@0.54.0(sq74qt2k6r4fvjwy37msq4cl7a))(@azure-tools/typespec-client-generator-core@0.54.0(qizmnx62cykc7f5nejydwkmymm))(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)) - '@azure-tools/typespec-client-generator-core': 0.54.0(qizmnx62cykc7f5nejydwkmymm) + '@azure-tools/typespec-azure-rulesets': 0.54.0(@azure-tools/typespec-azure-core@0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))))(@azure-tools/typespec-azure-resource-manager@0.54.0(sq74qt2k6r4fvjwy37msq4cl7a))(@azure-tools/typespec-client-generator-core@0.54.2(qizmnx62cykc7f5nejydwkmymm))(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)) + '@azure-tools/typespec-client-generator-core': 0.54.2(qizmnx62cykc7f5nejydwkmymm) '@typespec/compiler': 1.0.0-rc.0(@types/node@22.13.17) '@typespec/events': 0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)) '@typespec/http': 1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))) @@ -5918,7 +5918,7 @@ snapshots: - bufferutil - utf-8-validate - '@typespec/http-specs@0.1.0-alpha.17(@types/node@22.13.17)(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))(@typespec/versioning@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))(@typespec/xml@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))': + '@typespec/http-specs@0.1.0-alpha.19(@types/node@22.13.17)(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))(@typespec/versioning@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))(@typespec/xml@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))': dependencies: '@typespec/compiler': 1.0.0-rc.0(@types/node@22.13.17) '@typespec/http': 1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))) From 957fa4a8da68fbdd939b18d5c00dd8433a2022e9 Mon Sep 17 00:00:00 2001 From: Chenjie Shi Date: Mon, 21 Apr 2025 12:24:01 +0000 Subject: [PATCH 2/7] changeset --- .chronus/changes/upgrade_version-2025-3-21-12-23-56.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .chronus/changes/upgrade_version-2025-3-21-12-23-56.md diff --git a/.chronus/changes/upgrade_version-2025-3-21-12-23-56.md b/.chronus/changes/upgrade_version-2025-3-21-12-23-56.md new file mode 100644 index 00000000000..88b466180b4 --- /dev/null +++ b/.chronus/changes/upgrade_version-2025-3-21-12-23-56.md @@ -0,0 +1,7 @@ +--- +changeKind: dependencies +packages: + - "@azure-tools/typespec-python" +--- + +Bump to http-client-python 0.11.0 \ No newline at end of file From 285aeea6258eb4e6c84b70b3b11375259a9c989b Mon Sep 17 00:00:00 2001 From: Chenjie Shi Date: Mon, 21 Apr 2025 12:40:10 +0000 Subject: [PATCH 3/7] black --- ...t_azure_client_generator_core_client_initialization_async.py | 2 +- .../test_azure_client_generator_core_client_initialization.py | 2 +- .../asynctests/test_parameters_path_async.py | 2 +- .../test/generic_mock_api_tests/test_parameters_path.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_initialization_async.py b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_initialization_async.py index 9de3a790f41..2ae2c816ab9 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_initialization_async.py +++ b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_initialization_async.py @@ -47,4 +47,4 @@ async def test_path_param_client(): async def test_param_alias_client(): async with ParamAliasClient("sample-blob") as client: await client.with_aliased_name() - await client.with_original_name() \ No newline at end of file + await client.with_original_name() diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_client_initialization.py b/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_client_initialization.py index ce2a4de3d2a..47d2fd23900 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_client_initialization.py +++ b/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_client_initialization.py @@ -41,4 +41,4 @@ def test_path_param_client(): def test_param_alias_client(): with ParamAliasClient("sample-blob") as client: client.with_aliased_name() - client.with_original_name() \ No newline at end of file + client.with_original_name() diff --git a/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_parameters_path_async.py b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_parameters_path_async.py index 9b531be2a9c..eeef36a301a 100644 --- a/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_parameters_path_async.py +++ b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_parameters_path_async.py @@ -21,4 +21,4 @@ async def test_normal(client: PathClient): @pytest.mark.asyncio async def test_optional(client: PathClient): await client.optional() - await client.optional(name="foo") \ No newline at end of file + await client.optional(name="foo") diff --git a/packages/typespec-python/test/generic_mock_api_tests/test_parameters_path.py b/packages/typespec-python/test/generic_mock_api_tests/test_parameters_path.py index 0e5ebf1cd16..71c6257e67f 100644 --- a/packages/typespec-python/test/generic_mock_api_tests/test_parameters_path.py +++ b/packages/typespec-python/test/generic_mock_api_tests/test_parameters_path.py @@ -19,4 +19,4 @@ def test_normal(client: PathClient): def test_optional(client: PathClient): client.optional() - client.optional(name="foo") \ No newline at end of file + client.optional(name="foo") From a34760663d344778b1d82d138a3b4569379a9d04 Mon Sep 17 00:00:00 2001 From: Chenjie Shi Date: Mon, 21 Apr 2025 13:16:56 +0000 Subject: [PATCH 4/7] update --- packages/typespec-python/package.json | 2 +- .../apiview-properties.json | 13 +- .../_operations/_operations.py | 6 +- .../aio/_operations/_operations.py | 2 +- .../apiview-properties.json | 10 +- .../parameters-path/apiview-properties.json | 4 +- .../path/_operations/_operations.py | 10 +- .../path/aio/_operations/_operations.py | 6 +- .../apiview-properties.json | 4 +- .../apiview-properties.json | 3 +- .../apiview-properties.json | 192 ++++++++++++------ .../apiview-properties.json | 3 +- .../path/_operations/_operations.py | 10 +- .../path/aio/_operations/_operations.py | 6 +- pnpm-lock.yaml | 48 ++++- 15 files changed, 224 insertions(+), 95 deletions(-) diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json index aad3cbf104c..613ef45ccad 100644 --- a/packages/typespec-python/package.json +++ b/packages/typespec-python/package.json @@ -64,7 +64,7 @@ "js-yaml": "~4.1.0", "semver": "~7.6.2", "tsx": "~4.19.1", - "@typespec/http-client-python": "~0.10.0", + "@typespec/http-client-python": "~0.11.0", "fs-extra": "~11.2.0" }, "devDependencies": { diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/apiview-properties.json index 8bbac3f9070..7cc34fdb2e4 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/apiview-properties.json @@ -5,15 +5,26 @@ "specs.azure.clientgenerator.core.clientinitialization.models.Input": "Service.Input", "specs.azure.clientgenerator.core.clientinitialization.models.WithBodyRequest": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.withBody.Request.anonymous", "specs.azure.clientgenerator.core.clientinitialization.HeaderParamClient.with_query": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.HeaderParam.withQuery", + "specs.azure.clientgenerator.core.clientinitialization.aio.HeaderParamClient.with_query": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.HeaderParam.withQuery", "specs.azure.clientgenerator.core.clientinitialization.HeaderParamClient.with_body": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.HeaderParam.withBody", + "specs.azure.clientgenerator.core.clientinitialization.aio.HeaderParamClient.with_body": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.HeaderParam.withBody", "specs.azure.clientgenerator.core.clientinitialization.MultipleParamsClient.with_query": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.MultipleParams.withQuery", + "specs.azure.clientgenerator.core.clientinitialization.aio.MultipleParamsClient.with_query": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.MultipleParams.withQuery", "specs.azure.clientgenerator.core.clientinitialization.MultipleParamsClient.with_body": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.MultipleParams.withBody", + "specs.azure.clientgenerator.core.clientinitialization.aio.MultipleParamsClient.with_body": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.MultipleParams.withBody", "specs.azure.clientgenerator.core.clientinitialization.MixedParamsClient.with_query": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.MixedParams.withQuery", + "specs.azure.clientgenerator.core.clientinitialization.aio.MixedParamsClient.with_query": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.MixedParams.withQuery", "specs.azure.clientgenerator.core.clientinitialization.MixedParamsClient.with_body": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.MixedParams.withBody", + "specs.azure.clientgenerator.core.clientinitialization.aio.MixedParamsClient.with_body": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.MixedParams.withBody", "specs.azure.clientgenerator.core.clientinitialization.PathParamClient.with_query": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.PathParam.withQuery", + "specs.azure.clientgenerator.core.clientinitialization.aio.PathParamClient.with_query": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.PathParam.withQuery", "specs.azure.clientgenerator.core.clientinitialization.PathParamClient.get_standalone": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.PathParam.getStandalone", + "specs.azure.clientgenerator.core.clientinitialization.aio.PathParamClient.get_standalone": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.PathParam.getStandalone", "specs.azure.clientgenerator.core.clientinitialization.PathParamClient.delete_standalone": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.PathParam.deleteStandalone", + "specs.azure.clientgenerator.core.clientinitialization.aio.PathParamClient.delete_standalone": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.PathParam.deleteStandalone", "specs.azure.clientgenerator.core.clientinitialization.ParamAliasClient.with_aliased_name": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.ParamAlias.withAliasedName", - "specs.azure.clientgenerator.core.clientinitialization.ParamAliasClient.with_original_name": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.ParamAlias.withOriginalName" + "specs.azure.clientgenerator.core.clientinitialization.aio.ParamAliasClient.with_aliased_name": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.ParamAlias.withAliasedName", + "specs.azure.clientgenerator.core.clientinitialization.ParamAliasClient.with_original_name": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.ParamAlias.withOriginalName", + "specs.azure.clientgenerator.core.clientinitialization.aio.ParamAliasClient.with_original_name": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.ParamAlias.withOriginalName" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_operations/_operations.py index 4f051b8f607..26afe2e243c 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_operations/_operations.py @@ -199,12 +199,12 @@ def build_path_param_delete_standalone_request( # pylint: disable=name-too-long def build_param_alias_with_aliased_name_request( # pylint: disable=name-too-long - blob: str, **kwargs: Any + blob_name: str, **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/azure/client-generator-core/client-initialization/param-alias/{blob}/with-aliased-name" path_format_arguments = { - "blob": _SERIALIZER.url("blob", blob, "str"), + "blob": _SERIALIZER.url("blob_name", blob_name, "str"), } _url: str = _url.format(**path_format_arguments) # type: ignore @@ -882,7 +882,7 @@ def with_aliased_name(self, **kwargs: Any) -> None: # pylint: disable=inconsist cls: ClsType[None] = kwargs.pop("cls", None) _request = build_param_alias_with_aliased_name_request( - blob=self._config.blob, + blob_name=self._config.blob_name, headers=_headers, params=_params, ) diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_operations/_operations.py index 72a9c9d38e9..f102063d7e7 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/aio/_operations/_operations.py @@ -706,7 +706,7 @@ async def with_aliased_name(self, **kwargs: Any) -> None: cls: ClsType[None] = kwargs.pop("cls", None) _request = build_param_alias_with_aliased_name_request( - blob=self._config.blob, + blob_name=self._config.blob_name, headers=_headers, params=_params, ) diff --git a/packages/typespec-python/test/azure/generated/parameters-body-optionality/apiview-properties.json b/packages/typespec-python/test/azure/generated/parameters-body-optionality/apiview-properties.json index 67bff975405..e293789defa 100644 --- a/packages/typespec-python/test/azure/generated/parameters-body-optionality/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/parameters-body-optionality/apiview-properties.json @@ -2,9 +2,13 @@ "CrossLanguagePackageId": "Parameters.BodyOptionality", "CrossLanguageDefinitionId": { "parameters.bodyoptionality.models.BodyModel": "Parameters.BodyOptionality.BodyModel", - "parameters.bodyoptionality.BodyOptionalityClient.optional_explicit.set": "Parameters.BodyOptionality.OptionalExplicit.set", - "parameters.bodyoptionality.BodyOptionalityClient.optional_explicit.omit": "Parameters.BodyOptionality.OptionalExplicit.omit", + "parameters.bodyoptionality.operations.OptionalExplicitOperations.set": "Parameters.BodyOptionality.OptionalExplicit.set", + "parameters.bodyoptionality.aio.operations.OptionalExplicitOperations.set": "Parameters.BodyOptionality.OptionalExplicit.set", + "parameters.bodyoptionality.operations.OptionalExplicitOperations.omit": "Parameters.BodyOptionality.OptionalExplicit.omit", + "parameters.bodyoptionality.aio.operations.OptionalExplicitOperations.omit": "Parameters.BodyOptionality.OptionalExplicit.omit", "parameters.bodyoptionality.BodyOptionalityClient.required_explicit": "Parameters.BodyOptionality.requiredExplicit", - "parameters.bodyoptionality.BodyOptionalityClient.required_implicit": "Parameters.BodyOptionality.requiredImplicit" + "parameters.bodyoptionality.aio.BodyOptionalityClient.required_explicit": "Parameters.BodyOptionality.requiredExplicit", + "parameters.bodyoptionality.BodyOptionalityClient.required_implicit": "Parameters.BodyOptionality.requiredImplicit", + "parameters.bodyoptionality.aio.BodyOptionalityClient.required_implicit": "Parameters.BodyOptionality.requiredImplicit" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/parameters-path/apiview-properties.json b/packages/typespec-python/test/azure/generated/parameters-path/apiview-properties.json index 866435a7de3..354dce26ece 100644 --- a/packages/typespec-python/test/azure/generated/parameters-path/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/parameters-path/apiview-properties.json @@ -2,6 +2,8 @@ "CrossLanguagePackageId": "Parameters.Path", "CrossLanguageDefinitionId": { "parameters.path.PathClient.normal": "Parameters.Path.normal", - "parameters.path.PathClient.optional": "Parameters.Path.optional" + "parameters.path.aio.PathClient.normal": "Parameters.Path.normal", + "parameters.path.PathClient.optional": "Parameters.Path.optional", + "parameters.path.aio.PathClient.optional": "Parameters.Path.optional" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/_operations.py index 16dbd391de4..58695fec477 100644 --- a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/_operations.py @@ -42,11 +42,11 @@ def build_path_normal_request(name: str, **kwargs: Any) -> HttpRequest: return HttpRequest(method="GET", url=_url, **kwargs) -def build_path_optional_request(name: Optional[str] = None, **kwargs: Any) -> HttpRequest: +def build_path_optional_request(*, name: Optional[str] = None, **kwargs: Any) -> HttpRequest: # Construct URL _url = "/parameters/path/optional{name}" path_format_arguments = { - "name": _SERIALIZER.url("name", name, "str"), + "name": "" if name is None else "/" + _SERIALIZER.url("name", name, "str"), } _url: str = _url.format(**path_format_arguments) # type: ignore @@ -105,12 +105,12 @@ def normal(self, name: str, **kwargs: Any) -> None: # pylint: disable=inconsist @distributed_trace def optional( # pylint: disable=inconsistent-return-statements - self, name: Optional[str] = None, **kwargs: Any + self, *, name: Optional[str] = None, **kwargs: Any ) -> None: """optional. - :param name: Default value is None. - :type name: str + :keyword name: Default value is None. + :paramtype name: str :return: None :rtype: None :raises ~azure.core.exceptions.HttpResponseError: diff --git a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/_operations.py index 79e4fd3f35c..bc5a0e58677 100644 --- a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/_operations.py @@ -78,11 +78,11 @@ async def normal(self, name: str, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def optional(self, name: Optional[str] = None, **kwargs: Any) -> None: + async def optional(self, *, name: Optional[str] = None, **kwargs: Any) -> None: """optional. - :param name: Default value is None. - :type name: str + :keyword name: Default value is None. + :paramtype name: str :return: None :rtype: None :raises ~azure.core.exceptions.HttpResponseError: diff --git a/packages/typespec-python/test/azure/generated/server-path-multiple/apiview-properties.json b/packages/typespec-python/test/azure/generated/server-path-multiple/apiview-properties.json index 10c839bafa9..83a629abdeb 100644 --- a/packages/typespec-python/test/azure/generated/server-path-multiple/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/server-path-multiple/apiview-properties.json @@ -3,6 +3,8 @@ "CrossLanguageDefinitionId": { "server.path.multiple.models.Versions": "Server.Path.Multiple.Versions", "server.path.multiple.MultipleClient.no_operation_params": "Server.Path.Multiple.noOperationParams", - "server.path.multiple.MultipleClient.with_operation_path_param": "Server.Path.Multiple.withOperationPathParam" + "server.path.multiple.aio.MultipleClient.no_operation_params": "Server.Path.Multiple.noOperationParams", + "server.path.multiple.MultipleClient.with_operation_path_param": "Server.Path.Multiple.withOperationPathParam", + "server.path.multiple.aio.MultipleClient.with_operation_path_param": "Server.Path.Multiple.withOperationPathParam" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/server-path-single/apiview-properties.json b/packages/typespec-python/test/azure/generated/server-path-single/apiview-properties.json index 06f19423bcc..d9675f2908b 100644 --- a/packages/typespec-python/test/azure/generated/server-path-single/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/server-path-single/apiview-properties.json @@ -1,6 +1,7 @@ { "CrossLanguagePackageId": "Server.Path.Single", "CrossLanguageDefinitionId": { - "server.path.single.SingleClient.my_op": "Server.Path.Single.myOp" + "server.path.single.SingleClient.my_op": "Server.Path.Single.myOp", + "server.path.single.aio.SingleClient.my_op": "Server.Path.Single.myOp" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-property-optional/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-property-optional/apiview-properties.json index b0fbac3bf98..1ff9cc3430a 100644 --- a/packages/typespec-python/test/azure/generated/typetest-property-optional/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-property-optional/apiview-properties.json @@ -17,69 +17,133 @@ "typetest.property.optional.models.UnionFloatLiteralProperty": "Type.Property.Optional.UnionFloatLiteralProperty", "typetest.property.optional.models.UnionIntLiteralProperty": "Type.Property.Optional.UnionIntLiteralProperty", "typetest.property.optional.models.UnionStringLiteralProperty": "Type.Property.Optional.UnionStringLiteralProperty", - "typetest.property.optional.OptionalClient.string.get_all": "Type.Property.Optional.String.getAll", - "typetest.property.optional.OptionalClient.string.get_default": "Type.Property.Optional.String.getDefault", - "typetest.property.optional.OptionalClient.string.put_all": "Type.Property.Optional.String.putAll", - "typetest.property.optional.OptionalClient.string.put_default": "Type.Property.Optional.String.putDefault", - "typetest.property.optional.OptionalClient.bytes.get_all": "Type.Property.Optional.Bytes.getAll", - "typetest.property.optional.OptionalClient.bytes.get_default": "Type.Property.Optional.Bytes.getDefault", - "typetest.property.optional.OptionalClient.bytes.put_all": "Type.Property.Optional.Bytes.putAll", - "typetest.property.optional.OptionalClient.bytes.put_default": "Type.Property.Optional.Bytes.putDefault", - "typetest.property.optional.OptionalClient.datetime.get_all": "Type.Property.Optional.Datetime.getAll", - "typetest.property.optional.OptionalClient.datetime.get_default": "Type.Property.Optional.Datetime.getDefault", - "typetest.property.optional.OptionalClient.datetime.put_all": "Type.Property.Optional.Datetime.putAll", - "typetest.property.optional.OptionalClient.datetime.put_default": "Type.Property.Optional.Datetime.putDefault", - "typetest.property.optional.OptionalClient.duration.get_all": "Type.Property.Optional.Duration.getAll", - "typetest.property.optional.OptionalClient.duration.get_default": "Type.Property.Optional.Duration.getDefault", - "typetest.property.optional.OptionalClient.duration.put_all": "Type.Property.Optional.Duration.putAll", - "typetest.property.optional.OptionalClient.duration.put_default": "Type.Property.Optional.Duration.putDefault", - "typetest.property.optional.OptionalClient.plain_date.get_all": "Type.Property.Optional.PlainDate.getAll", - "typetest.property.optional.OptionalClient.plain_date.get_default": "Type.Property.Optional.PlainDate.getDefault", - "typetest.property.optional.OptionalClient.plain_date.put_all": "Type.Property.Optional.PlainDate.putAll", - "typetest.property.optional.OptionalClient.plain_date.put_default": "Type.Property.Optional.PlainDate.putDefault", - "typetest.property.optional.OptionalClient.plain_time.get_all": "Type.Property.Optional.PlainTime.getAll", - "typetest.property.optional.OptionalClient.plain_time.get_default": "Type.Property.Optional.PlainTime.getDefault", - "typetest.property.optional.OptionalClient.plain_time.put_all": "Type.Property.Optional.PlainTime.putAll", - "typetest.property.optional.OptionalClient.plain_time.put_default": "Type.Property.Optional.PlainTime.putDefault", - "typetest.property.optional.OptionalClient.collections_byte.get_all": "Type.Property.Optional.CollectionsByte.getAll", - "typetest.property.optional.OptionalClient.collections_byte.get_default": "Type.Property.Optional.CollectionsByte.getDefault", - "typetest.property.optional.OptionalClient.collections_byte.put_all": "Type.Property.Optional.CollectionsByte.putAll", - "typetest.property.optional.OptionalClient.collections_byte.put_default": "Type.Property.Optional.CollectionsByte.putDefault", - "typetest.property.optional.OptionalClient.collections_model.get_all": "Type.Property.Optional.CollectionsModel.getAll", - "typetest.property.optional.OptionalClient.collections_model.get_default": "Type.Property.Optional.CollectionsModel.getDefault", - "typetest.property.optional.OptionalClient.collections_model.put_all": "Type.Property.Optional.CollectionsModel.putAll", - "typetest.property.optional.OptionalClient.collections_model.put_default": "Type.Property.Optional.CollectionsModel.putDefault", - "typetest.property.optional.OptionalClient.string_literal.get_all": "Type.Property.Optional.StringLiteral.getAll", - "typetest.property.optional.OptionalClient.string_literal.get_default": "Type.Property.Optional.StringLiteral.getDefault", - "typetest.property.optional.OptionalClient.string_literal.put_all": "Type.Property.Optional.StringLiteral.putAll", - "typetest.property.optional.OptionalClient.string_literal.put_default": "Type.Property.Optional.StringLiteral.putDefault", - "typetest.property.optional.OptionalClient.int_literal.get_all": "Type.Property.Optional.IntLiteral.getAll", - "typetest.property.optional.OptionalClient.int_literal.get_default": "Type.Property.Optional.IntLiteral.getDefault", - "typetest.property.optional.OptionalClient.int_literal.put_all": "Type.Property.Optional.IntLiteral.putAll", - "typetest.property.optional.OptionalClient.int_literal.put_default": "Type.Property.Optional.IntLiteral.putDefault", - "typetest.property.optional.OptionalClient.float_literal.get_all": "Type.Property.Optional.FloatLiteral.getAll", - "typetest.property.optional.OptionalClient.float_literal.get_default": "Type.Property.Optional.FloatLiteral.getDefault", - "typetest.property.optional.OptionalClient.float_literal.put_all": "Type.Property.Optional.FloatLiteral.putAll", - "typetest.property.optional.OptionalClient.float_literal.put_default": "Type.Property.Optional.FloatLiteral.putDefault", - "typetest.property.optional.OptionalClient.boolean_literal.get_all": "Type.Property.Optional.BooleanLiteral.getAll", - "typetest.property.optional.OptionalClient.boolean_literal.get_default": "Type.Property.Optional.BooleanLiteral.getDefault", - "typetest.property.optional.OptionalClient.boolean_literal.put_all": "Type.Property.Optional.BooleanLiteral.putAll", - "typetest.property.optional.OptionalClient.boolean_literal.put_default": "Type.Property.Optional.BooleanLiteral.putDefault", - "typetest.property.optional.OptionalClient.union_string_literal.get_all": "Type.Property.Optional.UnionStringLiteral.getAll", - "typetest.property.optional.OptionalClient.union_string_literal.get_default": "Type.Property.Optional.UnionStringLiteral.getDefault", - "typetest.property.optional.OptionalClient.union_string_literal.put_all": "Type.Property.Optional.UnionStringLiteral.putAll", - "typetest.property.optional.OptionalClient.union_string_literal.put_default": "Type.Property.Optional.UnionStringLiteral.putDefault", - "typetest.property.optional.OptionalClient.union_int_literal.get_all": "Type.Property.Optional.UnionIntLiteral.getAll", - "typetest.property.optional.OptionalClient.union_int_literal.get_default": "Type.Property.Optional.UnionIntLiteral.getDefault", - "typetest.property.optional.OptionalClient.union_int_literal.put_all": "Type.Property.Optional.UnionIntLiteral.putAll", - "typetest.property.optional.OptionalClient.union_int_literal.put_default": "Type.Property.Optional.UnionIntLiteral.putDefault", - "typetest.property.optional.OptionalClient.union_float_literal.get_all": "Type.Property.Optional.UnionFloatLiteral.getAll", - "typetest.property.optional.OptionalClient.union_float_literal.get_default": "Type.Property.Optional.UnionFloatLiteral.getDefault", - "typetest.property.optional.OptionalClient.union_float_literal.put_all": "Type.Property.Optional.UnionFloatLiteral.putAll", - "typetest.property.optional.OptionalClient.union_float_literal.put_default": "Type.Property.Optional.UnionFloatLiteral.putDefault", - "typetest.property.optional.OptionalClient.required_and_optional.get_all": "Type.Property.Optional.RequiredAndOptional.getAll", - "typetest.property.optional.OptionalClient.required_and_optional.get_required_only": "Type.Property.Optional.RequiredAndOptional.getRequiredOnly", - "typetest.property.optional.OptionalClient.required_and_optional.put_all": "Type.Property.Optional.RequiredAndOptional.putAll", - "typetest.property.optional.OptionalClient.required_and_optional.put_required_only": "Type.Property.Optional.RequiredAndOptional.putRequiredOnly" + "typetest.property.optional.operations.StringOperations.get_all": "Type.Property.Optional.String.getAll", + "typetest.property.optional.aio.operations.StringOperations.get_all": "Type.Property.Optional.String.getAll", + "typetest.property.optional.operations.StringOperations.get_default": "Type.Property.Optional.String.getDefault", + "typetest.property.optional.aio.operations.StringOperations.get_default": "Type.Property.Optional.String.getDefault", + "typetest.property.optional.operations.StringOperations.put_all": "Type.Property.Optional.String.putAll", + "typetest.property.optional.aio.operations.StringOperations.put_all": "Type.Property.Optional.String.putAll", + "typetest.property.optional.operations.StringOperations.put_default": "Type.Property.Optional.String.putDefault", + "typetest.property.optional.aio.operations.StringOperations.put_default": "Type.Property.Optional.String.putDefault", + "typetest.property.optional.operations.BytesOperations.get_all": "Type.Property.Optional.Bytes.getAll", + "typetest.property.optional.aio.operations.BytesOperations.get_all": "Type.Property.Optional.Bytes.getAll", + "typetest.property.optional.operations.BytesOperations.get_default": "Type.Property.Optional.Bytes.getDefault", + "typetest.property.optional.aio.operations.BytesOperations.get_default": "Type.Property.Optional.Bytes.getDefault", + "typetest.property.optional.operations.BytesOperations.put_all": "Type.Property.Optional.Bytes.putAll", + "typetest.property.optional.aio.operations.BytesOperations.put_all": "Type.Property.Optional.Bytes.putAll", + "typetest.property.optional.operations.BytesOperations.put_default": "Type.Property.Optional.Bytes.putDefault", + "typetest.property.optional.aio.operations.BytesOperations.put_default": "Type.Property.Optional.Bytes.putDefault", + "typetest.property.optional.operations.DatetimeOperations.get_all": "Type.Property.Optional.Datetime.getAll", + "typetest.property.optional.aio.operations.DatetimeOperations.get_all": "Type.Property.Optional.Datetime.getAll", + "typetest.property.optional.operations.DatetimeOperations.get_default": "Type.Property.Optional.Datetime.getDefault", + "typetest.property.optional.aio.operations.DatetimeOperations.get_default": "Type.Property.Optional.Datetime.getDefault", + "typetest.property.optional.operations.DatetimeOperations.put_all": "Type.Property.Optional.Datetime.putAll", + "typetest.property.optional.aio.operations.DatetimeOperations.put_all": "Type.Property.Optional.Datetime.putAll", + "typetest.property.optional.operations.DatetimeOperations.put_default": "Type.Property.Optional.Datetime.putDefault", + "typetest.property.optional.aio.operations.DatetimeOperations.put_default": "Type.Property.Optional.Datetime.putDefault", + "typetest.property.optional.operations.DurationOperations.get_all": "Type.Property.Optional.Duration.getAll", + "typetest.property.optional.aio.operations.DurationOperations.get_all": "Type.Property.Optional.Duration.getAll", + "typetest.property.optional.operations.DurationOperations.get_default": "Type.Property.Optional.Duration.getDefault", + "typetest.property.optional.aio.operations.DurationOperations.get_default": "Type.Property.Optional.Duration.getDefault", + "typetest.property.optional.operations.DurationOperations.put_all": "Type.Property.Optional.Duration.putAll", + "typetest.property.optional.aio.operations.DurationOperations.put_all": "Type.Property.Optional.Duration.putAll", + "typetest.property.optional.operations.DurationOperations.put_default": "Type.Property.Optional.Duration.putDefault", + "typetest.property.optional.aio.operations.DurationOperations.put_default": "Type.Property.Optional.Duration.putDefault", + "typetest.property.optional.operations.PlainDateOperations.get_all": "Type.Property.Optional.PlainDate.getAll", + "typetest.property.optional.aio.operations.PlainDateOperations.get_all": "Type.Property.Optional.PlainDate.getAll", + "typetest.property.optional.operations.PlainDateOperations.get_default": "Type.Property.Optional.PlainDate.getDefault", + "typetest.property.optional.aio.operations.PlainDateOperations.get_default": "Type.Property.Optional.PlainDate.getDefault", + "typetest.property.optional.operations.PlainDateOperations.put_all": "Type.Property.Optional.PlainDate.putAll", + "typetest.property.optional.aio.operations.PlainDateOperations.put_all": "Type.Property.Optional.PlainDate.putAll", + "typetest.property.optional.operations.PlainDateOperations.put_default": "Type.Property.Optional.PlainDate.putDefault", + "typetest.property.optional.aio.operations.PlainDateOperations.put_default": "Type.Property.Optional.PlainDate.putDefault", + "typetest.property.optional.operations.PlainTimeOperations.get_all": "Type.Property.Optional.PlainTime.getAll", + "typetest.property.optional.aio.operations.PlainTimeOperations.get_all": "Type.Property.Optional.PlainTime.getAll", + "typetest.property.optional.operations.PlainTimeOperations.get_default": "Type.Property.Optional.PlainTime.getDefault", + "typetest.property.optional.aio.operations.PlainTimeOperations.get_default": "Type.Property.Optional.PlainTime.getDefault", + "typetest.property.optional.operations.PlainTimeOperations.put_all": "Type.Property.Optional.PlainTime.putAll", + "typetest.property.optional.aio.operations.PlainTimeOperations.put_all": "Type.Property.Optional.PlainTime.putAll", + "typetest.property.optional.operations.PlainTimeOperations.put_default": "Type.Property.Optional.PlainTime.putDefault", + "typetest.property.optional.aio.operations.PlainTimeOperations.put_default": "Type.Property.Optional.PlainTime.putDefault", + "typetest.property.optional.operations.CollectionsByteOperations.get_all": "Type.Property.Optional.CollectionsByte.getAll", + "typetest.property.optional.aio.operations.CollectionsByteOperations.get_all": "Type.Property.Optional.CollectionsByte.getAll", + "typetest.property.optional.operations.CollectionsByteOperations.get_default": "Type.Property.Optional.CollectionsByte.getDefault", + "typetest.property.optional.aio.operations.CollectionsByteOperations.get_default": "Type.Property.Optional.CollectionsByte.getDefault", + "typetest.property.optional.operations.CollectionsByteOperations.put_all": "Type.Property.Optional.CollectionsByte.putAll", + "typetest.property.optional.aio.operations.CollectionsByteOperations.put_all": "Type.Property.Optional.CollectionsByte.putAll", + "typetest.property.optional.operations.CollectionsByteOperations.put_default": "Type.Property.Optional.CollectionsByte.putDefault", + "typetest.property.optional.aio.operations.CollectionsByteOperations.put_default": "Type.Property.Optional.CollectionsByte.putDefault", + "typetest.property.optional.operations.CollectionsModelOperations.get_all": "Type.Property.Optional.CollectionsModel.getAll", + "typetest.property.optional.aio.operations.CollectionsModelOperations.get_all": "Type.Property.Optional.CollectionsModel.getAll", + "typetest.property.optional.operations.CollectionsModelOperations.get_default": "Type.Property.Optional.CollectionsModel.getDefault", + "typetest.property.optional.aio.operations.CollectionsModelOperations.get_default": "Type.Property.Optional.CollectionsModel.getDefault", + "typetest.property.optional.operations.CollectionsModelOperations.put_all": "Type.Property.Optional.CollectionsModel.putAll", + "typetest.property.optional.aio.operations.CollectionsModelOperations.put_all": "Type.Property.Optional.CollectionsModel.putAll", + "typetest.property.optional.operations.CollectionsModelOperations.put_default": "Type.Property.Optional.CollectionsModel.putDefault", + "typetest.property.optional.aio.operations.CollectionsModelOperations.put_default": "Type.Property.Optional.CollectionsModel.putDefault", + "typetest.property.optional.operations.StringLiteralOperations.get_all": "Type.Property.Optional.StringLiteral.getAll", + "typetest.property.optional.aio.operations.StringLiteralOperations.get_all": "Type.Property.Optional.StringLiteral.getAll", + "typetest.property.optional.operations.StringLiteralOperations.get_default": "Type.Property.Optional.StringLiteral.getDefault", + "typetest.property.optional.aio.operations.StringLiteralOperations.get_default": "Type.Property.Optional.StringLiteral.getDefault", + "typetest.property.optional.operations.StringLiteralOperations.put_all": "Type.Property.Optional.StringLiteral.putAll", + "typetest.property.optional.aio.operations.StringLiteralOperations.put_all": "Type.Property.Optional.StringLiteral.putAll", + "typetest.property.optional.operations.StringLiteralOperations.put_default": "Type.Property.Optional.StringLiteral.putDefault", + "typetest.property.optional.aio.operations.StringLiteralOperations.put_default": "Type.Property.Optional.StringLiteral.putDefault", + "typetest.property.optional.operations.IntLiteralOperations.get_all": "Type.Property.Optional.IntLiteral.getAll", + "typetest.property.optional.aio.operations.IntLiteralOperations.get_all": "Type.Property.Optional.IntLiteral.getAll", + "typetest.property.optional.operations.IntLiteralOperations.get_default": "Type.Property.Optional.IntLiteral.getDefault", + "typetest.property.optional.aio.operations.IntLiteralOperations.get_default": "Type.Property.Optional.IntLiteral.getDefault", + "typetest.property.optional.operations.IntLiteralOperations.put_all": "Type.Property.Optional.IntLiteral.putAll", + "typetest.property.optional.aio.operations.IntLiteralOperations.put_all": "Type.Property.Optional.IntLiteral.putAll", + "typetest.property.optional.operations.IntLiteralOperations.put_default": "Type.Property.Optional.IntLiteral.putDefault", + "typetest.property.optional.aio.operations.IntLiteralOperations.put_default": "Type.Property.Optional.IntLiteral.putDefault", + "typetest.property.optional.operations.FloatLiteralOperations.get_all": "Type.Property.Optional.FloatLiteral.getAll", + "typetest.property.optional.aio.operations.FloatLiteralOperations.get_all": "Type.Property.Optional.FloatLiteral.getAll", + "typetest.property.optional.operations.FloatLiteralOperations.get_default": "Type.Property.Optional.FloatLiteral.getDefault", + "typetest.property.optional.aio.operations.FloatLiteralOperations.get_default": "Type.Property.Optional.FloatLiteral.getDefault", + "typetest.property.optional.operations.FloatLiteralOperations.put_all": "Type.Property.Optional.FloatLiteral.putAll", + "typetest.property.optional.aio.operations.FloatLiteralOperations.put_all": "Type.Property.Optional.FloatLiteral.putAll", + "typetest.property.optional.operations.FloatLiteralOperations.put_default": "Type.Property.Optional.FloatLiteral.putDefault", + "typetest.property.optional.aio.operations.FloatLiteralOperations.put_default": "Type.Property.Optional.FloatLiteral.putDefault", + "typetest.property.optional.operations.BooleanLiteralOperations.get_all": "Type.Property.Optional.BooleanLiteral.getAll", + "typetest.property.optional.aio.operations.BooleanLiteralOperations.get_all": "Type.Property.Optional.BooleanLiteral.getAll", + "typetest.property.optional.operations.BooleanLiteralOperations.get_default": "Type.Property.Optional.BooleanLiteral.getDefault", + "typetest.property.optional.aio.operations.BooleanLiteralOperations.get_default": "Type.Property.Optional.BooleanLiteral.getDefault", + "typetest.property.optional.operations.BooleanLiteralOperations.put_all": "Type.Property.Optional.BooleanLiteral.putAll", + "typetest.property.optional.aio.operations.BooleanLiteralOperations.put_all": "Type.Property.Optional.BooleanLiteral.putAll", + "typetest.property.optional.operations.BooleanLiteralOperations.put_default": "Type.Property.Optional.BooleanLiteral.putDefault", + "typetest.property.optional.aio.operations.BooleanLiteralOperations.put_default": "Type.Property.Optional.BooleanLiteral.putDefault", + "typetest.property.optional.operations.UnionStringLiteralOperations.get_all": "Type.Property.Optional.UnionStringLiteral.getAll", + "typetest.property.optional.aio.operations.UnionStringLiteralOperations.get_all": "Type.Property.Optional.UnionStringLiteral.getAll", + "typetest.property.optional.operations.UnionStringLiteralOperations.get_default": "Type.Property.Optional.UnionStringLiteral.getDefault", + "typetest.property.optional.aio.operations.UnionStringLiteralOperations.get_default": "Type.Property.Optional.UnionStringLiteral.getDefault", + "typetest.property.optional.operations.UnionStringLiteralOperations.put_all": "Type.Property.Optional.UnionStringLiteral.putAll", + "typetest.property.optional.aio.operations.UnionStringLiteralOperations.put_all": "Type.Property.Optional.UnionStringLiteral.putAll", + "typetest.property.optional.operations.UnionStringLiteralOperations.put_default": "Type.Property.Optional.UnionStringLiteral.putDefault", + "typetest.property.optional.aio.operations.UnionStringLiteralOperations.put_default": "Type.Property.Optional.UnionStringLiteral.putDefault", + "typetest.property.optional.operations.UnionIntLiteralOperations.get_all": "Type.Property.Optional.UnionIntLiteral.getAll", + "typetest.property.optional.aio.operations.UnionIntLiteralOperations.get_all": "Type.Property.Optional.UnionIntLiteral.getAll", + "typetest.property.optional.operations.UnionIntLiteralOperations.get_default": "Type.Property.Optional.UnionIntLiteral.getDefault", + "typetest.property.optional.aio.operations.UnionIntLiteralOperations.get_default": "Type.Property.Optional.UnionIntLiteral.getDefault", + "typetest.property.optional.operations.UnionIntLiteralOperations.put_all": "Type.Property.Optional.UnionIntLiteral.putAll", + "typetest.property.optional.aio.operations.UnionIntLiteralOperations.put_all": "Type.Property.Optional.UnionIntLiteral.putAll", + "typetest.property.optional.operations.UnionIntLiteralOperations.put_default": "Type.Property.Optional.UnionIntLiteral.putDefault", + "typetest.property.optional.aio.operations.UnionIntLiteralOperations.put_default": "Type.Property.Optional.UnionIntLiteral.putDefault", + "typetest.property.optional.operations.UnionFloatLiteralOperations.get_all": "Type.Property.Optional.UnionFloatLiteral.getAll", + "typetest.property.optional.aio.operations.UnionFloatLiteralOperations.get_all": "Type.Property.Optional.UnionFloatLiteral.getAll", + "typetest.property.optional.operations.UnionFloatLiteralOperations.get_default": "Type.Property.Optional.UnionFloatLiteral.getDefault", + "typetest.property.optional.aio.operations.UnionFloatLiteralOperations.get_default": "Type.Property.Optional.UnionFloatLiteral.getDefault", + "typetest.property.optional.operations.UnionFloatLiteralOperations.put_all": "Type.Property.Optional.UnionFloatLiteral.putAll", + "typetest.property.optional.aio.operations.UnionFloatLiteralOperations.put_all": "Type.Property.Optional.UnionFloatLiteral.putAll", + "typetest.property.optional.operations.UnionFloatLiteralOperations.put_default": "Type.Property.Optional.UnionFloatLiteral.putDefault", + "typetest.property.optional.aio.operations.UnionFloatLiteralOperations.put_default": "Type.Property.Optional.UnionFloatLiteral.putDefault", + "typetest.property.optional.operations.RequiredAndOptionalOperations.get_all": "Type.Property.Optional.RequiredAndOptional.getAll", + "typetest.property.optional.aio.operations.RequiredAndOptionalOperations.get_all": "Type.Property.Optional.RequiredAndOptional.getAll", + "typetest.property.optional.operations.RequiredAndOptionalOperations.get_required_only": "Type.Property.Optional.RequiredAndOptional.getRequiredOnly", + "typetest.property.optional.aio.operations.RequiredAndOptionalOperations.get_required_only": "Type.Property.Optional.RequiredAndOptional.getRequiredOnly", + "typetest.property.optional.operations.RequiredAndOptionalOperations.put_all": "Type.Property.Optional.RequiredAndOptional.putAll", + "typetest.property.optional.aio.operations.RequiredAndOptionalOperations.put_all": "Type.Property.Optional.RequiredAndOptional.putAll", + "typetest.property.optional.operations.RequiredAndOptionalOperations.put_required_only": "Type.Property.Optional.RequiredAndOptional.putRequiredOnly", + "typetest.property.optional.aio.operations.RequiredAndOptionalOperations.put_required_only": "Type.Property.Optional.RequiredAndOptional.putRequiredOnly" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/versioning-madeoptional/apiview-properties.json b/packages/typespec-python/test/azure/generated/versioning-madeoptional/apiview-properties.json index ec4787afb04..665ffb0be9e 100644 --- a/packages/typespec-python/test/azure/generated/versioning-madeoptional/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/versioning-madeoptional/apiview-properties.json @@ -3,6 +3,7 @@ "CrossLanguageDefinitionId": { "versioning.madeoptional.models.TestModel": "Versioning.MadeOptional.TestModel", "versioning.madeoptional.models.Versions": "Versioning.MadeOptional.Versions", - "versioning.madeoptional.MadeOptionalClient.test": "Versioning.MadeOptional.test" + "versioning.madeoptional.MadeOptionalClient.test": "Versioning.MadeOptional.test", + "versioning.madeoptional.aio.MadeOptionalClient.test": "Versioning.MadeOptional.test" } } \ No newline at end of file diff --git a/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_operations/_operations.py index 5268809f58e..8d2afe8cb9c 100644 --- a/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/_operations/_operations.py @@ -35,11 +35,11 @@ def build_path_normal_request(name: str, **kwargs: Any) -> HttpRequest: return HttpRequest(method="GET", url=_url, **kwargs) -def build_path_optional_request(name: Optional[str] = None, **kwargs: Any) -> HttpRequest: +def build_path_optional_request(*, name: Optional[str] = None, **kwargs: Any) -> HttpRequest: # Construct URL _url = "/parameters/path/optional{name}" path_format_arguments = { - "name": _SERIALIZER.url("name", name, "str"), + "name": "" if name is None else "/" + _SERIALIZER.url("name", name, "str"), } _url: str = _url.format(**path_format_arguments) # type: ignore @@ -94,12 +94,12 @@ def normal(self, name: str, **kwargs: Any) -> None: # pylint: disable=inconsist return cls(pipeline_response, None, {}) # type: ignore def optional( # pylint: disable=inconsistent-return-statements - self, name: Optional[str] = None, **kwargs: Any + self, *, name: Optional[str] = None, **kwargs: Any ) -> None: """optional. - :param name: Default value is None. - :type name: str + :keyword name: Default value is None. + :paramtype name: str :return: None :rtype: None :raises ~corehttp.exceptions.HttpResponseError: diff --git a/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_operations/_operations.py index 3c0e6fa38ea..4fc66347426 100644 --- a/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/parameters-path/parameters/path/aio/_operations/_operations.py @@ -68,11 +68,11 @@ async def normal(self, name: str, **kwargs: Any) -> None: if cls: return cls(pipeline_response, None, {}) # type: ignore - async def optional(self, name: Optional[str] = None, **kwargs: Any) -> None: + async def optional(self, *, name: Optional[str] = None, **kwargs: Any) -> None: """optional. - :param name: Default value is None. - :type name: str + :keyword name: Default value is None. + :paramtype name: str :return: None :rtype: None :raises ~corehttp.exceptions.HttpResponseError: diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 92999f15889..e137831529a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -79,8 +79,8 @@ importers: packages/typespec-python: dependencies: '@typespec/http-client-python': - specifier: ~0.10.0 - version: 0.10.0(snncae6gzwxjtoyf2aptgh5sru) + specifier: ~0.11.0 + version: 0.11.0(snncae6gzwxjtoyf2aptgh5sru) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -1557,6 +1557,25 @@ packages: '@typespec/versioning': '>=0.68.0 <1.0.0' '@typespec/xml': '>=0.68.0 <1.0.0' + '@typespec/http-client-python@0.11.0': + resolution: {integrity: sha512-slbYCuyMcQrq0ACwk0PKAN1lkbhrRH3oawxadVreYHWxWpletRNCuoAiGD/f4NK1VGQzfNokPmAs2myRsi7D9w==} + engines: {node: '>=20.0.0'} + peerDependencies: + '@azure-tools/typespec-autorest': '>=0.54.0 <1.0.0' + '@azure-tools/typespec-azure-core': '>=0.54.0 <1.0.0' + '@azure-tools/typespec-azure-resource-manager': '>=0.54.0 <1.0.0' + '@azure-tools/typespec-azure-rulesets': '>=0.54.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.54.2 <1.0.0' + '@typespec/compiler': ^1.0.0-0 + '@typespec/events': '>=0.68.0 <1.0.0' + '@typespec/http': ^1.0.0-0 + '@typespec/openapi': ^1.0.0-0 + '@typespec/rest': '>=0.68.0 <1.0.0' + '@typespec/sse': '>=0.68.0 <1.0.0' + '@typespec/streams': '>=0.68.0 <1.0.0' + '@typespec/versioning': '>=0.68.0 <1.0.0' + '@typespec/xml': '>=0.68.0 <1.0.0' + '@typespec/http-specs@0.1.0-alpha.19': resolution: {integrity: sha512-kx3uOAQT3xJCYGuloVGG9kvDCKzw1SjYsqONFCm1BII06DCbDfkp1M/yrol/uGwNK3N23ITPC/rgErW8rtYRQg==} engines: {node: '>=16.0.0'} @@ -5918,6 +5937,31 @@ snapshots: - bufferutil - utf-8-validate + '@typespec/http-client-python@0.11.0(snncae6gzwxjtoyf2aptgh5sru)': + dependencies: + '@azure-tools/typespec-autorest': 0.54.0(psqtwvjmgth7tsukc2x2eth2za) + '@azure-tools/typespec-azure-core': 0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))) + '@azure-tools/typespec-azure-resource-manager': 0.54.0(sq74qt2k6r4fvjwy37msq4cl7a) + '@azure-tools/typespec-azure-rulesets': 0.54.0(@azure-tools/typespec-azure-core@0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))))(@azure-tools/typespec-azure-resource-manager@0.54.0(sq74qt2k6r4fvjwy37msq4cl7a))(@azure-tools/typespec-client-generator-core@0.54.2(qizmnx62cykc7f5nejydwkmymm))(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)) + '@azure-tools/typespec-client-generator-core': 0.54.2(qizmnx62cykc7f5nejydwkmymm) + '@typespec/compiler': 1.0.0-rc.0(@types/node@22.13.17) + '@typespec/events': 0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)) + '@typespec/http': 1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))) + '@typespec/openapi': 1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))) + '@typespec/rest': 0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))) + '@typespec/sse': 0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/events@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))) + '@typespec/streams': 0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)) + '@typespec/versioning': 0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)) + '@typespec/xml': 0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)) + js-yaml: 4.1.0 + marked: 15.0.7 + pyodide: 0.26.2 + semver: 7.6.3 + tsx: 4.19.3 + transitivePeerDependencies: + - bufferutil + - utf-8-validate + '@typespec/http-specs@0.1.0-alpha.19(@types/node@22.13.17)(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))(@typespec/versioning@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))(@typespec/xml@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))': dependencies: '@typespec/compiler': 1.0.0-rc.0(@types/node@22.13.17) From d1227f07896c8a0fbb6052e65e799669e598b22b Mon Sep 17 00:00:00 2001 From: Chenjie Shi Date: Mon, 21 Apr 2025 13:27:43 +0000 Subject: [PATCH 5/7] update dep --- packages/autorest.python/package.json | 2 +- pnpm-lock.yaml | 48 ++------------------------- 2 files changed, 3 insertions(+), 47 deletions(-) diff --git a/packages/autorest.python/package.json b/packages/autorest.python/package.json index 43eda184d63..f9bc82f4fc4 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.10.0", + "@typespec/http-client-python": "~0.11.0", "@autorest/system-requirements": "~1.0.2", "fs-extra": "~11.2.0", "tsx": "~4.19.1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e137831529a..fa15c02644c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -57,8 +57,8 @@ importers: specifier: ~1.0.2 version: 1.0.2 '@typespec/http-client-python': - specifier: ~0.10.0 - version: 0.10.0(snncae6gzwxjtoyf2aptgh5sru) + specifier: ~0.11.0 + version: 0.11.0(snncae6gzwxjtoyf2aptgh5sru) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -1538,25 +1538,6 @@ packages: peerDependencies: '@typespec/compiler': ^1.0.0-rc.0 - '@typespec/http-client-python@0.10.0': - resolution: {integrity: sha512-hfDPapB3b4+ucaozLwXq6nBaZQmXqtEk4UHw3oE7qpjRKF1n5DPkWA/r69SuYnP7roXFx8g1XZswTNhnvp7KIw==} - engines: {node: '>=20.0.0'} - peerDependencies: - '@azure-tools/typespec-autorest': '>=0.54.0 <1.0.0' - '@azure-tools/typespec-azure-core': '>=0.54.0 <1.0.0' - '@azure-tools/typespec-azure-resource-manager': '>=0.54.0 <1.0.0' - '@azure-tools/typespec-azure-rulesets': '>=0.54.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.54.0 <1.0.0' - '@typespec/compiler': ^1.0.0-0 - '@typespec/events': '>=0.68.0 <1.0.0' - '@typespec/http': ^1.0.0-0 - '@typespec/openapi': ^1.0.0-0 - '@typespec/rest': '>=0.68.0 <1.0.0' - '@typespec/sse': '>=0.68.0 <1.0.0' - '@typespec/streams': '>=0.68.0 <1.0.0' - '@typespec/versioning': '>=0.68.0 <1.0.0' - '@typespec/xml': '>=0.68.0 <1.0.0' - '@typespec/http-client-python@0.11.0': resolution: {integrity: sha512-slbYCuyMcQrq0ACwk0PKAN1lkbhrRH3oawxadVreYHWxWpletRNCuoAiGD/f4NK1VGQzfNokPmAs2myRsi7D9w==} engines: {node: '>=20.0.0'} @@ -5912,31 +5893,6 @@ snapshots: dependencies: '@typespec/compiler': 1.0.0-rc.0(@types/node@22.13.17) - '@typespec/http-client-python@0.10.0(snncae6gzwxjtoyf2aptgh5sru)': - dependencies: - '@azure-tools/typespec-autorest': 0.54.0(psqtwvjmgth7tsukc2x2eth2za) - '@azure-tools/typespec-azure-core': 0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))) - '@azure-tools/typespec-azure-resource-manager': 0.54.0(sq74qt2k6r4fvjwy37msq4cl7a) - '@azure-tools/typespec-azure-rulesets': 0.54.0(@azure-tools/typespec-azure-core@0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))))(@azure-tools/typespec-azure-resource-manager@0.54.0(sq74qt2k6r4fvjwy37msq4cl7a))(@azure-tools/typespec-client-generator-core@0.54.2(qizmnx62cykc7f5nejydwkmymm))(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)) - '@azure-tools/typespec-client-generator-core': 0.54.2(qizmnx62cykc7f5nejydwkmymm) - '@typespec/compiler': 1.0.0-rc.0(@types/node@22.13.17) - '@typespec/events': 0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)) - '@typespec/http': 1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))) - '@typespec/openapi': 1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))) - '@typespec/rest': 0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))) - '@typespec/sse': 0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/events@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))) - '@typespec/streams': 0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)) - '@typespec/versioning': 0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)) - '@typespec/xml': 0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)) - js-yaml: 4.1.0 - marked: 15.0.7 - pyodide: 0.26.2 - semver: 7.6.3 - tsx: 4.19.3 - transitivePeerDependencies: - - bufferutil - - utf-8-validate - '@typespec/http-client-python@0.11.0(snncae6gzwxjtoyf2aptgh5sru)': dependencies: '@azure-tools/typespec-autorest': 0.54.0(psqtwvjmgth7tsukc2x2eth2za) From 6bd3568d6f2436f33a31838106586ece6c26efc2 Mon Sep 17 00:00:00 2001 From: Chenjie Shi Date: Mon, 21 Apr 2025 13:28:23 +0000 Subject: [PATCH 6/7] changeset --- .chronus/changes/upgrade_version-2025-3-21-12-23-56.md | 2 +- .chronus/changes/upgrade_version-2025-3-21-13-27-57.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .chronus/changes/upgrade_version-2025-3-21-13-27-57.md diff --git a/.chronus/changes/upgrade_version-2025-3-21-12-23-56.md b/.chronus/changes/upgrade_version-2025-3-21-12-23-56.md index 88b466180b4..0d8a0581639 100644 --- a/.chronus/changes/upgrade_version-2025-3-21-12-23-56.md +++ b/.chronus/changes/upgrade_version-2025-3-21-12-23-56.md @@ -4,4 +4,4 @@ packages: - "@azure-tools/typespec-python" --- -Bump to http-client-python 0.11.0 \ No newline at end of file +Bump to http-client-python 0.11.0. \ No newline at end of file diff --git a/.chronus/changes/upgrade_version-2025-3-21-13-27-57.md b/.chronus/changes/upgrade_version-2025-3-21-13-27-57.md new file mode 100644 index 00000000000..6c73e2559b0 --- /dev/null +++ b/.chronus/changes/upgrade_version-2025-3-21-13-27-57.md @@ -0,0 +1,7 @@ +--- +changeKind: dependencies +packages: + - "@autorest/python" +--- + +Bump to http-client-python 0.11.0. \ No newline at end of file From f204917723ed4468fe9771e8ca583e9bd276e860 Mon Sep 17 00:00:00 2001 From: Chenjie Shi Date: Mon, 21 Apr 2025 13:52:05 +0000 Subject: [PATCH 7/7] update --- .../apiview-properties.json | 4 +- .../apiview-properties.json | 4 +- .../apiview-properties.json | 4 +- .../apiview-properties.json | 4 +- .../apiview-properties.json | 9 +- .../apiview-properties.json | 4 +- .../apiview-properties.json | 12 +- .../azure-core-basic/apiview-properties.json | 9 +- .../apiview-properties.json | 3 +- .../apiview-properties.json | 5 +- .../azure-core-model/apiview-properties.json | 9 +- .../azure-core-page/apiview-properties.json | 12 +- .../azure-core-scalar/apiview-properties.json | 15 +- .../azure-core-traits/apiview-properties.json | 4 +- .../apiview-properties.json | 3 +- .../apiview-properties.json | 3 +- .../apiview-properties.json | 3 +- .../apiview-properties.json | 15 +- .../apiview-properties.json | 6 +- .../apiview-properties.json | 18 +- .../apiview-properties.json | 78 +++-- .../apiview-properties.json | 3 +- .../client-namespace/apiview-properties.json | 4 +- .../client-naming/apiview-properties.json | 21 +- .../apiview-properties.json | 19 +- .../apiview-properties.json | 8 +- .../apiview-properties.json | 14 +- .../apiview-properties.json | 18 +- .../encode-bytes/apiview-properties.json | 66 ++-- .../encode-datetime/apiview-properties.json | 57 ++-- .../encode-duration/apiview-properties.json | 54 ++-- .../encode-numeric/apiview-properties.json | 9 +- .../apiview-properties.json | 9 +- .../headasbooleantrue/apiview-properties.json | 9 +- .../parameters-basic/apiview-properties.json | 6 +- .../apiview-properties.json | 15 +- .../parameters-spread/apiview-properties.json | 30 +- .../apiview-properties.json | 12 +- .../apiview-properties.json | 5 +- .../apiview-properties.json | 12 +- .../payload-multipart/apiview-properties.json | 21 +- .../payload-pageable/apiview-properties.json | 3 +- .../payload-xml/apiview-properties.json | 72 +++-- .../apiview-properties.json | 5 +- .../apiview-properties.json | 6 +- .../apiview-properties.json | 4 +- .../generated/routes/apiview-properties.json | 24 +- .../apiview-properties.json | 6 +- .../apiview-properties.json | 3 +- .../apiview-properties.json | 5 +- .../apiview-properties.json | 6 +- .../apiview-properties.json | 6 +- .../apiview-properties.json | 3 +- .../special-words/apiview-properties.json | 303 ++++++++++++------ .../streaming-jsonl/apiview-properties.json | 6 +- .../typetest-array/apiview-properties.json | 84 +++-- .../apiview-properties.json | 66 ++-- .../apiview-properties.json | 12 +- .../apiview-properties.json | 9 +- .../apiview-properties.json | 5 +- .../apiview-properties.json | 10 +- .../apiview-properties.json | 8 +- .../apiview-properties.json | 5 +- .../apiview-properties.json | 4 +- .../apiview-properties.json | 9 +- .../apiview-properties.json | 5 +- .../apiview-properties.json | 9 +- .../apiview-properties.json | 186 +++++++---- .../apiview-properties.json | 84 +++-- .../apiview-properties.json | 174 ++++++---- .../typetest-scalar/apiview-properties.json | 48 ++- .../typetest-union/apiview-properties.json | 60 ++-- .../versioning-added/apiview-properties.json | 7 +- .../apiview-properties.json | 4 +- .../apiview-properties.json | 6 +- .../apiview-properties.json | 3 +- .../apiview-properties.json | 3 +- 77 files changed, 1277 insertions(+), 592 deletions(-) diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/apiview-properties.json b/packages/typespec-python/test/azure/generated/authentication-api-key/apiview-properties.json index 59de600085b..b762ef4e8f0 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/authentication-api-key/apiview-properties.json @@ -3,6 +3,8 @@ "CrossLanguageDefinitionId": { "authentication.apikey.models.InvalidAuth": "Authentication.ApiKey.InvalidAuth", "authentication.apikey.ApiKeyClient.valid": "Authentication.ApiKey.valid", - "authentication.apikey.ApiKeyClient.invalid": "Authentication.ApiKey.invalid" + "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-http-custom/apiview-properties.json b/packages/typespec-python/test/azure/generated/authentication-http-custom/apiview-properties.json index 5b5f546aadb..d24eede3e0e 100644 --- a/packages/typespec-python/test/azure/generated/authentication-http-custom/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/authentication-http-custom/apiview-properties.json @@ -3,6 +3,8 @@ "CrossLanguageDefinitionId": { "authentication.http.custom.models.InvalidAuth": "Authentication.Http.Custom.InvalidAuth", "authentication.http.custom.CustomClient.valid": "Authentication.Http.Custom.valid", - "authentication.http.custom.CustomClient.invalid": "Authentication.Http.Custom.invalid" + "authentication.http.custom.aio.CustomClient.valid": "Authentication.Http.Custom.valid", + "authentication.http.custom.CustomClient.invalid": "Authentication.Http.Custom.invalid", + "authentication.http.custom.aio.CustomClient.invalid": "Authentication.Http.Custom.invalid" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/authentication-oauth2/apiview-properties.json b/packages/typespec-python/test/azure/generated/authentication-oauth2/apiview-properties.json index 7685e04442c..fe0bda7fced 100644 --- a/packages/typespec-python/test/azure/generated/authentication-oauth2/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/authentication-oauth2/apiview-properties.json @@ -3,6 +3,8 @@ "CrossLanguageDefinitionId": { "authentication.oauth2.models.InvalidAuth": "Authentication.OAuth2.InvalidAuth", "authentication.oauth2.OAuth2Client.valid": "Authentication.OAuth2.valid", - "authentication.oauth2.OAuth2Client.invalid": "Authentication.OAuth2.invalid" + "authentication.oauth2.aio.OAuth2Client.valid": "Authentication.OAuth2.valid", + "authentication.oauth2.OAuth2Client.invalid": "Authentication.OAuth2.invalid", + "authentication.oauth2.aio.OAuth2Client.invalid": "Authentication.OAuth2.invalid" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/authentication-union/apiview-properties.json b/packages/typespec-python/test/azure/generated/authentication-union/apiview-properties.json index db8a9b3c0a0..fdba71f8103 100644 --- a/packages/typespec-python/test/azure/generated/authentication-union/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/authentication-union/apiview-properties.json @@ -2,6 +2,8 @@ "CrossLanguagePackageId": "Authentication.Union", "CrossLanguageDefinitionId": { "authentication.union.UnionClient.valid_key": "Authentication.Union.validKey", - "authentication.union.UnionClient.valid_token": "Authentication.Union.validToken" + "authentication.union.aio.UnionClient.valid_key": "Authentication.Union.validKey", + "authentication.union.UnionClient.valid_token": "Authentication.Union.validToken", + "authentication.union.aio.UnionClient.valid_token": "Authentication.Union.validToken" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/apiview-properties.json index 00f5a031481..ebae021ab35 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/apiview-properties.json @@ -5,8 +5,11 @@ "specs.azure.clientgenerator.core.access.models.PublicDecoratorModelInInternal": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.PublicDecoratorModelInInternal", "specs.azure.clientgenerator.core.access.models.PublicDecoratorModelInPublic": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.PublicDecoratorModelInPublic", "specs.azure.clientgenerator.core.access.models.SharedModel": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.SharedModel", - "specs.azure.clientgenerator.core.access.AccessClient.public_operation.no_decorator_in_public": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic", - "specs.azure.clientgenerator.core.access.AccessClient.public_operation.public_decorator_in_public": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic", - "specs.azure.clientgenerator.core.access.AccessClient.shared_model_in_operation.public": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public" + "specs.azure.clientgenerator.core.access.operations.PublicOperationOperations.no_decorator_in_public": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic", + "specs.azure.clientgenerator.core.access.aio.operations.PublicOperationOperations.no_decorator_in_public": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic", + "specs.azure.clientgenerator.core.access.operations.PublicOperationOperations.public_decorator_in_public": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic", + "specs.azure.clientgenerator.core.access.aio.operations.PublicOperationOperations.public_decorator_in_public": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic", + "specs.azure.clientgenerator.core.access.operations.SharedModelInOperationOperations.public": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public", + "specs.azure.clientgenerator.core.access.aio.operations.SharedModelInOperationOperations.public": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/apiview-properties.json index 97da5568b42..4fc450681ad 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/apiview-properties.json @@ -6,6 +6,8 @@ "specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.FlattenModel", "specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.NestedFlattenModel", "specs.azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.put_flatten_model": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel", - "specs.azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.put_nested_flatten_model": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel" + "specs.azure.clientgenerator.core.flattenproperty.aio.FlattenPropertyClient.put_flatten_model": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel", + "specs.azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.put_nested_flatten_model": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel", + "specs.azure.clientgenerator.core.flattenproperty.aio.FlattenPropertyClient.put_nested_flatten_model": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/apiview-properties.json index 8b6ce4d479c..e2cc0050e4f 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/apiview-properties.json @@ -6,9 +6,13 @@ "specs.azure.clientgenerator.core.usage.models.OutputModel": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.OutputModel", "specs.azure.clientgenerator.core.usage.models.ResultModel": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.ResultModel", "specs.azure.clientgenerator.core.usage.models.RoundTripModel": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.RoundTripModel", - "specs.azure.clientgenerator.core.usage.UsageClient.model_in_operation.input_to_input_output": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput", - "specs.azure.clientgenerator.core.usage.UsageClient.model_in_operation.output_to_input_output": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput", - "specs.azure.clientgenerator.core.usage.UsageClient.model_in_operation.model_in_read_only_property": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty", - "specs.azure.clientgenerator.core.usage.UsageClient.model_in_operation.orphan_model_serializable": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.orphanModelSerializable" + "specs.azure.clientgenerator.core.usage.operations.ModelInOperationOperations.input_to_input_output": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput", + "specs.azure.clientgenerator.core.usage.aio.operations.ModelInOperationOperations.input_to_input_output": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput", + "specs.azure.clientgenerator.core.usage.operations.ModelInOperationOperations.output_to_input_output": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput", + "specs.azure.clientgenerator.core.usage.aio.operations.ModelInOperationOperations.output_to_input_output": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput", + "specs.azure.clientgenerator.core.usage.operations.ModelInOperationOperations.model_in_read_only_property": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty", + "specs.azure.clientgenerator.core.usage.aio.operations.ModelInOperationOperations.model_in_read_only_property": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty", + "specs.azure.clientgenerator.core.usage.operations.ModelInOperationOperations.orphan_model_serializable": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.orphanModelSerializable", + "specs.azure.clientgenerator.core.usage.aio.operations.ModelInOperationOperations.orphan_model_serializable": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.orphanModelSerializable" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-core-basic/apiview-properties.json index 0e1873347ea..0a7b6021fad 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-core-basic/apiview-properties.json @@ -5,11 +5,18 @@ "specs.azure.core.basic.models.UserList": "_Specs_.Azure.Core.Basic.UserList", "specs.azure.core.basic.models.UserOrder": "_Specs_.Azure.Core.Basic.UserOrder", "specs.azure.core.basic.BasicClient.create_or_update": "_Specs_.Azure.Core.Basic.createOrUpdate", + "specs.azure.core.basic.aio.BasicClient.create_or_update": "_Specs_.Azure.Core.Basic.createOrUpdate", "specs.azure.core.basic.BasicClient.create_or_replace": "_Specs_.Azure.Core.Basic.createOrReplace", + "specs.azure.core.basic.aio.BasicClient.create_or_replace": "_Specs_.Azure.Core.Basic.createOrReplace", "specs.azure.core.basic.BasicClient.get": "_Specs_.Azure.Core.Basic.get", + "specs.azure.core.basic.aio.BasicClient.get": "_Specs_.Azure.Core.Basic.get", "specs.azure.core.basic.BasicClient.list": "_Specs_.Azure.Core.Basic.list", + "specs.azure.core.basic.aio.BasicClient.list": "_Specs_.Azure.Core.Basic.list", "specs.azure.core.basic.BasicClient.delete": "_Specs_.Azure.Core.Basic.delete", + "specs.azure.core.basic.aio.BasicClient.delete": "_Specs_.Azure.Core.Basic.delete", "specs.azure.core.basic.BasicClient.export": "_Specs_.Azure.Core.Basic.export", - "specs.azure.core.basic.BasicClient.export_all_users": "_Specs_.Azure.Core.Basic.exportAllUsers" + "specs.azure.core.basic.aio.BasicClient.export": "_Specs_.Azure.Core.Basic.export", + "specs.azure.core.basic.BasicClient.export_all_users": "_Specs_.Azure.Core.Basic.exportAllUsers", + "specs.azure.core.basic.aio.BasicClient.export_all_users": "_Specs_.Azure.Core.Basic.exportAllUsers" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/apiview-properties.json index b47ef6efd5e..cf1e62133c4 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/apiview-properties.json @@ -3,6 +3,7 @@ "CrossLanguageDefinitionId": { "specs.azure.core.lro.rpc.models.GenerationOptions": "_Specs_.Azure.Core.Lro.Rpc.GenerationOptions", "specs.azure.core.lro.rpc.models.GenerationResult": "_Specs_.Azure.Core.Lro.Rpc.GenerationResult", - "specs.azure.core.lro.rpc.RpcClient.begin_long_running_rpc": "_Specs_.Azure.Core.Lro.Rpc.longRunningRpc" + "specs.azure.core.lro.rpc.RpcClient.begin_long_running_rpc": "_Specs_.Azure.Core.Lro.Rpc.longRunningRpc", + "specs.azure.core.lro.rpc.aio.RpcClient.begin_long_running_rpc": "_Specs_.Azure.Core.Lro.Rpc.longRunningRpc" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/apiview-properties.json index f2e2037a2d8..d0fff925362 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/apiview-properties.json @@ -4,7 +4,10 @@ "specs.azure.core.lro.standard.models.ExportedUser": "_Specs_.Azure.Core.Lro.Standard.ExportedUser", "specs.azure.core.lro.standard.models.User": "_Specs_.Azure.Core.Lro.Standard.User", "specs.azure.core.lro.standard.StandardClient.begin_create_or_replace": "_Specs_.Azure.Core.Lro.Standard.createOrReplace", + "specs.azure.core.lro.standard.aio.StandardClient.begin_create_or_replace": "_Specs_.Azure.Core.Lro.Standard.createOrReplace", "specs.azure.core.lro.standard.StandardClient.begin_delete": "_Specs_.Azure.Core.Lro.Standard.delete", - "specs.azure.core.lro.standard.StandardClient.begin_export": "_Specs_.Azure.Core.Lro.Standard.export" + "specs.azure.core.lro.standard.aio.StandardClient.begin_delete": "_Specs_.Azure.Core.Lro.Standard.delete", + "specs.azure.core.lro.standard.StandardClient.begin_export": "_Specs_.Azure.Core.Lro.Standard.export", + "specs.azure.core.lro.standard.aio.StandardClient.begin_export": "_Specs_.Azure.Core.Lro.Standard.export" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-core-model/apiview-properties.json index 963bee46f04..0ad4df9df32 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-model/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-core-model/apiview-properties.json @@ -2,8 +2,11 @@ "CrossLanguagePackageId": "_Specs_.Azure.Core.Model", "CrossLanguageDefinitionId": { "specs.azure.core.model.models.AzureEmbeddingModel": "_Specs_.Azure.Core.Model.AzureEmbeddingModel", - "specs.azure.core.model.ModelClient.azure_core_embedding_vector.get": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get", - "specs.azure.core.model.ModelClient.azure_core_embedding_vector.put": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put", - "specs.azure.core.model.ModelClient.azure_core_embedding_vector.post": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post" + "specs.azure.core.model.operations.AzureCoreEmbeddingVectorOperations.get": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get", + "specs.azure.core.model.aio.operations.AzureCoreEmbeddingVectorOperations.get": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get", + "specs.azure.core.model.operations.AzureCoreEmbeddingVectorOperations.put": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put", + "specs.azure.core.model.aio.operations.AzureCoreEmbeddingVectorOperations.put": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put", + "specs.azure.core.model.operations.AzureCoreEmbeddingVectorOperations.post": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post", + "specs.azure.core.model.aio.operations.AzureCoreEmbeddingVectorOperations.post": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-core-page/apiview-properties.json index 7cce33259b0..f598ae9cf50 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-core-page/apiview-properties.json @@ -7,11 +7,17 @@ "specs.azure.core.page.models.User": "_Specs_.Azure.Core.Page.User", "specs.azure.core.page.models.UserOrder": "_Specs_.Azure.Core.Page.UserOrder", "specs.azure.core.page.models.ListItemInputExtensibleEnum": "_Specs_.Azure.Core.Page.ListItemInputExtensibleEnum", - "specs.azure.core.page.PageClient.two_models_as_page_item.list_first_item": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listFirstItem", - "specs.azure.core.page.PageClient.two_models_as_page_item.list_second_item": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listSecondItem", + "specs.azure.core.page.operations.TwoModelsAsPageItemOperations.list_first_item": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listFirstItem", + "specs.azure.core.page.aio.operations.TwoModelsAsPageItemOperations.list_first_item": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listFirstItem", + "specs.azure.core.page.operations.TwoModelsAsPageItemOperations.list_second_item": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listSecondItem", + "specs.azure.core.page.aio.operations.TwoModelsAsPageItemOperations.list_second_item": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listSecondItem", "specs.azure.core.page.PageClient.list_with_page": "_Specs_.Azure.Core.Page.listWithPage", + "specs.azure.core.page.aio.PageClient.list_with_page": "_Specs_.Azure.Core.Page.listWithPage", "specs.azure.core.page.PageClient.list_with_parameters": "_Specs_.Azure.Core.Page.listWithParameters", + "specs.azure.core.page.aio.PageClient.list_with_parameters": "_Specs_.Azure.Core.Page.listWithParameters", "specs.azure.core.page.PageClient.list_with_custom_page_model": "_Specs_.Azure.Core.Page.listWithCustomPageModel", - "specs.azure.core.page.PageClient.with_parameterized_next_link": "_Specs_.Azure.Core.Page.withParameterizedNextLink" + "specs.azure.core.page.aio.PageClient.list_with_custom_page_model": "_Specs_.Azure.Core.Page.listWithCustomPageModel", + "specs.azure.core.page.PageClient.with_parameterized_next_link": "_Specs_.Azure.Core.Page.withParameterizedNextLink", + "specs.azure.core.page.aio.PageClient.with_parameterized_next_link": "_Specs_.Azure.Core.Page.withParameterizedNextLink" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-core-scalar/apiview-properties.json index 4b24130a217..48fb2eef11d 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-scalar/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-core-scalar/apiview-properties.json @@ -2,10 +2,15 @@ "CrossLanguagePackageId": "_Specs_.Azure.Core.Scalar", "CrossLanguageDefinitionId": { "specs.azure.core.scalar.models.AzureLocationModel": "_Specs_.Azure.Core.Scalar.AzureLocationModel", - "specs.azure.core.scalar.ScalarClient.azure_location_scalar.get": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.get", - "specs.azure.core.scalar.ScalarClient.azure_location_scalar.put": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.put", - "specs.azure.core.scalar.ScalarClient.azure_location_scalar.post": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.post", - "specs.azure.core.scalar.ScalarClient.azure_location_scalar.header": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.header", - "specs.azure.core.scalar.ScalarClient.azure_location_scalar.query": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.query" + "specs.azure.core.scalar.operations.AzureLocationScalarOperations.get": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.get", + "specs.azure.core.scalar.aio.operations.AzureLocationScalarOperations.get": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.get", + "specs.azure.core.scalar.operations.AzureLocationScalarOperations.put": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.put", + "specs.azure.core.scalar.aio.operations.AzureLocationScalarOperations.put": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.put", + "specs.azure.core.scalar.operations.AzureLocationScalarOperations.post": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.post", + "specs.azure.core.scalar.aio.operations.AzureLocationScalarOperations.post": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.post", + "specs.azure.core.scalar.operations.AzureLocationScalarOperations.header": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.header", + "specs.azure.core.scalar.aio.operations.AzureLocationScalarOperations.header": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.header", + "specs.azure.core.scalar.operations.AzureLocationScalarOperations.query": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.query", + "specs.azure.core.scalar.aio.operations.AzureLocationScalarOperations.query": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.query" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-core-traits/apiview-properties.json index 28fd5efe6dd..e4b08c74afb 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-traits/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-core-traits/apiview-properties.json @@ -6,6 +6,8 @@ "specs.azure.core.traits.models.UserActionResponse": "_Specs_.Azure.Core.Traits.UserActionResponse", "specs.azure.core.traits.models.RepeatabilityResult": "Azure.Core.RepeatabilityResult", "specs.azure.core.traits.TraitsClient.smoke_test": "_Specs_.Azure.Core.Traits.smokeTest", - "specs.azure.core.traits.TraitsClient.repeatable_action": "_Specs_.Azure.Core.Traits.repeatableAction" + "specs.azure.core.traits.aio.TraitsClient.smoke_test": "_Specs_.Azure.Core.Traits.smokeTest", + "specs.azure.core.traits.TraitsClient.repeatable_action": "_Specs_.Azure.Core.Traits.repeatableAction", + "specs.azure.core.traits.aio.TraitsClient.repeatable_action": "_Specs_.Azure.Core.Traits.repeatableAction" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-encode-duration/apiview-properties.json index a6e6f7b11e1..ef13fe52441 100644 --- a/packages/typespec-python/test/azure/generated/azure-encode-duration/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-encode-duration/apiview-properties.json @@ -2,6 +2,7 @@ "CrossLanguagePackageId": "_Specs_.Azure.Encode.Duration", "CrossLanguageDefinitionId": { "specs.azure.encode.duration.models.DurationModel": "_Specs_.Azure.Encode.Duration.DurationModel", - "specs.azure.encode.duration.DurationClient.duration_constant": "_Specs_.Azure.Encode.Duration.durationConstant" + "specs.azure.encode.duration.DurationClient.duration_constant": "_Specs_.Azure.Encode.Duration.durationConstant", + "specs.azure.encode.duration.aio.DurationClient.duration_constant": "_Specs_.Azure.Encode.Duration.durationConstant" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-example-basic/apiview-properties.json index c2aa7467184..78f35493451 100644 --- a/packages/typespec-python/test/azure/generated/azure-example-basic/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-example-basic/apiview-properties.json @@ -5,6 +5,7 @@ "specs.azure.example.basic.models.ActionResponse": "_Specs_.Azure.Example.Basic.ActionResponse", "specs.azure.example.basic.models.Model": "_Specs_.Azure.Example.Basic.Model", "specs.azure.example.basic.models.EnumEnum": "_Specs_.Azure.Example.Basic.Enum", - "specs.azure.example.basic.AzureExampleClient.basic_action": "AzureExampleBasicClient.AzureExampleClient.basicAction" + "specs.azure.example.basic.AzureExampleClient.basic_action": "AzureExampleBasicClient.AzureExampleClient.basicAction", + "specs.azure.example.basic.aio.AzureExampleClient.basic_action": "AzureExampleBasicClient.AzureExampleClient.basicAction" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-payload-pageable/apiview-properties.json index 7ac797d227a..ec3b347790f 100644 --- a/packages/typespec-python/test/azure/generated/azure-payload-pageable/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/apiview-properties.json @@ -2,6 +2,7 @@ "CrossLanguagePackageId": "_Specs_.Azure.Payload.Pageable", "CrossLanguageDefinitionId": { "specs.azure.payload.pageable.models.User": "_Specs_.Azure.Payload.Pageable.User", - "specs.azure.payload.pageable.PageableClient.list": "_Specs_.Azure.Payload.Pageable.list" + "specs.azure.payload.pageable.PageableClient.list": "_Specs_.Azure.Payload.Pageable.list", + "specs.azure.payload.pageable.aio.PageableClient.list": "_Specs_.Azure.Payload.Pageable.list" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/apiview-properties.json index b809f6ccd04..ed77be5ba47 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-common-properties/apiview-properties.json @@ -19,10 +19,15 @@ "azure.resourcemanager.commonproperties.models.UserAssignedIdentity": "Azure.ResourceManager.CommonTypes.UserAssignedIdentity", "azure.resourcemanager.commonproperties.models.CreatedByType": "Azure.ResourceManager.CommonTypes.createdByType", "azure.resourcemanager.commonproperties.models.ManagedServiceIdentityType": "Azure.ResourceManager.CommonTypes.ManagedServiceIdentityType", - "azure.resourcemanager.commonproperties.CommonPropertiesClient.managed_identity.get": "Azure.ResourceManager.CommonProperties.ManagedIdentity.get", - "azure.resourcemanager.commonproperties.CommonPropertiesClient.managed_identity.create_with_system_assigned": "Azure.ResourceManager.CommonProperties.ManagedIdentity.createWithSystemAssigned", - "azure.resourcemanager.commonproperties.CommonPropertiesClient.managed_identity.update_with_user_assigned_and_system_assigned": "Azure.ResourceManager.CommonProperties.ManagedIdentity.updateWithUserAssignedAndSystemAssigned", - "azure.resourcemanager.commonproperties.CommonPropertiesClient.error.get_for_predefined_error": "Azure.ResourceManager.CommonProperties.Error.getForPredefinedError", - "azure.resourcemanager.commonproperties.CommonPropertiesClient.error.create_for_user_defined_error": "Azure.ResourceManager.CommonProperties.Error.createForUserDefinedError" + "azure.resourcemanager.commonproperties.operations.ManagedIdentityOperations.get": "Azure.ResourceManager.CommonProperties.ManagedIdentity.get", + "azure.resourcemanager.commonproperties.aio.operations.ManagedIdentityOperations.get": "Azure.ResourceManager.CommonProperties.ManagedIdentity.get", + "azure.resourcemanager.commonproperties.operations.ManagedIdentityOperations.create_with_system_assigned": "Azure.ResourceManager.CommonProperties.ManagedIdentity.createWithSystemAssigned", + "azure.resourcemanager.commonproperties.aio.operations.ManagedIdentityOperations.create_with_system_assigned": "Azure.ResourceManager.CommonProperties.ManagedIdentity.createWithSystemAssigned", + "azure.resourcemanager.commonproperties.operations.ManagedIdentityOperations.update_with_user_assigned_and_system_assigned": "Azure.ResourceManager.CommonProperties.ManagedIdentity.updateWithUserAssignedAndSystemAssigned", + "azure.resourcemanager.commonproperties.aio.operations.ManagedIdentityOperations.update_with_user_assigned_and_system_assigned": "Azure.ResourceManager.CommonProperties.ManagedIdentity.updateWithUserAssignedAndSystemAssigned", + "azure.resourcemanager.commonproperties.operations.ErrorOperations.get_for_predefined_error": "Azure.ResourceManager.CommonProperties.Error.getForPredefinedError", + "azure.resourcemanager.commonproperties.aio.operations.ErrorOperations.get_for_predefined_error": "Azure.ResourceManager.CommonProperties.Error.getForPredefinedError", + "azure.resourcemanager.commonproperties.operations.ErrorOperations.create_for_user_defined_error": "Azure.ResourceManager.CommonProperties.Error.createForUserDefinedError", + "azure.resourcemanager.commonproperties.aio.operations.ErrorOperations.create_for_user_defined_error": "Azure.ResourceManager.CommonProperties.Error.createForUserDefinedError" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-non-resource/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-resource-manager-non-resource/apiview-properties.json index a7196e96b95..bdd53c23a2a 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-non-resource/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-non-resource/apiview-properties.json @@ -5,7 +5,9 @@ "azure.resourcemanager.nonresource.models.ErrorDetail": "Azure.ResourceManager.CommonTypes.ErrorDetail", "azure.resourcemanager.nonresource.models.ErrorResponse": "Azure.ResourceManager.CommonTypes.ErrorResponse", "azure.resourcemanager.nonresource.models.NonResource": "Azure.ResourceManager.NonResource.NonResource", - "azure.resourcemanager.nonresource.NonResourceClient.non_resource_operations.get": "Azure.ResourceManager.NonResource.NonResourceOperations.get", - "azure.resourcemanager.nonresource.NonResourceClient.non_resource_operations.create": "Azure.ResourceManager.NonResource.NonResourceOperations.create" + "azure.resourcemanager.nonresource.operations.NonResourceOperationsOperations.get": "Azure.ResourceManager.NonResource.NonResourceOperations.get", + "azure.resourcemanager.nonresource.aio.operations.NonResourceOperationsOperations.get": "Azure.ResourceManager.NonResource.NonResourceOperations.get", + "azure.resourcemanager.nonresource.operations.NonResourceOperationsOperations.create": "Azure.ResourceManager.NonResource.NonResourceOperations.create", + "azure.resourcemanager.nonresource.aio.operations.NonResourceOperationsOperations.create": "Azure.ResourceManager.NonResource.NonResourceOperations.create" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/apiview-properties.json index 860722b0184..b376eca97b8 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/apiview-properties.json @@ -19,11 +19,17 @@ "azure.resourcemanager.operationtemplates.models.ActionType": "Azure.ResourceManager.CommonTypes.ActionType", "azure.resourcemanager.operationtemplates.models.CheckNameAvailabilityReason": "Azure.ResourceManager.CommonTypes.CheckNameAvailabilityReason", "azure.resourcemanager.operationtemplates.models.CreatedByType": "Azure.ResourceManager.CommonTypes.createdByType", - "azure.resourcemanager.operationtemplates.OperationTemplatesClient.operations.list": "Azure.ResourceManager.Operations.list", - "azure.resourcemanager.operationtemplates.OperationTemplatesClient.check_name_availability.check_global": "Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal", - "azure.resourcemanager.operationtemplates.OperationTemplatesClient.check_name_availability.check_local": "Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal", - "azure.resourcemanager.operationtemplates.OperationTemplatesClient.lro.begin_create_or_replace": "Azure.ResourceManager.OperationTemplates.Lro.createOrReplace", - "azure.resourcemanager.operationtemplates.OperationTemplatesClient.lro.begin_export": "Azure.ResourceManager.OperationTemplates.Lro.export", - "azure.resourcemanager.operationtemplates.OperationTemplatesClient.lro.begin_delete": "Azure.ResourceManager.OperationTemplates.Lro.delete" + "azure.resourcemanager.operationtemplates.operations.Operations.list": "Azure.ResourceManager.Operations.list", + "azure.resourcemanager.operationtemplates.aio.operations.Operations.list": "Azure.ResourceManager.Operations.list", + "azure.resourcemanager.operationtemplates.operations.CheckNameAvailabilityOperations.check_global": "Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal", + "azure.resourcemanager.operationtemplates.aio.operations.CheckNameAvailabilityOperations.check_global": "Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal", + "azure.resourcemanager.operationtemplates.operations.CheckNameAvailabilityOperations.check_local": "Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal", + "azure.resourcemanager.operationtemplates.aio.operations.CheckNameAvailabilityOperations.check_local": "Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal", + "azure.resourcemanager.operationtemplates.operations.LroOperations.begin_create_or_replace": "Azure.ResourceManager.OperationTemplates.Lro.createOrReplace", + "azure.resourcemanager.operationtemplates.aio.operations.LroOperations.begin_create_or_replace": "Azure.ResourceManager.OperationTemplates.Lro.createOrReplace", + "azure.resourcemanager.operationtemplates.operations.LroOperations.begin_export": "Azure.ResourceManager.OperationTemplates.Lro.export", + "azure.resourcemanager.operationtemplates.aio.operations.LroOperations.begin_export": "Azure.ResourceManager.OperationTemplates.Lro.export", + "azure.resourcemanager.operationtemplates.operations.LroOperations.begin_delete": "Azure.ResourceManager.OperationTemplates.Lro.delete", + "azure.resourcemanager.operationtemplates.aio.operations.LroOperations.begin_delete": "Azure.ResourceManager.OperationTemplates.Lro.delete" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/apiview-properties.json index 00badca5be7..fc73bd0556b 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-resources/apiview-properties.json @@ -22,31 +22,57 @@ "azure.resourcemanager.resources.models.TopLevelTrackedResourceProperties": "Azure.ResourceManager.Resources.TopLevelTrackedResourceProperties", "azure.resourcemanager.resources.models.CreatedByType": "Azure.ResourceManager.CommonTypes.createdByType", "azure.resourcemanager.resources.models.ProvisioningState": "Azure.ResourceManager.Resources.ProvisioningState", - "azure.resourcemanager.resources.ResourcesClient.top_level.get": "Azure.ResourceManager.Resources.TopLevel.get", - "azure.resourcemanager.resources.ResourcesClient.top_level.begin_create_or_replace": "Azure.ResourceManager.Resources.TopLevel.createOrReplace", - "azure.resourcemanager.resources.ResourcesClient.top_level.begin_update": "Azure.ResourceManager.Resources.TopLevel.update", - "azure.resourcemanager.resources.ResourcesClient.top_level.begin_delete": "Azure.ResourceManager.Resources.TopLevel.delete", - "azure.resourcemanager.resources.ResourcesClient.top_level.list_by_resource_group": "Azure.ResourceManager.Resources.TopLevel.listByResourceGroup", - "azure.resourcemanager.resources.ResourcesClient.top_level.list_by_subscription": "Azure.ResourceManager.Resources.TopLevel.listBySubscription", - "azure.resourcemanager.resources.ResourcesClient.top_level.action_sync": "Azure.ResourceManager.Resources.TopLevel.actionSync", - "azure.resourcemanager.resources.ResourcesClient.nested.get": "Azure.ResourceManager.Resources.Nested.get", - "azure.resourcemanager.resources.ResourcesClient.nested.begin_create_or_replace": "Azure.ResourceManager.Resources.Nested.createOrReplace", - "azure.resourcemanager.resources.ResourcesClient.nested.begin_update": "Azure.ResourceManager.Resources.Nested.update", - "azure.resourcemanager.resources.ResourcesClient.nested.begin_delete": "Azure.ResourceManager.Resources.Nested.delete", - "azure.resourcemanager.resources.ResourcesClient.nested.list_by_top_level_tracked_resource": "Azure.ResourceManager.Resources.Nested.listByTopLevelTrackedResource", - "azure.resourcemanager.resources.ResourcesClient.singleton.get_by_resource_group": "Azure.ResourceManager.Resources.Singleton.getByResourceGroup", - "azure.resourcemanager.resources.ResourcesClient.singleton.begin_create_or_update": "Azure.ResourceManager.Resources.Singleton.createOrUpdate", - "azure.resourcemanager.resources.ResourcesClient.singleton.update": "Azure.ResourceManager.Resources.Singleton.update", - "azure.resourcemanager.resources.ResourcesClient.singleton.list_by_resource_group": "Azure.ResourceManager.Resources.Singleton.listByResourceGroup", - "azure.resourcemanager.resources.ResourcesClient.extensions_resources.get": "Azure.ResourceManager.Resources.ExtensionsResources.get", - "azure.resourcemanager.resources.ResourcesClient.extensions_resources.begin_create_or_update": "Azure.ResourceManager.Resources.ExtensionsResources.createOrUpdate", - "azure.resourcemanager.resources.ResourcesClient.extensions_resources.update": "Azure.ResourceManager.Resources.ExtensionsResources.update", - "azure.resourcemanager.resources.ResourcesClient.extensions_resources.delete": "Azure.ResourceManager.Resources.ExtensionsResources.delete", - "azure.resourcemanager.resources.ResourcesClient.extensions_resources.list_by_scope": "Azure.ResourceManager.Resources.ExtensionsResources.listByScope", - "azure.resourcemanager.resources.ResourcesClient.location_resources.get": "Azure.ResourceManager.Resources.LocationResources.get", - "azure.resourcemanager.resources.ResourcesClient.location_resources.create_or_update": "Azure.ResourceManager.Resources.LocationResources.createOrUpdate", - "azure.resourcemanager.resources.ResourcesClient.location_resources.update": "Azure.ResourceManager.Resources.LocationResources.update", - "azure.resourcemanager.resources.ResourcesClient.location_resources.delete": "Azure.ResourceManager.Resources.LocationResources.delete", - "azure.resourcemanager.resources.ResourcesClient.location_resources.list_by_location": "Azure.ResourceManager.Resources.LocationResources.listByLocation" + "azure.resourcemanager.resources.operations.TopLevelOperations.get": "Azure.ResourceManager.Resources.TopLevel.get", + "azure.resourcemanager.resources.aio.operations.TopLevelOperations.get": "Azure.ResourceManager.Resources.TopLevel.get", + "azure.resourcemanager.resources.operations.TopLevelOperations.begin_create_or_replace": "Azure.ResourceManager.Resources.TopLevel.createOrReplace", + "azure.resourcemanager.resources.aio.operations.TopLevelOperations.begin_create_or_replace": "Azure.ResourceManager.Resources.TopLevel.createOrReplace", + "azure.resourcemanager.resources.operations.TopLevelOperations.begin_update": "Azure.ResourceManager.Resources.TopLevel.update", + "azure.resourcemanager.resources.aio.operations.TopLevelOperations.begin_update": "Azure.ResourceManager.Resources.TopLevel.update", + "azure.resourcemanager.resources.operations.TopLevelOperations.begin_delete": "Azure.ResourceManager.Resources.TopLevel.delete", + "azure.resourcemanager.resources.aio.operations.TopLevelOperations.begin_delete": "Azure.ResourceManager.Resources.TopLevel.delete", + "azure.resourcemanager.resources.operations.TopLevelOperations.list_by_resource_group": "Azure.ResourceManager.Resources.TopLevel.listByResourceGroup", + "azure.resourcemanager.resources.aio.operations.TopLevelOperations.list_by_resource_group": "Azure.ResourceManager.Resources.TopLevel.listByResourceGroup", + "azure.resourcemanager.resources.operations.TopLevelOperations.list_by_subscription": "Azure.ResourceManager.Resources.TopLevel.listBySubscription", + "azure.resourcemanager.resources.aio.operations.TopLevelOperations.list_by_subscription": "Azure.ResourceManager.Resources.TopLevel.listBySubscription", + "azure.resourcemanager.resources.operations.TopLevelOperations.action_sync": "Azure.ResourceManager.Resources.TopLevel.actionSync", + "azure.resourcemanager.resources.aio.operations.TopLevelOperations.action_sync": "Azure.ResourceManager.Resources.TopLevel.actionSync", + "azure.resourcemanager.resources.operations.NestedOperations.get": "Azure.ResourceManager.Resources.Nested.get", + "azure.resourcemanager.resources.aio.operations.NestedOperations.get": "Azure.ResourceManager.Resources.Nested.get", + "azure.resourcemanager.resources.operations.NestedOperations.begin_create_or_replace": "Azure.ResourceManager.Resources.Nested.createOrReplace", + "azure.resourcemanager.resources.aio.operations.NestedOperations.begin_create_or_replace": "Azure.ResourceManager.Resources.Nested.createOrReplace", + "azure.resourcemanager.resources.operations.NestedOperations.begin_update": "Azure.ResourceManager.Resources.Nested.update", + "azure.resourcemanager.resources.aio.operations.NestedOperations.begin_update": "Azure.ResourceManager.Resources.Nested.update", + "azure.resourcemanager.resources.operations.NestedOperations.begin_delete": "Azure.ResourceManager.Resources.Nested.delete", + "azure.resourcemanager.resources.aio.operations.NestedOperations.begin_delete": "Azure.ResourceManager.Resources.Nested.delete", + "azure.resourcemanager.resources.operations.NestedOperations.list_by_top_level_tracked_resource": "Azure.ResourceManager.Resources.Nested.listByTopLevelTrackedResource", + "azure.resourcemanager.resources.aio.operations.NestedOperations.list_by_top_level_tracked_resource": "Azure.ResourceManager.Resources.Nested.listByTopLevelTrackedResource", + "azure.resourcemanager.resources.operations.SingletonOperations.get_by_resource_group": "Azure.ResourceManager.Resources.Singleton.getByResourceGroup", + "azure.resourcemanager.resources.aio.operations.SingletonOperations.get_by_resource_group": "Azure.ResourceManager.Resources.Singleton.getByResourceGroup", + "azure.resourcemanager.resources.operations.SingletonOperations.begin_create_or_update": "Azure.ResourceManager.Resources.Singleton.createOrUpdate", + "azure.resourcemanager.resources.aio.operations.SingletonOperations.begin_create_or_update": "Azure.ResourceManager.Resources.Singleton.createOrUpdate", + "azure.resourcemanager.resources.operations.SingletonOperations.update": "Azure.ResourceManager.Resources.Singleton.update", + "azure.resourcemanager.resources.aio.operations.SingletonOperations.update": "Azure.ResourceManager.Resources.Singleton.update", + "azure.resourcemanager.resources.operations.SingletonOperations.list_by_resource_group": "Azure.ResourceManager.Resources.Singleton.listByResourceGroup", + "azure.resourcemanager.resources.aio.operations.SingletonOperations.list_by_resource_group": "Azure.ResourceManager.Resources.Singleton.listByResourceGroup", + "azure.resourcemanager.resources.operations.ExtensionsResourcesOperations.get": "Azure.ResourceManager.Resources.ExtensionsResources.get", + "azure.resourcemanager.resources.aio.operations.ExtensionsResourcesOperations.get": "Azure.ResourceManager.Resources.ExtensionsResources.get", + "azure.resourcemanager.resources.operations.ExtensionsResourcesOperations.begin_create_or_update": "Azure.ResourceManager.Resources.ExtensionsResources.createOrUpdate", + "azure.resourcemanager.resources.aio.operations.ExtensionsResourcesOperations.begin_create_or_update": "Azure.ResourceManager.Resources.ExtensionsResources.createOrUpdate", + "azure.resourcemanager.resources.operations.ExtensionsResourcesOperations.update": "Azure.ResourceManager.Resources.ExtensionsResources.update", + "azure.resourcemanager.resources.aio.operations.ExtensionsResourcesOperations.update": "Azure.ResourceManager.Resources.ExtensionsResources.update", + "azure.resourcemanager.resources.operations.ExtensionsResourcesOperations.delete": "Azure.ResourceManager.Resources.ExtensionsResources.delete", + "azure.resourcemanager.resources.aio.operations.ExtensionsResourcesOperations.delete": "Azure.ResourceManager.Resources.ExtensionsResources.delete", + "azure.resourcemanager.resources.operations.ExtensionsResourcesOperations.list_by_scope": "Azure.ResourceManager.Resources.ExtensionsResources.listByScope", + "azure.resourcemanager.resources.aio.operations.ExtensionsResourcesOperations.list_by_scope": "Azure.ResourceManager.Resources.ExtensionsResources.listByScope", + "azure.resourcemanager.resources.operations.LocationResourcesOperations.get": "Azure.ResourceManager.Resources.LocationResources.get", + "azure.resourcemanager.resources.aio.operations.LocationResourcesOperations.get": "Azure.ResourceManager.Resources.LocationResources.get", + "azure.resourcemanager.resources.operations.LocationResourcesOperations.create_or_update": "Azure.ResourceManager.Resources.LocationResources.createOrUpdate", + "azure.resourcemanager.resources.aio.operations.LocationResourcesOperations.create_or_update": "Azure.ResourceManager.Resources.LocationResources.createOrUpdate", + "azure.resourcemanager.resources.operations.LocationResourcesOperations.update": "Azure.ResourceManager.Resources.LocationResources.update", + "azure.resourcemanager.resources.aio.operations.LocationResourcesOperations.update": "Azure.ResourceManager.Resources.LocationResources.update", + "azure.resourcemanager.resources.operations.LocationResourcesOperations.delete": "Azure.ResourceManager.Resources.LocationResources.delete", + "azure.resourcemanager.resources.aio.operations.LocationResourcesOperations.delete": "Azure.ResourceManager.Resources.LocationResources.delete", + "azure.resourcemanager.resources.operations.LocationResourcesOperations.list_by_location": "Azure.ResourceManager.Resources.LocationResources.listByLocation", + "azure.resourcemanager.resources.aio.operations.LocationResourcesOperations.list_by_location": "Azure.ResourceManager.Resources.LocationResources.listByLocation" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/apiview-properties.json index 5e08e0007c9..e9403ec104d 100644 --- a/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/apiview-properties.json @@ -1,6 +1,7 @@ { "CrossLanguagePackageId": "Azure.SpecialHeaders.XmsClientRequestId", "CrossLanguageDefinitionId": { - "azure.specialheaders.xmsclientrequestid.XmsClientRequestIdClient.get": "Azure.SpecialHeaders.XmsClientRequestId.get" + "azure.specialheaders.xmsclientrequestid.XmsClientRequestIdClient.get": "Azure.SpecialHeaders.XmsClientRequestId.get", + "azure.specialheaders.xmsclientrequestid.aio.XmsClientRequestIdClient.get": "Azure.SpecialHeaders.XmsClientRequestId.get" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/client-namespace/apiview-properties.json b/packages/typespec-python/test/azure/generated/client-namespace/apiview-properties.json index f2235386cb8..8519c2a50ab 100644 --- a/packages/typespec-python/test/azure/generated/client-namespace/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/client-namespace/apiview-properties.json @@ -5,6 +5,8 @@ "client.clientnamespace.second.models.SecondClientResult": "Client.ClientNamespace.Second.Model.SecondClientResult", "client.clientnamespace.models.SecondClientEnumType": "Client.ClientNamespace.Second.Model.SecondClientEnumType", "client.clientnamespace.ClientNamespaceFirstClient.get_first": "ClientNameSpaceClient.ClientNamespaceFirstClient.getFirst", - "client.clientnamespace.ClientNamespaceSecondClient.get_second": "ClientNameSpaceClient.ClientNamespaceSecondClient.getSecond" + "client.clientnamespace.aio.ClientNamespaceFirstClient.get_first": "ClientNameSpaceClient.ClientNamespaceFirstClient.getFirst", + "client.clientnamespace.ClientNamespaceSecondClient.get_second": "ClientNameSpaceClient.ClientNamespaceSecondClient.getSecond", + "client.clientnamespace.aio.ClientNamespaceSecondClient.get_second": "ClientNameSpaceClient.ClientNamespaceSecondClient.getSecond" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/client-naming/apiview-properties.json b/packages/typespec-python/test/azure/generated/client-naming/apiview-properties.json index 7dfbf5f5d35..d8cf2e521bf 100644 --- a/packages/typespec-python/test/azure/generated/client-naming/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/client-naming/apiview-properties.json @@ -8,16 +8,27 @@ "client.naming.models.PythonModel": "Client.Naming.Model.ModelWithLanguageClientName", "client.naming.models.ClientExtensibleEnum": "Client.Naming.UnionEnum.ServerExtensibleEnum", "client.naming.models.ExtensibleEnum": "Client.Naming.UnionEnum.ExtensibleEnum", - "client.naming.NamingClient.client_model.client": "Client.Naming.Model.client", - "client.naming.NamingClient.client_model.language": "Client.Naming.Model.language", - "client.naming.NamingClient.union_enum.union_enum_name": "Client.Naming.UnionEnum.unionEnumName", - "client.naming.NamingClient.union_enum.union_enum_member_name": "Client.Naming.UnionEnum.unionEnumMemberName", + "client.naming.operations.ClientModelOperations.client": "Client.Naming.Model.client", + "client.naming.aio.operations.ClientModelOperations.client": "Client.Naming.Model.client", + "client.naming.operations.ClientModelOperations.language": "Client.Naming.Model.language", + "client.naming.aio.operations.ClientModelOperations.language": "Client.Naming.Model.language", + "client.naming.operations.UnionEnumOperations.union_enum_name": "Client.Naming.UnionEnum.unionEnumName", + "client.naming.aio.operations.UnionEnumOperations.union_enum_name": "Client.Naming.UnionEnum.unionEnumName", + "client.naming.operations.UnionEnumOperations.union_enum_member_name": "Client.Naming.UnionEnum.unionEnumMemberName", + "client.naming.aio.operations.UnionEnumOperations.union_enum_member_name": "Client.Naming.UnionEnum.unionEnumMemberName", "client.naming.NamingClient.client_name": "Client.Naming.operation", + "client.naming.aio.NamingClient.client_name": "Client.Naming.operation", "client.naming.NamingClient.parameter": "Client.Naming.parameter", + "client.naming.aio.NamingClient.parameter": "Client.Naming.parameter", "client.naming.NamingClient.client": "Client.Naming.Property.client", + "client.naming.aio.NamingClient.client": "Client.Naming.Property.client", "client.naming.NamingClient.language": "Client.Naming.Property.language", + "client.naming.aio.NamingClient.language": "Client.Naming.Property.language", "client.naming.NamingClient.compatible_with_encoded_name": "Client.Naming.Property.compatibleWithEncodedName", + "client.naming.aio.NamingClient.compatible_with_encoded_name": "Client.Naming.Property.compatibleWithEncodedName", "client.naming.NamingClient.request": "Client.Naming.Header.request", - "client.naming.NamingClient.response": "Client.Naming.Header.response" + "client.naming.aio.NamingClient.request": "Client.Naming.Header.request", + "client.naming.NamingClient.response": "Client.Naming.Header.response", + "client.naming.aio.NamingClient.response": "Client.Naming.Header.response" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/apiview-properties.json b/packages/typespec-python/test/azure/generated/client-structure-default/apiview-properties.json index 68c63211be3..af49e04eab4 100644 --- a/packages/typespec-python/test/azure/generated/client-structure-default/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/client-structure-default/apiview-properties.json @@ -2,12 +2,19 @@ "CrossLanguagePackageId": "Client.Structure.Service", "CrossLanguageDefinitionId": { "client.structure.service.models.ClientType": "Client.Structure.Service.ClientType", - "client.structure.service.ServiceClient.qux.eight": "Client.Structure.Service.Qux.eight", - "client.structure.service.ServiceClient.foo.three": "Client.Structure.Service.Foo.three", - "client.structure.service.ServiceClient.foo.four": "Client.Structure.Service.Foo.four", - "client.structure.service.ServiceClient.bar.five": "Client.Structure.Service.Bar.five", - "client.structure.service.ServiceClient.bar.six": "Client.Structure.Service.Bar.six", + "client.structure.service.operations.QuxOperations.eight": "Client.Structure.Service.Qux.eight", + "client.structure.service.aio.operations.QuxOperations.eight": "Client.Structure.Service.Qux.eight", + "client.structure.service.operations.FooOperations.three": "Client.Structure.Service.Foo.three", + "client.structure.service.aio.operations.FooOperations.three": "Client.Structure.Service.Foo.three", + "client.structure.service.operations.FooOperations.four": "Client.Structure.Service.Foo.four", + "client.structure.service.aio.operations.FooOperations.four": "Client.Structure.Service.Foo.four", + "client.structure.service.operations.BarOperations.five": "Client.Structure.Service.Bar.five", + "client.structure.service.aio.operations.BarOperations.five": "Client.Structure.Service.Bar.five", + "client.structure.service.operations.BarOperations.six": "Client.Structure.Service.Bar.six", + "client.structure.service.aio.operations.BarOperations.six": "Client.Structure.Service.Bar.six", "client.structure.service.ServiceClient.one": "Client.Structure.Service.one", - "client.structure.service.ServiceClient.two": "Client.Structure.Service.two" + "client.structure.service.aio.ServiceClient.one": "Client.Structure.Service.one", + "client.structure.service.ServiceClient.two": "Client.Structure.Service.two", + "client.structure.service.aio.ServiceClient.two": "Client.Structure.Service.two" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/client-structure-multiclient/apiview-properties.json b/packages/typespec-python/test/azure/generated/client-structure-multiclient/apiview-properties.json index 209f247404d..09866ec5db8 100644 --- a/packages/typespec-python/test/azure/generated/client-structure-multiclient/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/client-structure-multiclient/apiview-properties.json @@ -3,10 +3,16 @@ "CrossLanguageDefinitionId": { "client.structure.multiclient.models.ClientType": "Client.Structure.Service.ClientType", "client.structure.multiclient.ClientAClient.renamed_one": "Client.Structure.MultiClient.ClientA.renamedOne", + "client.structure.multiclient.aio.ClientAClient.renamed_one": "Client.Structure.MultiClient.ClientA.renamedOne", "client.structure.multiclient.ClientAClient.renamed_three": "Client.Structure.MultiClient.ClientA.renamedThree", + "client.structure.multiclient.aio.ClientAClient.renamed_three": "Client.Structure.MultiClient.ClientA.renamedThree", "client.structure.multiclient.ClientAClient.renamed_five": "Client.Structure.MultiClient.ClientA.renamedFive", + "client.structure.multiclient.aio.ClientAClient.renamed_five": "Client.Structure.MultiClient.ClientA.renamedFive", "client.structure.multiclient.ClientBClient.renamed_two": "Client.Structure.MultiClient.ClientB.renamedTwo", + "client.structure.multiclient.aio.ClientBClient.renamed_two": "Client.Structure.MultiClient.ClientB.renamedTwo", "client.structure.multiclient.ClientBClient.renamed_four": "Client.Structure.MultiClient.ClientB.renamedFour", - "client.structure.multiclient.ClientBClient.renamed_six": "Client.Structure.MultiClient.ClientB.renamedSix" + "client.structure.multiclient.aio.ClientBClient.renamed_four": "Client.Structure.MultiClient.ClientB.renamedFour", + "client.structure.multiclient.ClientBClient.renamed_six": "Client.Structure.MultiClient.ClientB.renamedSix", + "client.structure.multiclient.aio.ClientBClient.renamed_six": "Client.Structure.MultiClient.ClientB.renamedSix" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/client-structure-renamedoperation/apiview-properties.json b/packages/typespec-python/test/azure/generated/client-structure-renamedoperation/apiview-properties.json index fc1f4a34da1..95abbd25d39 100644 --- a/packages/typespec-python/test/azure/generated/client-structure-renamedoperation/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/client-structure-renamedoperation/apiview-properties.json @@ -2,11 +2,17 @@ "CrossLanguagePackageId": "Client.Structure.Service", "CrossLanguageDefinitionId": { "client.structure.renamedoperation.models.ClientType": "Client.Structure.Service.ClientType", - "client.structure.renamedoperation.RenamedOperationClient.group.renamed_two": "Client.Structure.RenamedOperation.Group.renamedTwo", - "client.structure.renamedoperation.RenamedOperationClient.group.renamed_four": "Client.Structure.RenamedOperation.Group.renamedFour", - "client.structure.renamedoperation.RenamedOperationClient.group.renamed_six": "Client.Structure.RenamedOperation.Group.renamedSix", + "client.structure.renamedoperation.operations.GroupOperations.renamed_two": "Client.Structure.RenamedOperation.Group.renamedTwo", + "client.structure.renamedoperation.aio.operations.GroupOperations.renamed_two": "Client.Structure.RenamedOperation.Group.renamedTwo", + "client.structure.renamedoperation.operations.GroupOperations.renamed_four": "Client.Structure.RenamedOperation.Group.renamedFour", + "client.structure.renamedoperation.aio.operations.GroupOperations.renamed_four": "Client.Structure.RenamedOperation.Group.renamedFour", + "client.structure.renamedoperation.operations.GroupOperations.renamed_six": "Client.Structure.RenamedOperation.Group.renamedSix", + "client.structure.renamedoperation.aio.operations.GroupOperations.renamed_six": "Client.Structure.RenamedOperation.Group.renamedSix", "client.structure.renamedoperation.RenamedOperationClient.renamed_one": "Client.Structure.RenamedOperation.renamedOne", + "client.structure.renamedoperation.aio.RenamedOperationClient.renamed_one": "Client.Structure.RenamedOperation.renamedOne", "client.structure.renamedoperation.RenamedOperationClient.renamed_three": "Client.Structure.RenamedOperation.renamedThree", - "client.structure.renamedoperation.RenamedOperationClient.renamed_five": "Client.Structure.RenamedOperation.renamedFive" + "client.structure.renamedoperation.aio.RenamedOperationClient.renamed_three": "Client.Structure.RenamedOperation.renamedThree", + "client.structure.renamedoperation.RenamedOperationClient.renamed_five": "Client.Structure.RenamedOperation.renamedFive", + "client.structure.renamedoperation.aio.RenamedOperationClient.renamed_five": "Client.Structure.RenamedOperation.renamedFive" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/client-structure-twooperationgroup/apiview-properties.json b/packages/typespec-python/test/azure/generated/client-structure-twooperationgroup/apiview-properties.json index 96afd779a4f..c261544580f 100644 --- a/packages/typespec-python/test/azure/generated/client-structure-twooperationgroup/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/client-structure-twooperationgroup/apiview-properties.json @@ -2,11 +2,17 @@ "CrossLanguagePackageId": "Client.Structure.Service", "CrossLanguageDefinitionId": { "client.structure.twooperationgroup.models.ClientType": "Client.Structure.Service.ClientType", - "client.structure.twooperationgroup.TwoOperationGroupClient.group1.one": "Client.Structure.TwoOperationGroup.Group1.one", - "client.structure.twooperationgroup.TwoOperationGroupClient.group1.three": "Client.Structure.TwoOperationGroup.Group1.three", - "client.structure.twooperationgroup.TwoOperationGroupClient.group1.four": "Client.Structure.TwoOperationGroup.Group1.four", - "client.structure.twooperationgroup.TwoOperationGroupClient.group2.two": "Client.Structure.TwoOperationGroup.Group2.two", - "client.structure.twooperationgroup.TwoOperationGroupClient.group2.five": "Client.Structure.TwoOperationGroup.Group2.five", - "client.structure.twooperationgroup.TwoOperationGroupClient.group2.six": "Client.Structure.TwoOperationGroup.Group2.six" + "client.structure.twooperationgroup.operations.Group1Operations.one": "Client.Structure.TwoOperationGroup.Group1.one", + "client.structure.twooperationgroup.aio.operations.Group1Operations.one": "Client.Structure.TwoOperationGroup.Group1.one", + "client.structure.twooperationgroup.operations.Group1Operations.three": "Client.Structure.TwoOperationGroup.Group1.three", + "client.structure.twooperationgroup.aio.operations.Group1Operations.three": "Client.Structure.TwoOperationGroup.Group1.three", + "client.structure.twooperationgroup.operations.Group1Operations.four": "Client.Structure.TwoOperationGroup.Group1.four", + "client.structure.twooperationgroup.aio.operations.Group1Operations.four": "Client.Structure.TwoOperationGroup.Group1.four", + "client.structure.twooperationgroup.operations.Group2Operations.two": "Client.Structure.TwoOperationGroup.Group2.two", + "client.structure.twooperationgroup.aio.operations.Group2Operations.two": "Client.Structure.TwoOperationGroup.Group2.two", + "client.structure.twooperationgroup.operations.Group2Operations.five": "Client.Structure.TwoOperationGroup.Group2.five", + "client.structure.twooperationgroup.aio.operations.Group2Operations.five": "Client.Structure.TwoOperationGroup.Group2.five", + "client.structure.twooperationgroup.operations.Group2Operations.six": "Client.Structure.TwoOperationGroup.Group2.six", + "client.structure.twooperationgroup.aio.operations.Group2Operations.six": "Client.Structure.TwoOperationGroup.Group2.six" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/apiview-properties.json b/packages/typespec-python/test/azure/generated/encode-bytes/apiview-properties.json index def5fb01af7..c5a77761fd6 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/encode-bytes/apiview-properties.json @@ -5,27 +5,49 @@ "encode.bytes.models.Base64urlArrayBytesProperty": "Encode.Bytes.Base64urlArrayBytesProperty", "encode.bytes.models.Base64urlBytesProperty": "Encode.Bytes.Base64urlBytesProperty", "encode.bytes.models.DefaultBytesProperty": "Encode.Bytes.DefaultBytesProperty", - "encode.bytes.BytesClient.query.default": "Encode.Bytes.Query.default", - "encode.bytes.BytesClient.query.base64": "Encode.Bytes.Query.base64", - "encode.bytes.BytesClient.query.base64_url": "Encode.Bytes.Query.base64url", - "encode.bytes.BytesClient.query.base64_url_array": "Encode.Bytes.Query.base64urlArray", - "encode.bytes.BytesClient.property.default": "Encode.Bytes.Property.default", - "encode.bytes.BytesClient.property.base64": "Encode.Bytes.Property.base64", - "encode.bytes.BytesClient.property.base64_url": "Encode.Bytes.Property.base64url", - "encode.bytes.BytesClient.property.base64_url_array": "Encode.Bytes.Property.base64urlArray", - "encode.bytes.BytesClient.header.default": "Encode.Bytes.Header.default", - "encode.bytes.BytesClient.header.base64": "Encode.Bytes.Header.base64", - "encode.bytes.BytesClient.header.base64_url": "Encode.Bytes.Header.base64url", - "encode.bytes.BytesClient.header.base64_url_array": "Encode.Bytes.Header.base64urlArray", - "encode.bytes.BytesClient.request_body.default": "Encode.Bytes.RequestBody.default", - "encode.bytes.BytesClient.request_body.octet_stream": "Encode.Bytes.RequestBody.octetStream", - "encode.bytes.BytesClient.request_body.custom_content_type": "Encode.Bytes.RequestBody.customContentType", - "encode.bytes.BytesClient.request_body.base64": "Encode.Bytes.RequestBody.base64", - "encode.bytes.BytesClient.request_body.base64_url": "Encode.Bytes.RequestBody.base64url", - "encode.bytes.BytesClient.response_body.default": "Encode.Bytes.ResponseBody.default", - "encode.bytes.BytesClient.response_body.octet_stream": "Encode.Bytes.ResponseBody.octetStream", - "encode.bytes.BytesClient.response_body.custom_content_type": "Encode.Bytes.ResponseBody.customContentType", - "encode.bytes.BytesClient.response_body.base64": "Encode.Bytes.ResponseBody.base64", - "encode.bytes.BytesClient.response_body.base64_url": "Encode.Bytes.ResponseBody.base64url" + "encode.bytes.operations.QueryOperations.default": "Encode.Bytes.Query.default", + "encode.bytes.aio.operations.QueryOperations.default": "Encode.Bytes.Query.default", + "encode.bytes.operations.QueryOperations.base64": "Encode.Bytes.Query.base64", + "encode.bytes.aio.operations.QueryOperations.base64": "Encode.Bytes.Query.base64", + "encode.bytes.operations.QueryOperations.base64_url": "Encode.Bytes.Query.base64url", + "encode.bytes.aio.operations.QueryOperations.base64_url": "Encode.Bytes.Query.base64url", + "encode.bytes.operations.QueryOperations.base64_url_array": "Encode.Bytes.Query.base64urlArray", + "encode.bytes.aio.operations.QueryOperations.base64_url_array": "Encode.Bytes.Query.base64urlArray", + "encode.bytes.operations.PropertyOperations.default": "Encode.Bytes.Property.default", + "encode.bytes.aio.operations.PropertyOperations.default": "Encode.Bytes.Property.default", + "encode.bytes.operations.PropertyOperations.base64": "Encode.Bytes.Property.base64", + "encode.bytes.aio.operations.PropertyOperations.base64": "Encode.Bytes.Property.base64", + "encode.bytes.operations.PropertyOperations.base64_url": "Encode.Bytes.Property.base64url", + "encode.bytes.aio.operations.PropertyOperations.base64_url": "Encode.Bytes.Property.base64url", + "encode.bytes.operations.PropertyOperations.base64_url_array": "Encode.Bytes.Property.base64urlArray", + "encode.bytes.aio.operations.PropertyOperations.base64_url_array": "Encode.Bytes.Property.base64urlArray", + "encode.bytes.operations.HeaderOperations.default": "Encode.Bytes.Header.default", + "encode.bytes.aio.operations.HeaderOperations.default": "Encode.Bytes.Header.default", + "encode.bytes.operations.HeaderOperations.base64": "Encode.Bytes.Header.base64", + "encode.bytes.aio.operations.HeaderOperations.base64": "Encode.Bytes.Header.base64", + "encode.bytes.operations.HeaderOperations.base64_url": "Encode.Bytes.Header.base64url", + "encode.bytes.aio.operations.HeaderOperations.base64_url": "Encode.Bytes.Header.base64url", + "encode.bytes.operations.HeaderOperations.base64_url_array": "Encode.Bytes.Header.base64urlArray", + "encode.bytes.aio.operations.HeaderOperations.base64_url_array": "Encode.Bytes.Header.base64urlArray", + "encode.bytes.operations.RequestBodyOperations.default": "Encode.Bytes.RequestBody.default", + "encode.bytes.aio.operations.RequestBodyOperations.default": "Encode.Bytes.RequestBody.default", + "encode.bytes.operations.RequestBodyOperations.octet_stream": "Encode.Bytes.RequestBody.octetStream", + "encode.bytes.aio.operations.RequestBodyOperations.octet_stream": "Encode.Bytes.RequestBody.octetStream", + "encode.bytes.operations.RequestBodyOperations.custom_content_type": "Encode.Bytes.RequestBody.customContentType", + "encode.bytes.aio.operations.RequestBodyOperations.custom_content_type": "Encode.Bytes.RequestBody.customContentType", + "encode.bytes.operations.RequestBodyOperations.base64": "Encode.Bytes.RequestBody.base64", + "encode.bytes.aio.operations.RequestBodyOperations.base64": "Encode.Bytes.RequestBody.base64", + "encode.bytes.operations.RequestBodyOperations.base64_url": "Encode.Bytes.RequestBody.base64url", + "encode.bytes.aio.operations.RequestBodyOperations.base64_url": "Encode.Bytes.RequestBody.base64url", + "encode.bytes.operations.ResponseBodyOperations.default": "Encode.Bytes.ResponseBody.default", + "encode.bytes.aio.operations.ResponseBodyOperations.default": "Encode.Bytes.ResponseBody.default", + "encode.bytes.operations.ResponseBodyOperations.octet_stream": "Encode.Bytes.ResponseBody.octetStream", + "encode.bytes.aio.operations.ResponseBodyOperations.octet_stream": "Encode.Bytes.ResponseBody.octetStream", + "encode.bytes.operations.ResponseBodyOperations.custom_content_type": "Encode.Bytes.ResponseBody.customContentType", + "encode.bytes.aio.operations.ResponseBodyOperations.custom_content_type": "Encode.Bytes.ResponseBody.customContentType", + "encode.bytes.operations.ResponseBodyOperations.base64": "Encode.Bytes.ResponseBody.base64", + "encode.bytes.aio.operations.ResponseBodyOperations.base64": "Encode.Bytes.ResponseBody.base64", + "encode.bytes.operations.ResponseBodyOperations.base64_url": "Encode.Bytes.ResponseBody.base64url", + "encode.bytes.aio.operations.ResponseBodyOperations.base64_url": "Encode.Bytes.ResponseBody.base64url" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/encode-datetime/apiview-properties.json b/packages/typespec-python/test/azure/generated/encode-datetime/apiview-properties.json index cc53232611a..822e64692e4 100644 --- a/packages/typespec-python/test/azure/generated/encode-datetime/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/encode-datetime/apiview-properties.json @@ -6,24 +6,43 @@ "encode.datetime.models.Rfc7231DatetimeProperty": "Encode.Datetime.Rfc7231DatetimeProperty", "encode.datetime.models.UnixTimestampArrayDatetimeProperty": "Encode.Datetime.UnixTimestampArrayDatetimeProperty", "encode.datetime.models.UnixTimestampDatetimeProperty": "Encode.Datetime.UnixTimestampDatetimeProperty", - "encode.datetime.DatetimeClient.query.default": "Encode.Datetime.Query.default", - "encode.datetime.DatetimeClient.query.rfc3339": "Encode.Datetime.Query.rfc3339", - "encode.datetime.DatetimeClient.query.rfc7231": "Encode.Datetime.Query.rfc7231", - "encode.datetime.DatetimeClient.query.unix_timestamp": "Encode.Datetime.Query.unixTimestamp", - "encode.datetime.DatetimeClient.query.unix_timestamp_array": "Encode.Datetime.Query.unixTimestampArray", - "encode.datetime.DatetimeClient.property.default": "Encode.Datetime.Property.default", - "encode.datetime.DatetimeClient.property.rfc3339": "Encode.Datetime.Property.rfc3339", - "encode.datetime.DatetimeClient.property.rfc7231": "Encode.Datetime.Property.rfc7231", - "encode.datetime.DatetimeClient.property.unix_timestamp": "Encode.Datetime.Property.unixTimestamp", - "encode.datetime.DatetimeClient.property.unix_timestamp_array": "Encode.Datetime.Property.unixTimestampArray", - "encode.datetime.DatetimeClient.header.default": "Encode.Datetime.Header.default", - "encode.datetime.DatetimeClient.header.rfc3339": "Encode.Datetime.Header.rfc3339", - "encode.datetime.DatetimeClient.header.rfc7231": "Encode.Datetime.Header.rfc7231", - "encode.datetime.DatetimeClient.header.unix_timestamp": "Encode.Datetime.Header.unixTimestamp", - "encode.datetime.DatetimeClient.header.unix_timestamp_array": "Encode.Datetime.Header.unixTimestampArray", - "encode.datetime.DatetimeClient.response_header.default": "Encode.Datetime.ResponseHeader.default", - "encode.datetime.DatetimeClient.response_header.rfc3339": "Encode.Datetime.ResponseHeader.rfc3339", - "encode.datetime.DatetimeClient.response_header.rfc7231": "Encode.Datetime.ResponseHeader.rfc7231", - "encode.datetime.DatetimeClient.response_header.unix_timestamp": "Encode.Datetime.ResponseHeader.unixTimestamp" + "encode.datetime.operations.QueryOperations.default": "Encode.Datetime.Query.default", + "encode.datetime.aio.operations.QueryOperations.default": "Encode.Datetime.Query.default", + "encode.datetime.operations.QueryOperations.rfc3339": "Encode.Datetime.Query.rfc3339", + "encode.datetime.aio.operations.QueryOperations.rfc3339": "Encode.Datetime.Query.rfc3339", + "encode.datetime.operations.QueryOperations.rfc7231": "Encode.Datetime.Query.rfc7231", + "encode.datetime.aio.operations.QueryOperations.rfc7231": "Encode.Datetime.Query.rfc7231", + "encode.datetime.operations.QueryOperations.unix_timestamp": "Encode.Datetime.Query.unixTimestamp", + "encode.datetime.aio.operations.QueryOperations.unix_timestamp": "Encode.Datetime.Query.unixTimestamp", + "encode.datetime.operations.QueryOperations.unix_timestamp_array": "Encode.Datetime.Query.unixTimestampArray", + "encode.datetime.aio.operations.QueryOperations.unix_timestamp_array": "Encode.Datetime.Query.unixTimestampArray", + "encode.datetime.operations.PropertyOperations.default": "Encode.Datetime.Property.default", + "encode.datetime.aio.operations.PropertyOperations.default": "Encode.Datetime.Property.default", + "encode.datetime.operations.PropertyOperations.rfc3339": "Encode.Datetime.Property.rfc3339", + "encode.datetime.aio.operations.PropertyOperations.rfc3339": "Encode.Datetime.Property.rfc3339", + "encode.datetime.operations.PropertyOperations.rfc7231": "Encode.Datetime.Property.rfc7231", + "encode.datetime.aio.operations.PropertyOperations.rfc7231": "Encode.Datetime.Property.rfc7231", + "encode.datetime.operations.PropertyOperations.unix_timestamp": "Encode.Datetime.Property.unixTimestamp", + "encode.datetime.aio.operations.PropertyOperations.unix_timestamp": "Encode.Datetime.Property.unixTimestamp", + "encode.datetime.operations.PropertyOperations.unix_timestamp_array": "Encode.Datetime.Property.unixTimestampArray", + "encode.datetime.aio.operations.PropertyOperations.unix_timestamp_array": "Encode.Datetime.Property.unixTimestampArray", + "encode.datetime.operations.HeaderOperations.default": "Encode.Datetime.Header.default", + "encode.datetime.aio.operations.HeaderOperations.default": "Encode.Datetime.Header.default", + "encode.datetime.operations.HeaderOperations.rfc3339": "Encode.Datetime.Header.rfc3339", + "encode.datetime.aio.operations.HeaderOperations.rfc3339": "Encode.Datetime.Header.rfc3339", + "encode.datetime.operations.HeaderOperations.rfc7231": "Encode.Datetime.Header.rfc7231", + "encode.datetime.aio.operations.HeaderOperations.rfc7231": "Encode.Datetime.Header.rfc7231", + "encode.datetime.operations.HeaderOperations.unix_timestamp": "Encode.Datetime.Header.unixTimestamp", + "encode.datetime.aio.operations.HeaderOperations.unix_timestamp": "Encode.Datetime.Header.unixTimestamp", + "encode.datetime.operations.HeaderOperations.unix_timestamp_array": "Encode.Datetime.Header.unixTimestampArray", + "encode.datetime.aio.operations.HeaderOperations.unix_timestamp_array": "Encode.Datetime.Header.unixTimestampArray", + "encode.datetime.operations.ResponseHeaderOperations.default": "Encode.Datetime.ResponseHeader.default", + "encode.datetime.aio.operations.ResponseHeaderOperations.default": "Encode.Datetime.ResponseHeader.default", + "encode.datetime.operations.ResponseHeaderOperations.rfc3339": "Encode.Datetime.ResponseHeader.rfc3339", + "encode.datetime.aio.operations.ResponseHeaderOperations.rfc3339": "Encode.Datetime.ResponseHeader.rfc3339", + "encode.datetime.operations.ResponseHeaderOperations.rfc7231": "Encode.Datetime.ResponseHeader.rfc7231", + "encode.datetime.aio.operations.ResponseHeaderOperations.rfc7231": "Encode.Datetime.ResponseHeader.rfc7231", + "encode.datetime.operations.ResponseHeaderOperations.unix_timestamp": "Encode.Datetime.ResponseHeader.unixTimestamp", + "encode.datetime.aio.operations.ResponseHeaderOperations.unix_timestamp": "Encode.Datetime.ResponseHeader.unixTimestamp" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/encode-duration/apiview-properties.json b/packages/typespec-python/test/azure/generated/encode-duration/apiview-properties.json index 0d62c4e2e33..fe90099e81a 100644 --- a/packages/typespec-python/test/azure/generated/encode-duration/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/encode-duration/apiview-properties.json @@ -7,23 +7,41 @@ "encode.duration.models.FloatSecondsDurationProperty": "Encode.Duration.Property.FloatSecondsDurationProperty", "encode.duration.models.Int32SecondsDurationProperty": "Encode.Duration.Property.Int32SecondsDurationProperty", "encode.duration.models.ISO8601DurationProperty": "Encode.Duration.Property.ISO8601DurationProperty", - "encode.duration.DurationClient.query.default": "Encode.Duration.Query.default", - "encode.duration.DurationClient.query.iso8601": "Encode.Duration.Query.iso8601", - "encode.duration.DurationClient.query.int32_seconds": "Encode.Duration.Query.int32Seconds", - "encode.duration.DurationClient.query.float_seconds": "Encode.Duration.Query.floatSeconds", - "encode.duration.DurationClient.query.float64_seconds": "Encode.Duration.Query.float64Seconds", - "encode.duration.DurationClient.query.int32_seconds_array": "Encode.Duration.Query.int32SecondsArray", - "encode.duration.DurationClient.property.default": "Encode.Duration.Property.default", - "encode.duration.DurationClient.property.iso8601": "Encode.Duration.Property.iso8601", - "encode.duration.DurationClient.property.int32_seconds": "Encode.Duration.Property.int32Seconds", - "encode.duration.DurationClient.property.float_seconds": "Encode.Duration.Property.floatSeconds", - "encode.duration.DurationClient.property.float64_seconds": "Encode.Duration.Property.float64Seconds", - "encode.duration.DurationClient.property.float_seconds_array": "Encode.Duration.Property.floatSecondsArray", - "encode.duration.DurationClient.header.default": "Encode.Duration.Header.default", - "encode.duration.DurationClient.header.iso8601": "Encode.Duration.Header.iso8601", - "encode.duration.DurationClient.header.iso8601_array": "Encode.Duration.Header.iso8601Array", - "encode.duration.DurationClient.header.int32_seconds": "Encode.Duration.Header.int32Seconds", - "encode.duration.DurationClient.header.float_seconds": "Encode.Duration.Header.floatSeconds", - "encode.duration.DurationClient.header.float64_seconds": "Encode.Duration.Header.float64Seconds" + "encode.duration.operations.QueryOperations.default": "Encode.Duration.Query.default", + "encode.duration.aio.operations.QueryOperations.default": "Encode.Duration.Query.default", + "encode.duration.operations.QueryOperations.iso8601": "Encode.Duration.Query.iso8601", + "encode.duration.aio.operations.QueryOperations.iso8601": "Encode.Duration.Query.iso8601", + "encode.duration.operations.QueryOperations.int32_seconds": "Encode.Duration.Query.int32Seconds", + "encode.duration.aio.operations.QueryOperations.int32_seconds": "Encode.Duration.Query.int32Seconds", + "encode.duration.operations.QueryOperations.float_seconds": "Encode.Duration.Query.floatSeconds", + "encode.duration.aio.operations.QueryOperations.float_seconds": "Encode.Duration.Query.floatSeconds", + "encode.duration.operations.QueryOperations.float64_seconds": "Encode.Duration.Query.float64Seconds", + "encode.duration.aio.operations.QueryOperations.float64_seconds": "Encode.Duration.Query.float64Seconds", + "encode.duration.operations.QueryOperations.int32_seconds_array": "Encode.Duration.Query.int32SecondsArray", + "encode.duration.aio.operations.QueryOperations.int32_seconds_array": "Encode.Duration.Query.int32SecondsArray", + "encode.duration.operations.PropertyOperations.default": "Encode.Duration.Property.default", + "encode.duration.aio.operations.PropertyOperations.default": "Encode.Duration.Property.default", + "encode.duration.operations.PropertyOperations.iso8601": "Encode.Duration.Property.iso8601", + "encode.duration.aio.operations.PropertyOperations.iso8601": "Encode.Duration.Property.iso8601", + "encode.duration.operations.PropertyOperations.int32_seconds": "Encode.Duration.Property.int32Seconds", + "encode.duration.aio.operations.PropertyOperations.int32_seconds": "Encode.Duration.Property.int32Seconds", + "encode.duration.operations.PropertyOperations.float_seconds": "Encode.Duration.Property.floatSeconds", + "encode.duration.aio.operations.PropertyOperations.float_seconds": "Encode.Duration.Property.floatSeconds", + "encode.duration.operations.PropertyOperations.float64_seconds": "Encode.Duration.Property.float64Seconds", + "encode.duration.aio.operations.PropertyOperations.float64_seconds": "Encode.Duration.Property.float64Seconds", + "encode.duration.operations.PropertyOperations.float_seconds_array": "Encode.Duration.Property.floatSecondsArray", + "encode.duration.aio.operations.PropertyOperations.float_seconds_array": "Encode.Duration.Property.floatSecondsArray", + "encode.duration.operations.HeaderOperations.default": "Encode.Duration.Header.default", + "encode.duration.aio.operations.HeaderOperations.default": "Encode.Duration.Header.default", + "encode.duration.operations.HeaderOperations.iso8601": "Encode.Duration.Header.iso8601", + "encode.duration.aio.operations.HeaderOperations.iso8601": "Encode.Duration.Header.iso8601", + "encode.duration.operations.HeaderOperations.iso8601_array": "Encode.Duration.Header.iso8601Array", + "encode.duration.aio.operations.HeaderOperations.iso8601_array": "Encode.Duration.Header.iso8601Array", + "encode.duration.operations.HeaderOperations.int32_seconds": "Encode.Duration.Header.int32Seconds", + "encode.duration.aio.operations.HeaderOperations.int32_seconds": "Encode.Duration.Header.int32Seconds", + "encode.duration.operations.HeaderOperations.float_seconds": "Encode.Duration.Header.floatSeconds", + "encode.duration.aio.operations.HeaderOperations.float_seconds": "Encode.Duration.Header.floatSeconds", + "encode.duration.operations.HeaderOperations.float64_seconds": "Encode.Duration.Header.float64Seconds", + "encode.duration.aio.operations.HeaderOperations.float64_seconds": "Encode.Duration.Header.float64Seconds" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/encode-numeric/apiview-properties.json b/packages/typespec-python/test/azure/generated/encode-numeric/apiview-properties.json index 14141434976..87e86c3bf15 100644 --- a/packages/typespec-python/test/azure/generated/encode-numeric/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/encode-numeric/apiview-properties.json @@ -4,8 +4,11 @@ "encode.numeric.models.SafeintAsStringProperty": "Encode.Numeric.Property.SafeintAsStringProperty", "encode.numeric.models.Uint32AsStringProperty": "Encode.Numeric.Property.Uint32AsStringProperty", "encode.numeric.models.Uint8AsStringProperty": "Encode.Numeric.Property.Uint8AsStringProperty", - "encode.numeric.NumericClient.property.safeint_as_string": "Encode.Numeric.Property.safeintAsString", - "encode.numeric.NumericClient.property.uint32_as_string_optional": "Encode.Numeric.Property.uint32AsStringOptional", - "encode.numeric.NumericClient.property.uint8_as_string": "Encode.Numeric.Property.uint8AsString" + "encode.numeric.operations.PropertyOperations.safeint_as_string": "Encode.Numeric.Property.safeintAsString", + "encode.numeric.aio.operations.PropertyOperations.safeint_as_string": "Encode.Numeric.Property.safeintAsString", + "encode.numeric.operations.PropertyOperations.uint32_as_string_optional": "Encode.Numeric.Property.uint32AsStringOptional", + "encode.numeric.aio.operations.PropertyOperations.uint32_as_string_optional": "Encode.Numeric.Property.uint32AsStringOptional", + "encode.numeric.operations.PropertyOperations.uint8_as_string": "Encode.Numeric.Property.uint8AsString", + "encode.numeric.aio.operations.PropertyOperations.uint8_as_string": "Encode.Numeric.Property.uint8AsString" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/headasbooleanfalse/apiview-properties.json b/packages/typespec-python/test/azure/generated/headasbooleanfalse/apiview-properties.json index 5dabeead98c..49bebe3c17d 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleanfalse/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/headasbooleanfalse/apiview-properties.json @@ -4,11 +4,18 @@ "headasbooleanfalse.models.ReadOnlyModel": "Type.Model.Visibility.ReadOnlyModel", "headasbooleanfalse.models.VisibilityModel": "Type.Model.Visibility.VisibilityModel", "headasbooleanfalse.VisibilityClient.get_model": "Type.Model.Visibility.getModel", + "headasbooleanfalse.aio.VisibilityClient.get_model": "Type.Model.Visibility.getModel", "headasbooleanfalse.VisibilityClient.head_model": "Type.Model.Visibility.headModel", + "headasbooleanfalse.aio.VisibilityClient.head_model": "Type.Model.Visibility.headModel", "headasbooleanfalse.VisibilityClient.put_model": "Type.Model.Visibility.putModel", + "headasbooleanfalse.aio.VisibilityClient.put_model": "Type.Model.Visibility.putModel", "headasbooleanfalse.VisibilityClient.patch_model": "Type.Model.Visibility.patchModel", + "headasbooleanfalse.aio.VisibilityClient.patch_model": "Type.Model.Visibility.patchModel", "headasbooleanfalse.VisibilityClient.post_model": "Type.Model.Visibility.postModel", + "headasbooleanfalse.aio.VisibilityClient.post_model": "Type.Model.Visibility.postModel", "headasbooleanfalse.VisibilityClient.delete_model": "Type.Model.Visibility.deleteModel", - "headasbooleanfalse.VisibilityClient.put_read_only_model": "Type.Model.Visibility.putReadOnlyModel" + "headasbooleanfalse.aio.VisibilityClient.delete_model": "Type.Model.Visibility.deleteModel", + "headasbooleanfalse.VisibilityClient.put_read_only_model": "Type.Model.Visibility.putReadOnlyModel", + "headasbooleanfalse.aio.VisibilityClient.put_read_only_model": "Type.Model.Visibility.putReadOnlyModel" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/headasbooleantrue/apiview-properties.json b/packages/typespec-python/test/azure/generated/headasbooleantrue/apiview-properties.json index 405adefca3c..2aeac6d89dd 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleantrue/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/headasbooleantrue/apiview-properties.json @@ -4,11 +4,18 @@ "headasbooleantrue.models.ReadOnlyModel": "Type.Model.Visibility.ReadOnlyModel", "headasbooleantrue.models.VisibilityModel": "Type.Model.Visibility.VisibilityModel", "headasbooleantrue.VisibilityClient.get_model": "Type.Model.Visibility.getModel", + "headasbooleantrue.aio.VisibilityClient.get_model": "Type.Model.Visibility.getModel", "headasbooleantrue.VisibilityClient.head_model": "Type.Model.Visibility.headModel", + "headasbooleantrue.aio.VisibilityClient.head_model": "Type.Model.Visibility.headModel", "headasbooleantrue.VisibilityClient.put_model": "Type.Model.Visibility.putModel", + "headasbooleantrue.aio.VisibilityClient.put_model": "Type.Model.Visibility.putModel", "headasbooleantrue.VisibilityClient.patch_model": "Type.Model.Visibility.patchModel", + "headasbooleantrue.aio.VisibilityClient.patch_model": "Type.Model.Visibility.patchModel", "headasbooleantrue.VisibilityClient.post_model": "Type.Model.Visibility.postModel", + "headasbooleantrue.aio.VisibilityClient.post_model": "Type.Model.Visibility.postModel", "headasbooleantrue.VisibilityClient.delete_model": "Type.Model.Visibility.deleteModel", - "headasbooleantrue.VisibilityClient.put_read_only_model": "Type.Model.Visibility.putReadOnlyModel" + "headasbooleantrue.aio.VisibilityClient.delete_model": "Type.Model.Visibility.deleteModel", + "headasbooleantrue.VisibilityClient.put_read_only_model": "Type.Model.Visibility.putReadOnlyModel", + "headasbooleantrue.aio.VisibilityClient.put_read_only_model": "Type.Model.Visibility.putReadOnlyModel" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/parameters-basic/apiview-properties.json b/packages/typespec-python/test/azure/generated/parameters-basic/apiview-properties.json index 3f5d96dd1ca..3aa04a7ea1b 100644 --- a/packages/typespec-python/test/azure/generated/parameters-basic/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/parameters-basic/apiview-properties.json @@ -2,7 +2,9 @@ "CrossLanguagePackageId": "Parameters.Basic", "CrossLanguageDefinitionId": { "parameters.basic.models.User": "Parameters.Basic.ExplicitBody.User", - "parameters.basic.BasicClient.explicit_body.simple": "Parameters.Basic.ExplicitBody.simple", - "parameters.basic.BasicClient.implicit_body.simple": "Parameters.Basic.ImplicitBody.simple" + "parameters.basic.operations.ExplicitBodyOperations.simple": "Parameters.Basic.ExplicitBody.simple", + "parameters.basic.aio.operations.ExplicitBodyOperations.simple": "Parameters.Basic.ExplicitBody.simple", + "parameters.basic.operations.ImplicitBodyOperations.simple": "Parameters.Basic.ImplicitBody.simple", + "parameters.basic.aio.operations.ImplicitBodyOperations.simple": "Parameters.Basic.ImplicitBody.simple" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/parameters-collection-format/apiview-properties.json b/packages/typespec-python/test/azure/generated/parameters-collection-format/apiview-properties.json index d9ae0ea1f0b..c1243e8e46f 100644 --- a/packages/typespec-python/test/azure/generated/parameters-collection-format/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/parameters-collection-format/apiview-properties.json @@ -1,10 +1,15 @@ { "CrossLanguagePackageId": "Parameters.CollectionFormat", "CrossLanguageDefinitionId": { - "parameters.collectionformat.CollectionFormatClient.query.multi": "Parameters.CollectionFormat.Query.multi", - "parameters.collectionformat.CollectionFormatClient.query.ssv": "Parameters.CollectionFormat.Query.ssv", - "parameters.collectionformat.CollectionFormatClient.query.pipes": "Parameters.CollectionFormat.Query.pipes", - "parameters.collectionformat.CollectionFormatClient.query.csv": "Parameters.CollectionFormat.Query.csv", - "parameters.collectionformat.CollectionFormatClient.header.csv": "Parameters.CollectionFormat.Header.csv" + "parameters.collectionformat.operations.QueryOperations.multi": "Parameters.CollectionFormat.Query.multi", + "parameters.collectionformat.aio.operations.QueryOperations.multi": "Parameters.CollectionFormat.Query.multi", + "parameters.collectionformat.operations.QueryOperations.ssv": "Parameters.CollectionFormat.Query.ssv", + "parameters.collectionformat.aio.operations.QueryOperations.ssv": "Parameters.CollectionFormat.Query.ssv", + "parameters.collectionformat.operations.QueryOperations.pipes": "Parameters.CollectionFormat.Query.pipes", + "parameters.collectionformat.aio.operations.QueryOperations.pipes": "Parameters.CollectionFormat.Query.pipes", + "parameters.collectionformat.operations.QueryOperations.csv": "Parameters.CollectionFormat.Query.csv", + "parameters.collectionformat.aio.operations.QueryOperations.csv": "Parameters.CollectionFormat.Query.csv", + "parameters.collectionformat.operations.HeaderOperations.csv": "Parameters.CollectionFormat.Header.csv", + "parameters.collectionformat.aio.operations.HeaderOperations.csv": "Parameters.CollectionFormat.Header.csv" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/parameters-spread/apiview-properties.json b/packages/typespec-python/test/azure/generated/parameters-spread/apiview-properties.json index 4ba87f686fe..fc44feff3d8 100644 --- a/packages/typespec-python/test/azure/generated/parameters-spread/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/parameters-spread/apiview-properties.json @@ -2,15 +2,25 @@ "CrossLanguagePackageId": "Parameters.Spread", "CrossLanguageDefinitionId": { "parameters.spread.models.BodyParameter": "Parameters.Spread.Model.BodyParameter", - "parameters.spread.SpreadClient.model.spread_as_request_body": "Parameters.Spread.Model.spreadAsRequestBody", - "parameters.spread.SpreadClient.model.spread_composite_request_only_with_body": "Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody", - "parameters.spread.SpreadClient.model.spread_composite_request_without_body": "Parameters.Spread.Model.spreadCompositeRequestWithoutBody", - "parameters.spread.SpreadClient.model.spread_composite_request": "Parameters.Spread.Model.spreadCompositeRequest", - "parameters.spread.SpreadClient.model.spread_composite_request_mix": "Parameters.Spread.Model.spreadCompositeRequestMix", - "parameters.spread.SpreadClient.alias.spread_as_request_body": "Parameters.Spread.Alias.spreadAsRequestBody", - "parameters.spread.SpreadClient.alias.spread_parameter_with_inner_model": "Parameters.Spread.Alias.spreadParameterWithInnerModel", - "parameters.spread.SpreadClient.alias.spread_as_request_parameter": "Parameters.Spread.Alias.spreadAsRequestParameter", - "parameters.spread.SpreadClient.alias.spread_with_multiple_parameters": "Parameters.Spread.Alias.spreadWithMultipleParameters", - "parameters.spread.SpreadClient.alias.spread_parameter_with_inner_alias": "Parameters.Spread.Alias.spreadParameterWithInnerAlias" + "parameters.spread.operations.ModelOperations.spread_as_request_body": "Parameters.Spread.Model.spreadAsRequestBody", + "parameters.spread.aio.operations.ModelOperations.spread_as_request_body": "Parameters.Spread.Model.spreadAsRequestBody", + "parameters.spread.operations.ModelOperations.spread_composite_request_only_with_body": "Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody", + "parameters.spread.aio.operations.ModelOperations.spread_composite_request_only_with_body": "Parameters.Spread.Model.spreadCompositeRequestOnlyWithBody", + "parameters.spread.operations.ModelOperations.spread_composite_request_without_body": "Parameters.Spread.Model.spreadCompositeRequestWithoutBody", + "parameters.spread.aio.operations.ModelOperations.spread_composite_request_without_body": "Parameters.Spread.Model.spreadCompositeRequestWithoutBody", + "parameters.spread.operations.ModelOperations.spread_composite_request": "Parameters.Spread.Model.spreadCompositeRequest", + "parameters.spread.aio.operations.ModelOperations.spread_composite_request": "Parameters.Spread.Model.spreadCompositeRequest", + "parameters.spread.operations.ModelOperations.spread_composite_request_mix": "Parameters.Spread.Model.spreadCompositeRequestMix", + "parameters.spread.aio.operations.ModelOperations.spread_composite_request_mix": "Parameters.Spread.Model.spreadCompositeRequestMix", + "parameters.spread.operations.AliasOperations.spread_as_request_body": "Parameters.Spread.Alias.spreadAsRequestBody", + "parameters.spread.aio.operations.AliasOperations.spread_as_request_body": "Parameters.Spread.Alias.spreadAsRequestBody", + "parameters.spread.operations.AliasOperations.spread_parameter_with_inner_model": "Parameters.Spread.Alias.spreadParameterWithInnerModel", + "parameters.spread.aio.operations.AliasOperations.spread_parameter_with_inner_model": "Parameters.Spread.Alias.spreadParameterWithInnerModel", + "parameters.spread.operations.AliasOperations.spread_as_request_parameter": "Parameters.Spread.Alias.spreadAsRequestParameter", + "parameters.spread.aio.operations.AliasOperations.spread_as_request_parameter": "Parameters.Spread.Alias.spreadAsRequestParameter", + "parameters.spread.operations.AliasOperations.spread_with_multiple_parameters": "Parameters.Spread.Alias.spreadWithMultipleParameters", + "parameters.spread.aio.operations.AliasOperations.spread_with_multiple_parameters": "Parameters.Spread.Alias.spreadWithMultipleParameters", + "parameters.spread.operations.AliasOperations.spread_parameter_with_inner_alias": "Parameters.Spread.Alias.spreadParameterWithInnerAlias", + "parameters.spread.aio.operations.AliasOperations.spread_parameter_with_inner_alias": "Parameters.Spread.Alias.spreadParameterWithInnerAlias" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/payload-content-negotiation/apiview-properties.json b/packages/typespec-python/test/azure/generated/payload-content-negotiation/apiview-properties.json index 7413f1ac33a..563a45cea50 100644 --- a/packages/typespec-python/test/azure/generated/payload-content-negotiation/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/payload-content-negotiation/apiview-properties.json @@ -2,9 +2,13 @@ "CrossLanguagePackageId": "Payload.ContentNegotiation", "CrossLanguageDefinitionId": { "payload.contentnegotiation.models.PngImageAsJson": "Payload.ContentNegotiation.DifferentBody.PngImageAsJson", - "payload.contentnegotiation.ContentNegotiationClient.same_body.get_avatar_as_png": "Payload.ContentNegotiation.SameBody.getAvatarAsPng", - "payload.contentnegotiation.ContentNegotiationClient.same_body.get_avatar_as_jpeg": "Payload.ContentNegotiation.SameBody.getAvatarAsJpeg", - "payload.contentnegotiation.ContentNegotiationClient.different_body.get_avatar_as_png": "Payload.ContentNegotiation.DifferentBody.getAvatarAsPng", - "payload.contentnegotiation.ContentNegotiationClient.different_body.get_avatar_as_json": "Payload.ContentNegotiation.DifferentBody.getAvatarAsJson" + "payload.contentnegotiation.operations.SameBodyOperations.get_avatar_as_png": "Payload.ContentNegotiation.SameBody.getAvatarAsPng", + "payload.contentnegotiation.aio.operations.SameBodyOperations.get_avatar_as_png": "Payload.ContentNegotiation.SameBody.getAvatarAsPng", + "payload.contentnegotiation.operations.SameBodyOperations.get_avatar_as_jpeg": "Payload.ContentNegotiation.SameBody.getAvatarAsJpeg", + "payload.contentnegotiation.aio.operations.SameBodyOperations.get_avatar_as_jpeg": "Payload.ContentNegotiation.SameBody.getAvatarAsJpeg", + "payload.contentnegotiation.operations.DifferentBodyOperations.get_avatar_as_png": "Payload.ContentNegotiation.DifferentBody.getAvatarAsPng", + "payload.contentnegotiation.aio.operations.DifferentBodyOperations.get_avatar_as_png": "Payload.ContentNegotiation.DifferentBody.getAvatarAsPng", + "payload.contentnegotiation.operations.DifferentBodyOperations.get_avatar_as_json": "Payload.ContentNegotiation.DifferentBody.getAvatarAsJson", + "payload.contentnegotiation.aio.operations.DifferentBodyOperations.get_avatar_as_json": "Payload.ContentNegotiation.DifferentBody.getAvatarAsJson" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/apiview-properties.json b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/apiview-properties.json index e006254f6da..5905cec421e 100644 --- a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/apiview-properties.json @@ -5,7 +5,10 @@ "payload.jsonmergepatch.models.Resource": "Payload.JsonMergePatch.Resource", "payload.jsonmergepatch.models.ResourcePatch": "Payload.JsonMergePatch.ResourcePatch", "payload.jsonmergepatch.JsonMergePatchClient.create_resource": "Payload.JsonMergePatch.createResource", + "payload.jsonmergepatch.aio.JsonMergePatchClient.create_resource": "Payload.JsonMergePatch.createResource", "payload.jsonmergepatch.JsonMergePatchClient.update_resource": "Payload.JsonMergePatch.updateResource", - "payload.jsonmergepatch.JsonMergePatchClient.update_optional_resource": "Payload.JsonMergePatch.updateOptionalResource" + "payload.jsonmergepatch.aio.JsonMergePatchClient.update_resource": "Payload.JsonMergePatch.updateResource", + "payload.jsonmergepatch.JsonMergePatchClient.update_optional_resource": "Payload.JsonMergePatch.updateOptionalResource", + "payload.jsonmergepatch.aio.JsonMergePatchClient.update_optional_resource": "Payload.JsonMergePatch.updateOptionalResource" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/payload-media-type/apiview-properties.json b/packages/typespec-python/test/azure/generated/payload-media-type/apiview-properties.json index 8e6886fc7f7..79b0e74f6f8 100644 --- a/packages/typespec-python/test/azure/generated/payload-media-type/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/payload-media-type/apiview-properties.json @@ -1,9 +1,13 @@ { "CrossLanguagePackageId": "Payload.MediaType", "CrossLanguageDefinitionId": { - "payload.mediatype.MediaTypeClient.string_body.send_as_text": "Payload.MediaType.StringBody.sendAsText", - "payload.mediatype.MediaTypeClient.string_body.get_as_text": "Payload.MediaType.StringBody.getAsText", - "payload.mediatype.MediaTypeClient.string_body.send_as_json": "Payload.MediaType.StringBody.sendAsJson", - "payload.mediatype.MediaTypeClient.string_body.get_as_json": "Payload.MediaType.StringBody.getAsJson" + "payload.mediatype.operations.StringBodyOperations.send_as_text": "Payload.MediaType.StringBody.sendAsText", + "payload.mediatype.aio.operations.StringBodyOperations.send_as_text": "Payload.MediaType.StringBody.sendAsText", + "payload.mediatype.operations.StringBodyOperations.get_as_text": "Payload.MediaType.StringBody.getAsText", + "payload.mediatype.aio.operations.StringBodyOperations.get_as_text": "Payload.MediaType.StringBody.getAsText", + "payload.mediatype.operations.StringBodyOperations.send_as_json": "Payload.MediaType.StringBody.sendAsJson", + "payload.mediatype.aio.operations.StringBodyOperations.send_as_json": "Payload.MediaType.StringBody.sendAsJson", + "payload.mediatype.operations.StringBodyOperations.get_as_json": "Payload.MediaType.StringBody.getAsJson", + "payload.mediatype.aio.operations.StringBodyOperations.get_as_json": "Payload.MediaType.StringBody.getAsJson" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/payload-multipart/apiview-properties.json b/packages/typespec-python/test/azure/generated/payload-multipart/apiview-properties.json index 8d2f6caac44..90f398be3b3 100644 --- a/packages/typespec-python/test/azure/generated/payload-multipart/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/payload-multipart/apiview-properties.json @@ -13,12 +13,19 @@ "payload.multipart.models.JsonPartRequest": "Payload.MultiPart.JsonPartRequest", "payload.multipart.models.MultiBinaryPartsRequest": "Payload.MultiPart.MultiBinaryPartsRequest", "payload.multipart.models.MultiPartRequest": "Payload.MultiPart.MultiPartRequest", - "payload.multipart.MultiPartClient.form_data.basic": "Payload.MultiPart.FormData.basic", - "payload.multipart.MultiPartClient.form_data.file_array_and_basic": "Payload.MultiPart.FormData.fileArrayAndBasic", - "payload.multipart.MultiPartClient.form_data.json_part": "Payload.MultiPart.FormData.jsonPart", - "payload.multipart.MultiPartClient.form_data.binary_array_parts": "Payload.MultiPart.FormData.binaryArrayParts", - "payload.multipart.MultiPartClient.form_data.multi_binary_parts": "Payload.MultiPart.FormData.multiBinaryParts", - "payload.multipart.MultiPartClient.form_data.check_file_name_and_content_type": "Payload.MultiPart.FormData.checkFileNameAndContentType", - "payload.multipart.MultiPartClient.form_data.anonymous_model": "Payload.MultiPart.FormData.anonymousModel" + "payload.multipart.operations.FormDataOperations.basic": "Payload.MultiPart.FormData.basic", + "payload.multipart.aio.operations.FormDataOperations.basic": "Payload.MultiPart.FormData.basic", + "payload.multipart.operations.FormDataOperations.file_array_and_basic": "Payload.MultiPart.FormData.fileArrayAndBasic", + "payload.multipart.aio.operations.FormDataOperations.file_array_and_basic": "Payload.MultiPart.FormData.fileArrayAndBasic", + "payload.multipart.operations.FormDataOperations.json_part": "Payload.MultiPart.FormData.jsonPart", + "payload.multipart.aio.operations.FormDataOperations.json_part": "Payload.MultiPart.FormData.jsonPart", + "payload.multipart.operations.FormDataOperations.binary_array_parts": "Payload.MultiPart.FormData.binaryArrayParts", + "payload.multipart.aio.operations.FormDataOperations.binary_array_parts": "Payload.MultiPart.FormData.binaryArrayParts", + "payload.multipart.operations.FormDataOperations.multi_binary_parts": "Payload.MultiPart.FormData.multiBinaryParts", + "payload.multipart.aio.operations.FormDataOperations.multi_binary_parts": "Payload.MultiPart.FormData.multiBinaryParts", + "payload.multipart.operations.FormDataOperations.check_file_name_and_content_type": "Payload.MultiPart.FormData.checkFileNameAndContentType", + "payload.multipart.aio.operations.FormDataOperations.check_file_name_and_content_type": "Payload.MultiPart.FormData.checkFileNameAndContentType", + "payload.multipart.operations.FormDataOperations.anonymous_model": "Payload.MultiPart.FormData.anonymousModel", + "payload.multipart.aio.operations.FormDataOperations.anonymous_model": "Payload.MultiPart.FormData.anonymousModel" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/payload-pageable/apiview-properties.json b/packages/typespec-python/test/azure/generated/payload-pageable/apiview-properties.json index dc9a10d23c5..efeb6291dfc 100644 --- a/packages/typespec-python/test/azure/generated/payload-pageable/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/payload-pageable/apiview-properties.json @@ -2,6 +2,7 @@ "CrossLanguagePackageId": "Payload.Pageable", "CrossLanguageDefinitionId": { "payload.pageable.models.Pet": "Payload.Pageable.Pet", - "payload.pageable.PageableClient.server_driven_pagination.link": "Payload.Pageable.ServerDrivenPagination.link" + "payload.pageable.operations.ServerDrivenPaginationOperations.link": "Payload.Pageable.ServerDrivenPagination.link", + "payload.pageable.aio.operations.ServerDrivenPaginationOperations.link": "Payload.Pageable.ServerDrivenPagination.link" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/payload-xml/apiview-properties.json b/packages/typespec-python/test/azure/generated/payload-xml/apiview-properties.json index a42049940e9..a5643eb1276 100644 --- a/packages/typespec-python/test/azure/generated/payload-xml/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/payload-xml/apiview-properties.json @@ -13,29 +13,53 @@ "payload.xml.models.ModelWithText": "Payload.Xml.ModelWithText", "payload.xml.models.ModelWithUnwrappedArray": "Payload.Xml.ModelWithUnwrappedArray", "payload.xml.models.SimpleModel": "Payload.Xml.SimpleModel", - "payload.xml.XmlClient.simple_model_value.get": "Payload.Xml.SimpleModelValue.get", - "payload.xml.XmlClient.simple_model_value.put": "Payload.Xml.SimpleModelValue.put", - "payload.xml.XmlClient.model_with_simple_arrays_value.get": "Payload.Xml.ModelWithSimpleArraysValue.get", - "payload.xml.XmlClient.model_with_simple_arrays_value.put": "Payload.Xml.ModelWithSimpleArraysValue.put", - "payload.xml.XmlClient.model_with_array_of_model_value.get": "Payload.Xml.ModelWithArrayOfModelValue.get", - "payload.xml.XmlClient.model_with_array_of_model_value.put": "Payload.Xml.ModelWithArrayOfModelValue.put", - "payload.xml.XmlClient.model_with_optional_field_value.get": "Payload.Xml.ModelWithOptionalFieldValue.get", - "payload.xml.XmlClient.model_with_optional_field_value.put": "Payload.Xml.ModelWithOptionalFieldValue.put", - "payload.xml.XmlClient.model_with_attributes_value.get": "Payload.Xml.ModelWithAttributesValue.get", - "payload.xml.XmlClient.model_with_attributes_value.put": "Payload.Xml.ModelWithAttributesValue.put", - "payload.xml.XmlClient.model_with_unwrapped_array_value.get": "Payload.Xml.ModelWithUnwrappedArrayValue.get", - "payload.xml.XmlClient.model_with_unwrapped_array_value.put": "Payload.Xml.ModelWithUnwrappedArrayValue.put", - "payload.xml.XmlClient.model_with_renamed_arrays_value.get": "Payload.Xml.ModelWithRenamedArraysValue.get", - "payload.xml.XmlClient.model_with_renamed_arrays_value.put": "Payload.Xml.ModelWithRenamedArraysValue.put", - "payload.xml.XmlClient.model_with_renamed_fields_value.get": "Payload.Xml.ModelWithRenamedFieldsValue.get", - "payload.xml.XmlClient.model_with_renamed_fields_value.put": "Payload.Xml.ModelWithRenamedFieldsValue.put", - "payload.xml.XmlClient.model_with_empty_array_value.get": "Payload.Xml.ModelWithEmptyArrayValue.get", - "payload.xml.XmlClient.model_with_empty_array_value.put": "Payload.Xml.ModelWithEmptyArrayValue.put", - "payload.xml.XmlClient.model_with_text_value.get": "Payload.Xml.ModelWithTextValue.get", - "payload.xml.XmlClient.model_with_text_value.put": "Payload.Xml.ModelWithTextValue.put", - "payload.xml.XmlClient.model_with_dictionary_value.get": "Payload.Xml.ModelWithDictionaryValue.get", - "payload.xml.XmlClient.model_with_dictionary_value.put": "Payload.Xml.ModelWithDictionaryValue.put", - "payload.xml.XmlClient.model_with_encoded_names_value.get": "Payload.Xml.ModelWithEncodedNamesValue.get", - "payload.xml.XmlClient.model_with_encoded_names_value.put": "Payload.Xml.ModelWithEncodedNamesValue.put" + "payload.xml.operations.SimpleModelValueOperations.get": "Payload.Xml.SimpleModelValue.get", + "payload.xml.aio.operations.SimpleModelValueOperations.get": "Payload.Xml.SimpleModelValue.get", + "payload.xml.operations.SimpleModelValueOperations.put": "Payload.Xml.SimpleModelValue.put", + "payload.xml.aio.operations.SimpleModelValueOperations.put": "Payload.Xml.SimpleModelValue.put", + "payload.xml.operations.ModelWithSimpleArraysValueOperations.get": "Payload.Xml.ModelWithSimpleArraysValue.get", + "payload.xml.aio.operations.ModelWithSimpleArraysValueOperations.get": "Payload.Xml.ModelWithSimpleArraysValue.get", + "payload.xml.operations.ModelWithSimpleArraysValueOperations.put": "Payload.Xml.ModelWithSimpleArraysValue.put", + "payload.xml.aio.operations.ModelWithSimpleArraysValueOperations.put": "Payload.Xml.ModelWithSimpleArraysValue.put", + "payload.xml.operations.ModelWithArrayOfModelValueOperations.get": "Payload.Xml.ModelWithArrayOfModelValue.get", + "payload.xml.aio.operations.ModelWithArrayOfModelValueOperations.get": "Payload.Xml.ModelWithArrayOfModelValue.get", + "payload.xml.operations.ModelWithArrayOfModelValueOperations.put": "Payload.Xml.ModelWithArrayOfModelValue.put", + "payload.xml.aio.operations.ModelWithArrayOfModelValueOperations.put": "Payload.Xml.ModelWithArrayOfModelValue.put", + "payload.xml.operations.ModelWithOptionalFieldValueOperations.get": "Payload.Xml.ModelWithOptionalFieldValue.get", + "payload.xml.aio.operations.ModelWithOptionalFieldValueOperations.get": "Payload.Xml.ModelWithOptionalFieldValue.get", + "payload.xml.operations.ModelWithOptionalFieldValueOperations.put": "Payload.Xml.ModelWithOptionalFieldValue.put", + "payload.xml.aio.operations.ModelWithOptionalFieldValueOperations.put": "Payload.Xml.ModelWithOptionalFieldValue.put", + "payload.xml.operations.ModelWithAttributesValueOperations.get": "Payload.Xml.ModelWithAttributesValue.get", + "payload.xml.aio.operations.ModelWithAttributesValueOperations.get": "Payload.Xml.ModelWithAttributesValue.get", + "payload.xml.operations.ModelWithAttributesValueOperations.put": "Payload.Xml.ModelWithAttributesValue.put", + "payload.xml.aio.operations.ModelWithAttributesValueOperations.put": "Payload.Xml.ModelWithAttributesValue.put", + "payload.xml.operations.ModelWithUnwrappedArrayValueOperations.get": "Payload.Xml.ModelWithUnwrappedArrayValue.get", + "payload.xml.aio.operations.ModelWithUnwrappedArrayValueOperations.get": "Payload.Xml.ModelWithUnwrappedArrayValue.get", + "payload.xml.operations.ModelWithUnwrappedArrayValueOperations.put": "Payload.Xml.ModelWithUnwrappedArrayValue.put", + "payload.xml.aio.operations.ModelWithUnwrappedArrayValueOperations.put": "Payload.Xml.ModelWithUnwrappedArrayValue.put", + "payload.xml.operations.ModelWithRenamedArraysValueOperations.get": "Payload.Xml.ModelWithRenamedArraysValue.get", + "payload.xml.aio.operations.ModelWithRenamedArraysValueOperations.get": "Payload.Xml.ModelWithRenamedArraysValue.get", + "payload.xml.operations.ModelWithRenamedArraysValueOperations.put": "Payload.Xml.ModelWithRenamedArraysValue.put", + "payload.xml.aio.operations.ModelWithRenamedArraysValueOperations.put": "Payload.Xml.ModelWithRenamedArraysValue.put", + "payload.xml.operations.ModelWithRenamedFieldsValueOperations.get": "Payload.Xml.ModelWithRenamedFieldsValue.get", + "payload.xml.aio.operations.ModelWithRenamedFieldsValueOperations.get": "Payload.Xml.ModelWithRenamedFieldsValue.get", + "payload.xml.operations.ModelWithRenamedFieldsValueOperations.put": "Payload.Xml.ModelWithRenamedFieldsValue.put", + "payload.xml.aio.operations.ModelWithRenamedFieldsValueOperations.put": "Payload.Xml.ModelWithRenamedFieldsValue.put", + "payload.xml.operations.ModelWithEmptyArrayValueOperations.get": "Payload.Xml.ModelWithEmptyArrayValue.get", + "payload.xml.aio.operations.ModelWithEmptyArrayValueOperations.get": "Payload.Xml.ModelWithEmptyArrayValue.get", + "payload.xml.operations.ModelWithEmptyArrayValueOperations.put": "Payload.Xml.ModelWithEmptyArrayValue.put", + "payload.xml.aio.operations.ModelWithEmptyArrayValueOperations.put": "Payload.Xml.ModelWithEmptyArrayValue.put", + "payload.xml.operations.ModelWithTextValueOperations.get": "Payload.Xml.ModelWithTextValue.get", + "payload.xml.aio.operations.ModelWithTextValueOperations.get": "Payload.Xml.ModelWithTextValue.get", + "payload.xml.operations.ModelWithTextValueOperations.put": "Payload.Xml.ModelWithTextValue.put", + "payload.xml.aio.operations.ModelWithTextValueOperations.put": "Payload.Xml.ModelWithTextValue.put", + "payload.xml.operations.ModelWithDictionaryValueOperations.get": "Payload.Xml.ModelWithDictionaryValue.get", + "payload.xml.aio.operations.ModelWithDictionaryValueOperations.get": "Payload.Xml.ModelWithDictionaryValue.get", + "payload.xml.operations.ModelWithDictionaryValueOperations.put": "Payload.Xml.ModelWithDictionaryValue.put", + "payload.xml.aio.operations.ModelWithDictionaryValueOperations.put": "Payload.Xml.ModelWithDictionaryValue.put", + "payload.xml.operations.ModelWithEncodedNamesValueOperations.get": "Payload.Xml.ModelWithEncodedNamesValue.get", + "payload.xml.aio.operations.ModelWithEncodedNamesValueOperations.get": "Payload.Xml.ModelWithEncodedNamesValue.get", + "payload.xml.operations.ModelWithEncodedNamesValueOperations.put": "Payload.Xml.ModelWithEncodedNamesValue.put", + "payload.xml.aio.operations.ModelWithEncodedNamesValueOperations.put": "Payload.Xml.ModelWithEncodedNamesValue.put" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/resiliency-srv-driven1/apiview-properties.json b/packages/typespec-python/test/azure/generated/resiliency-srv-driven1/apiview-properties.json index cca76b075c5..33f47e285e5 100644 --- a/packages/typespec-python/test/azure/generated/resiliency-srv-driven1/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/resiliency-srv-driven1/apiview-properties.json @@ -2,7 +2,10 @@ "CrossLanguagePackageId": "Resiliency.ServiceDriven", "CrossLanguageDefinitionId": { "resiliency.srv.driven1.ResiliencyServiceDrivenClient.from_none": "Resiliency.ServiceDriven.AddOptionalParam.fromNone", + "resiliency.srv.driven1.aio.ResiliencyServiceDrivenClient.from_none": "Resiliency.ServiceDriven.AddOptionalParam.fromNone", "resiliency.srv.driven1.ResiliencyServiceDrivenClient.from_one_required": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired", - "resiliency.srv.driven1.ResiliencyServiceDrivenClient.from_one_optional": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional" + "resiliency.srv.driven1.aio.ResiliencyServiceDrivenClient.from_one_required": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired", + "resiliency.srv.driven1.ResiliencyServiceDrivenClient.from_one_optional": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional", + "resiliency.srv.driven1.aio.ResiliencyServiceDrivenClient.from_one_optional": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/resiliency-srv-driven2/apiview-properties.json b/packages/typespec-python/test/azure/generated/resiliency-srv-driven2/apiview-properties.json index f1c922a67a2..b327c81d639 100644 --- a/packages/typespec-python/test/azure/generated/resiliency-srv-driven2/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/resiliency-srv-driven2/apiview-properties.json @@ -2,8 +2,12 @@ "CrossLanguagePackageId": "Resiliency.ServiceDriven", "CrossLanguageDefinitionId": { "resiliency.srv.driven2.ResiliencyServiceDrivenClient.add_operation": "Resiliency.ServiceDriven.addOperation", + "resiliency.srv.driven2.aio.ResiliencyServiceDrivenClient.add_operation": "Resiliency.ServiceDriven.addOperation", "resiliency.srv.driven2.ResiliencyServiceDrivenClient.from_none": "Resiliency.ServiceDriven.AddOptionalParam.fromNone", + "resiliency.srv.driven2.aio.ResiliencyServiceDrivenClient.from_none": "Resiliency.ServiceDriven.AddOptionalParam.fromNone", "resiliency.srv.driven2.ResiliencyServiceDrivenClient.from_one_required": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired", - "resiliency.srv.driven2.ResiliencyServiceDrivenClient.from_one_optional": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional" + "resiliency.srv.driven2.aio.ResiliencyServiceDrivenClient.from_one_required": "Resiliency.ServiceDriven.AddOptionalParam.fromOneRequired", + "resiliency.srv.driven2.ResiliencyServiceDrivenClient.from_one_optional": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional", + "resiliency.srv.driven2.aio.ResiliencyServiceDrivenClient.from_one_optional": "Resiliency.ServiceDriven.AddOptionalParam.fromOneOptional" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/response-status-code-range/apiview-properties.json b/packages/typespec-python/test/azure/generated/response-status-code-range/apiview-properties.json index 11d2cc5f91d..fff5376cd93 100644 --- a/packages/typespec-python/test/azure/generated/response-status-code-range/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/response-status-code-range/apiview-properties.json @@ -6,6 +6,8 @@ "response.statuscoderange.models.NotFoundError": "Response.StatusCodeRange.NotFoundError", "response.statuscoderange.models.Standard4XXError": "Response.StatusCodeRange.Standard4XXError", "response.statuscoderange.StatusCodeRangeClient.error_response_status_code_in_range": "Response.StatusCodeRange.errorResponseStatusCodeInRange", - "response.statuscoderange.StatusCodeRangeClient.error_response_status_code404": "Response.StatusCodeRange.errorResponseStatusCode404" + "response.statuscoderange.aio.StatusCodeRangeClient.error_response_status_code_in_range": "Response.StatusCodeRange.errorResponseStatusCodeInRange", + "response.statuscoderange.StatusCodeRangeClient.error_response_status_code404": "Response.StatusCodeRange.errorResponseStatusCode404", + "response.statuscoderange.aio.StatusCodeRangeClient.error_response_status_code404": "Response.StatusCodeRange.errorResponseStatusCode404" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/routes/apiview-properties.json b/packages/typespec-python/test/azure/generated/routes/apiview-properties.json index 32f13db89fc..e1e658dfa26 100644 --- a/packages/typespec-python/test/azure/generated/routes/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/routes/apiview-properties.json @@ -1,13 +1,21 @@ { "CrossLanguagePackageId": "Routes", "CrossLanguageDefinitionId": { - "routes.RoutesClient.path_parameters.template_only": "Routes.PathParameters.templateOnly", - "routes.RoutesClient.path_parameters.explicit": "Routes.PathParameters.explicit", - "routes.RoutesClient.path_parameters.annotation_only": "Routes.PathParameters.annotationOnly", - "routes.RoutesClient.query_parameters.template_only": "Routes.QueryParameters.templateOnly", - "routes.RoutesClient.query_parameters.explicit": "Routes.QueryParameters.explicit", - "routes.RoutesClient.query_parameters.annotation_only": "Routes.QueryParameters.annotationOnly", - "routes.RoutesClient.in_interface.fixed": "Routes.InInterface.fixed", - "routes.RoutesClient.fixed": "Routes.fixed" + "routes.operations.PathParametersOperations.template_only": "Routes.PathParameters.templateOnly", + "routes.aio.operations.PathParametersOperations.template_only": "Routes.PathParameters.templateOnly", + "routes.operations.PathParametersOperations.explicit": "Routes.PathParameters.explicit", + "routes.aio.operations.PathParametersOperations.explicit": "Routes.PathParameters.explicit", + "routes.operations.PathParametersOperations.annotation_only": "Routes.PathParameters.annotationOnly", + "routes.aio.operations.PathParametersOperations.annotation_only": "Routes.PathParameters.annotationOnly", + "routes.operations.QueryParametersOperations.template_only": "Routes.QueryParameters.templateOnly", + "routes.aio.operations.QueryParametersOperations.template_only": "Routes.QueryParameters.templateOnly", + "routes.operations.QueryParametersOperations.explicit": "Routes.QueryParameters.explicit", + "routes.aio.operations.QueryParametersOperations.explicit": "Routes.QueryParameters.explicit", + "routes.operations.QueryParametersOperations.annotation_only": "Routes.QueryParameters.annotationOnly", + "routes.aio.operations.QueryParametersOperations.annotation_only": "Routes.QueryParameters.annotationOnly", + "routes.operations.InInterfaceOperations.fixed": "Routes.InInterface.fixed", + "routes.aio.operations.InInterfaceOperations.fixed": "Routes.InInterface.fixed", + "routes.RoutesClient.fixed": "Routes.fixed", + "routes.aio.RoutesClient.fixed": "Routes.fixed" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/apiview-properties.json b/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/apiview-properties.json index cd41bacf9ac..30079d3c14c 100644 --- a/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/apiview-properties.json @@ -2,7 +2,9 @@ "CrossLanguagePackageId": "Serialization.EncodedName.Json", "CrossLanguageDefinitionId": { "serialization.encodedname.json.models.JsonEncodedNameModel": "Serialization.EncodedName.Json.Property.JsonEncodedNameModel", - "serialization.encodedname.json.JsonClient.property.send": "Serialization.EncodedName.Json.Property.send", - "serialization.encodedname.json.JsonClient.property.get": "Serialization.EncodedName.Json.Property.get" + "serialization.encodedname.json.operations.PropertyOperations.send": "Serialization.EncodedName.Json.Property.send", + "serialization.encodedname.json.aio.operations.PropertyOperations.send": "Serialization.EncodedName.Json.Property.send", + "serialization.encodedname.json.operations.PropertyOperations.get": "Serialization.EncodedName.Json.Property.get", + "serialization.encodedname.json.aio.operations.PropertyOperations.get": "Serialization.EncodedName.Json.Property.get" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/server-endpoint-not-defined/apiview-properties.json b/packages/typespec-python/test/azure/generated/server-endpoint-not-defined/apiview-properties.json index 2468a28cca8..5eab62f922a 100644 --- a/packages/typespec-python/test/azure/generated/server-endpoint-not-defined/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/server-endpoint-not-defined/apiview-properties.json @@ -1,6 +1,7 @@ { "CrossLanguagePackageId": "Server.Endpoint.NotDefined", "CrossLanguageDefinitionId": { - "server.endpoint.notdefined.NotDefinedClient.valid": "Server.Endpoint.NotDefined.valid" + "server.endpoint.notdefined.NotDefinedClient.valid": "Server.Endpoint.NotDefined.valid", + "server.endpoint.notdefined.aio.NotDefinedClient.valid": "Server.Endpoint.NotDefined.valid" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/server-versions-not-versioned/apiview-properties.json b/packages/typespec-python/test/azure/generated/server-versions-not-versioned/apiview-properties.json index 3f608843d86..b78d7215ef9 100644 --- a/packages/typespec-python/test/azure/generated/server-versions-not-versioned/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/server-versions-not-versioned/apiview-properties.json @@ -2,7 +2,10 @@ "CrossLanguagePackageId": "Server.Versions.NotVersioned", "CrossLanguageDefinitionId": { "server.versions.notversioned.NotVersionedClient.without_api_version": "Server.Versions.NotVersioned.withoutApiVersion", + "server.versions.notversioned.aio.NotVersionedClient.without_api_version": "Server.Versions.NotVersioned.withoutApiVersion", "server.versions.notversioned.NotVersionedClient.with_query_api_version": "Server.Versions.NotVersioned.withQueryApiVersion", - "server.versions.notversioned.NotVersionedClient.with_path_api_version": "Server.Versions.NotVersioned.withPathApiVersion" + "server.versions.notversioned.aio.NotVersionedClient.with_query_api_version": "Server.Versions.NotVersioned.withQueryApiVersion", + "server.versions.notversioned.NotVersionedClient.with_path_api_version": "Server.Versions.NotVersioned.withPathApiVersion", + "server.versions.notversioned.aio.NotVersionedClient.with_path_api_version": "Server.Versions.NotVersioned.withPathApiVersion" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/server-versions-versioned/apiview-properties.json b/packages/typespec-python/test/azure/generated/server-versions-versioned/apiview-properties.json index 09662911fe6..5193d252fdc 100644 --- a/packages/typespec-python/test/azure/generated/server-versions-versioned/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/server-versions-versioned/apiview-properties.json @@ -2,8 +2,12 @@ "CrossLanguagePackageId": "Server.Versions.Versioned", "CrossLanguageDefinitionId": { "server.versions.versioned.VersionedClient.without_api_version": "Server.Versions.Versioned.withoutApiVersion", + "server.versions.versioned.aio.VersionedClient.without_api_version": "Server.Versions.Versioned.withoutApiVersion", "server.versions.versioned.VersionedClient.with_query_api_version": "Server.Versions.Versioned.withQueryApiVersion", + "server.versions.versioned.aio.VersionedClient.with_query_api_version": "Server.Versions.Versioned.withQueryApiVersion", "server.versions.versioned.VersionedClient.with_path_api_version": "Server.Versions.Versioned.withPathApiVersion", - "server.versions.versioned.VersionedClient.with_query_old_api_version": "Server.Versions.Versioned.withQueryOldApiVersion" + "server.versions.versioned.aio.VersionedClient.with_path_api_version": "Server.Versions.Versioned.withPathApiVersion", + "server.versions.versioned.VersionedClient.with_query_old_api_version": "Server.Versions.Versioned.withQueryOldApiVersion", + "server.versions.versioned.aio.VersionedClient.with_query_old_api_version": "Server.Versions.Versioned.withQueryOldApiVersion" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/special-headers-conditional-request/apiview-properties.json b/packages/typespec-python/test/azure/generated/special-headers-conditional-request/apiview-properties.json index ffed3116d71..b22b2cfb3ce 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-conditional-request/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/special-headers-conditional-request/apiview-properties.json @@ -2,8 +2,12 @@ "CrossLanguagePackageId": "SpecialHeaders.ConditionalRequest", "CrossLanguageDefinitionId": { "specialheaders.conditionalrequest.ConditionalRequestClient.post_if_match": "SpecialHeaders.ConditionalRequest.postIfMatch", + "specialheaders.conditionalrequest.aio.ConditionalRequestClient.post_if_match": "SpecialHeaders.ConditionalRequest.postIfMatch", "specialheaders.conditionalrequest.ConditionalRequestClient.post_if_none_match": "SpecialHeaders.ConditionalRequest.postIfNoneMatch", + "specialheaders.conditionalrequest.aio.ConditionalRequestClient.post_if_none_match": "SpecialHeaders.ConditionalRequest.postIfNoneMatch", "specialheaders.conditionalrequest.ConditionalRequestClient.head_if_modified_since": "SpecialHeaders.ConditionalRequest.headIfModifiedSince", - "specialheaders.conditionalrequest.ConditionalRequestClient.post_if_unmodified_since": "SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince" + "specialheaders.conditionalrequest.aio.ConditionalRequestClient.head_if_modified_since": "SpecialHeaders.ConditionalRequest.headIfModifiedSince", + "specialheaders.conditionalrequest.ConditionalRequestClient.post_if_unmodified_since": "SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince", + "specialheaders.conditionalrequest.aio.ConditionalRequestClient.post_if_unmodified_since": "SpecialHeaders.ConditionalRequest.postIfUnmodifiedSince" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/special-headers-repeatability/apiview-properties.json b/packages/typespec-python/test/azure/generated/special-headers-repeatability/apiview-properties.json index 7375b819443..f4e0cca46f5 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-repeatability/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/special-headers-repeatability/apiview-properties.json @@ -1,6 +1,7 @@ { "CrossLanguagePackageId": "SpecialHeaders.Repeatability", "CrossLanguageDefinitionId": { - "specialheaders.repeatability.RepeatabilityClient.immediate_success": "SpecialHeaders.Repeatability.immediateSuccess" + "specialheaders.repeatability.RepeatabilityClient.immediate_success": "SpecialHeaders.Repeatability.immediateSuccess", + "specialheaders.repeatability.aio.RepeatabilityClient.immediate_success": "SpecialHeaders.Repeatability.immediateSuccess" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/special-words/apiview-properties.json b/packages/typespec-python/test/azure/generated/special-words/apiview-properties.json index 0e31f4ac4f0..c723e608301 100644 --- a/packages/typespec-python/test/azure/generated/special-words/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/special-words/apiview-properties.json @@ -35,106 +35,207 @@ "specialwords.models.WhileModel": "SpecialWords.Models.while", "specialwords.models.WithModel": "SpecialWords.Models.with", "specialwords.models.YieldModel": "SpecialWords.Models.yield", - "specialwords.SpecialWordsClient.models.with_and": "SpecialWords.Models.withAnd", - "specialwords.SpecialWordsClient.models.with_as": "SpecialWords.Models.withAs", - "specialwords.SpecialWordsClient.models.with_assert": "SpecialWords.Models.withAssert", - "specialwords.SpecialWordsClient.models.with_async": "SpecialWords.Models.withAsync", - "specialwords.SpecialWordsClient.models.with_await": "SpecialWords.Models.withAwait", - "specialwords.SpecialWordsClient.models.with_break": "SpecialWords.Models.withBreak", - "specialwords.SpecialWordsClient.models.with_class": "SpecialWords.Models.withClass", - "specialwords.SpecialWordsClient.models.with_constructor": "SpecialWords.Models.withConstructor", - "specialwords.SpecialWordsClient.models.with_continue": "SpecialWords.Models.withContinue", - "specialwords.SpecialWordsClient.models.with_def": "SpecialWords.Models.withDef", - "specialwords.SpecialWordsClient.models.with_del": "SpecialWords.Models.withDel", - "specialwords.SpecialWordsClient.models.with_elif": "SpecialWords.Models.withElif", - "specialwords.SpecialWordsClient.models.with_else": "SpecialWords.Models.withElse", - "specialwords.SpecialWordsClient.models.with_except": "SpecialWords.Models.withExcept", - "specialwords.SpecialWordsClient.models.with_exec": "SpecialWords.Models.withExec", - "specialwords.SpecialWordsClient.models.with_finally": "SpecialWords.Models.withFinally", - "specialwords.SpecialWordsClient.models.with_for": "SpecialWords.Models.withFor", - "specialwords.SpecialWordsClient.models.with_from": "SpecialWords.Models.withFrom", - "specialwords.SpecialWordsClient.models.with_global": "SpecialWords.Models.withGlobal", - "specialwords.SpecialWordsClient.models.with_if": "SpecialWords.Models.withIf", - "specialwords.SpecialWordsClient.models.with_import": "SpecialWords.Models.withImport", - "specialwords.SpecialWordsClient.models.with_in": "SpecialWords.Models.withIn", - "specialwords.SpecialWordsClient.models.with_is": "SpecialWords.Models.withIs", - "specialwords.SpecialWordsClient.models.with_lambda": "SpecialWords.Models.withLambda", - "specialwords.SpecialWordsClient.models.with_not": "SpecialWords.Models.withNot", - "specialwords.SpecialWordsClient.models.with_or": "SpecialWords.Models.withOr", - "specialwords.SpecialWordsClient.models.with_pass": "SpecialWords.Models.withPass", - "specialwords.SpecialWordsClient.models.with_raise": "SpecialWords.Models.withRaise", - "specialwords.SpecialWordsClient.models.with_return": "SpecialWords.Models.withReturn", - "specialwords.SpecialWordsClient.models.with_try": "SpecialWords.Models.withTry", - "specialwords.SpecialWordsClient.models.with_while": "SpecialWords.Models.withWhile", - "specialwords.SpecialWordsClient.models.with_with": "SpecialWords.Models.withWith", - "specialwords.SpecialWordsClient.models.with_yield": "SpecialWords.Models.withYield", - "specialwords.SpecialWordsClient.model_properties.same_as_model": "SpecialWords.ModelProperties.sameAsModel", - "specialwords.SpecialWordsClient.operations.and_method": "SpecialWords.Operations.and", - "specialwords.SpecialWordsClient.operations.as_method": "SpecialWords.Operations.as", - "specialwords.SpecialWordsClient.operations.assert_method": "SpecialWords.Operations.assert", - "specialwords.SpecialWordsClient.operations.async_method": "SpecialWords.Operations.async", - "specialwords.SpecialWordsClient.operations.await_method": "SpecialWords.Operations.await", - "specialwords.SpecialWordsClient.operations.break_method": "SpecialWords.Operations.break", - "specialwords.SpecialWordsClient.operations.class_method": "SpecialWords.Operations.class", - "specialwords.SpecialWordsClient.operations.constructor": "SpecialWords.Operations.constructor", - "specialwords.SpecialWordsClient.operations.continue_method": "SpecialWords.Operations.continue", - "specialwords.SpecialWordsClient.operations.def_method": "SpecialWords.Operations.def", - "specialwords.SpecialWordsClient.operations.del_method": "SpecialWords.Operations.del", - "specialwords.SpecialWordsClient.operations.elif_method": "SpecialWords.Operations.elif", - "specialwords.SpecialWordsClient.operations.else_method": "SpecialWords.Operations.else", - "specialwords.SpecialWordsClient.operations.except_method": "SpecialWords.Operations.except", - "specialwords.SpecialWordsClient.operations.exec_method": "SpecialWords.Operations.exec", - "specialwords.SpecialWordsClient.operations.finally_method": "SpecialWords.Operations.finally", - "specialwords.SpecialWordsClient.operations.for_method": "SpecialWords.Operations.for", - "specialwords.SpecialWordsClient.operations.from_method": "SpecialWords.Operations.from", - "specialwords.SpecialWordsClient.operations.global_method": "SpecialWords.Operations.global", - "specialwords.SpecialWordsClient.operations.if_method": "SpecialWords.Operations.if", - "specialwords.SpecialWordsClient.operations.import_method": "SpecialWords.Operations.import", - "specialwords.SpecialWordsClient.operations.in_method": "SpecialWords.Operations.in", - "specialwords.SpecialWordsClient.operations.is_method": "SpecialWords.Operations.is", - "specialwords.SpecialWordsClient.operations.lambda_method": "SpecialWords.Operations.lambda", - "specialwords.SpecialWordsClient.operations.not_method": "SpecialWords.Operations.not", - "specialwords.SpecialWordsClient.operations.or_method": "SpecialWords.Operations.or", - "specialwords.SpecialWordsClient.operations.pass_method": "SpecialWords.Operations.pass", - "specialwords.SpecialWordsClient.operations.raise_method": "SpecialWords.Operations.raise", - "specialwords.SpecialWordsClient.operations.return_method": "SpecialWords.Operations.return", - "specialwords.SpecialWordsClient.operations.try_method": "SpecialWords.Operations.try", - "specialwords.SpecialWordsClient.operations.while_method": "SpecialWords.Operations.while", - "specialwords.SpecialWordsClient.operations.with_method": "SpecialWords.Operations.with", - "specialwords.SpecialWordsClient.operations.yield_method": "SpecialWords.Operations.yield", - "specialwords.SpecialWordsClient.parameters.with_and": "SpecialWords.Parameters.withAnd", - "specialwords.SpecialWordsClient.parameters.with_as": "SpecialWords.Parameters.withAs", - "specialwords.SpecialWordsClient.parameters.with_assert": "SpecialWords.Parameters.withAssert", - "specialwords.SpecialWordsClient.parameters.with_async": "SpecialWords.Parameters.withAsync", - "specialwords.SpecialWordsClient.parameters.with_await": "SpecialWords.Parameters.withAwait", - "specialwords.SpecialWordsClient.parameters.with_break": "SpecialWords.Parameters.withBreak", - "specialwords.SpecialWordsClient.parameters.with_class": "SpecialWords.Parameters.withClass", - "specialwords.SpecialWordsClient.parameters.with_constructor": "SpecialWords.Parameters.withConstructor", - "specialwords.SpecialWordsClient.parameters.with_continue": "SpecialWords.Parameters.withContinue", - "specialwords.SpecialWordsClient.parameters.with_def": "SpecialWords.Parameters.withDef", - "specialwords.SpecialWordsClient.parameters.with_del": "SpecialWords.Parameters.withDel", - "specialwords.SpecialWordsClient.parameters.with_elif": "SpecialWords.Parameters.withElif", - "specialwords.SpecialWordsClient.parameters.with_else": "SpecialWords.Parameters.withElse", - "specialwords.SpecialWordsClient.parameters.with_except": "SpecialWords.Parameters.withExcept", - "specialwords.SpecialWordsClient.parameters.with_exec": "SpecialWords.Parameters.withExec", - "specialwords.SpecialWordsClient.parameters.with_finally": "SpecialWords.Parameters.withFinally", - "specialwords.SpecialWordsClient.parameters.with_for": "SpecialWords.Parameters.withFor", - "specialwords.SpecialWordsClient.parameters.with_from": "SpecialWords.Parameters.withFrom", - "specialwords.SpecialWordsClient.parameters.with_global": "SpecialWords.Parameters.withGlobal", - "specialwords.SpecialWordsClient.parameters.with_if": "SpecialWords.Parameters.withIf", - "specialwords.SpecialWordsClient.parameters.with_import": "SpecialWords.Parameters.withImport", - "specialwords.SpecialWordsClient.parameters.with_in": "SpecialWords.Parameters.withIn", - "specialwords.SpecialWordsClient.parameters.with_is": "SpecialWords.Parameters.withIs", - "specialwords.SpecialWordsClient.parameters.with_lambda": "SpecialWords.Parameters.withLambda", - "specialwords.SpecialWordsClient.parameters.with_not": "SpecialWords.Parameters.withNot", - "specialwords.SpecialWordsClient.parameters.with_or": "SpecialWords.Parameters.withOr", - "specialwords.SpecialWordsClient.parameters.with_pass": "SpecialWords.Parameters.withPass", - "specialwords.SpecialWordsClient.parameters.with_raise": "SpecialWords.Parameters.withRaise", - "specialwords.SpecialWordsClient.parameters.with_return": "SpecialWords.Parameters.withReturn", - "specialwords.SpecialWordsClient.parameters.with_try": "SpecialWords.Parameters.withTry", - "specialwords.SpecialWordsClient.parameters.with_while": "SpecialWords.Parameters.withWhile", - "specialwords.SpecialWordsClient.parameters.with_with": "SpecialWords.Parameters.withWith", - "specialwords.SpecialWordsClient.parameters.with_yield": "SpecialWords.Parameters.withYield", - "specialwords.SpecialWordsClient.parameters.with_cancellation_token": "SpecialWords.Parameters.withCancellationToken" + "specialwords.operations.ModelsOperations.with_and": "SpecialWords.Models.withAnd", + "specialwords.aio.operations.ModelsOperations.with_and": "SpecialWords.Models.withAnd", + "specialwords.operations.ModelsOperations.with_as": "SpecialWords.Models.withAs", + "specialwords.aio.operations.ModelsOperations.with_as": "SpecialWords.Models.withAs", + "specialwords.operations.ModelsOperations.with_assert": "SpecialWords.Models.withAssert", + "specialwords.aio.operations.ModelsOperations.with_assert": "SpecialWords.Models.withAssert", + "specialwords.operations.ModelsOperations.with_async": "SpecialWords.Models.withAsync", + "specialwords.aio.operations.ModelsOperations.with_async": "SpecialWords.Models.withAsync", + "specialwords.operations.ModelsOperations.with_await": "SpecialWords.Models.withAwait", + "specialwords.aio.operations.ModelsOperations.with_await": "SpecialWords.Models.withAwait", + "specialwords.operations.ModelsOperations.with_break": "SpecialWords.Models.withBreak", + "specialwords.aio.operations.ModelsOperations.with_break": "SpecialWords.Models.withBreak", + "specialwords.operations.ModelsOperations.with_class": "SpecialWords.Models.withClass", + "specialwords.aio.operations.ModelsOperations.with_class": "SpecialWords.Models.withClass", + "specialwords.operations.ModelsOperations.with_constructor": "SpecialWords.Models.withConstructor", + "specialwords.aio.operations.ModelsOperations.with_constructor": "SpecialWords.Models.withConstructor", + "specialwords.operations.ModelsOperations.with_continue": "SpecialWords.Models.withContinue", + "specialwords.aio.operations.ModelsOperations.with_continue": "SpecialWords.Models.withContinue", + "specialwords.operations.ModelsOperations.with_def": "SpecialWords.Models.withDef", + "specialwords.aio.operations.ModelsOperations.with_def": "SpecialWords.Models.withDef", + "specialwords.operations.ModelsOperations.with_del": "SpecialWords.Models.withDel", + "specialwords.aio.operations.ModelsOperations.with_del": "SpecialWords.Models.withDel", + "specialwords.operations.ModelsOperations.with_elif": "SpecialWords.Models.withElif", + "specialwords.aio.operations.ModelsOperations.with_elif": "SpecialWords.Models.withElif", + "specialwords.operations.ModelsOperations.with_else": "SpecialWords.Models.withElse", + "specialwords.aio.operations.ModelsOperations.with_else": "SpecialWords.Models.withElse", + "specialwords.operations.ModelsOperations.with_except": "SpecialWords.Models.withExcept", + "specialwords.aio.operations.ModelsOperations.with_except": "SpecialWords.Models.withExcept", + "specialwords.operations.ModelsOperations.with_exec": "SpecialWords.Models.withExec", + "specialwords.aio.operations.ModelsOperations.with_exec": "SpecialWords.Models.withExec", + "specialwords.operations.ModelsOperations.with_finally": "SpecialWords.Models.withFinally", + "specialwords.aio.operations.ModelsOperations.with_finally": "SpecialWords.Models.withFinally", + "specialwords.operations.ModelsOperations.with_for": "SpecialWords.Models.withFor", + "specialwords.aio.operations.ModelsOperations.with_for": "SpecialWords.Models.withFor", + "specialwords.operations.ModelsOperations.with_from": "SpecialWords.Models.withFrom", + "specialwords.aio.operations.ModelsOperations.with_from": "SpecialWords.Models.withFrom", + "specialwords.operations.ModelsOperations.with_global": "SpecialWords.Models.withGlobal", + "specialwords.aio.operations.ModelsOperations.with_global": "SpecialWords.Models.withGlobal", + "specialwords.operations.ModelsOperations.with_if": "SpecialWords.Models.withIf", + "specialwords.aio.operations.ModelsOperations.with_if": "SpecialWords.Models.withIf", + "specialwords.operations.ModelsOperations.with_import": "SpecialWords.Models.withImport", + "specialwords.aio.operations.ModelsOperations.with_import": "SpecialWords.Models.withImport", + "specialwords.operations.ModelsOperations.with_in": "SpecialWords.Models.withIn", + "specialwords.aio.operations.ModelsOperations.with_in": "SpecialWords.Models.withIn", + "specialwords.operations.ModelsOperations.with_is": "SpecialWords.Models.withIs", + "specialwords.aio.operations.ModelsOperations.with_is": "SpecialWords.Models.withIs", + "specialwords.operations.ModelsOperations.with_lambda": "SpecialWords.Models.withLambda", + "specialwords.aio.operations.ModelsOperations.with_lambda": "SpecialWords.Models.withLambda", + "specialwords.operations.ModelsOperations.with_not": "SpecialWords.Models.withNot", + "specialwords.aio.operations.ModelsOperations.with_not": "SpecialWords.Models.withNot", + "specialwords.operations.ModelsOperations.with_or": "SpecialWords.Models.withOr", + "specialwords.aio.operations.ModelsOperations.with_or": "SpecialWords.Models.withOr", + "specialwords.operations.ModelsOperations.with_pass": "SpecialWords.Models.withPass", + "specialwords.aio.operations.ModelsOperations.with_pass": "SpecialWords.Models.withPass", + "specialwords.operations.ModelsOperations.with_raise": "SpecialWords.Models.withRaise", + "specialwords.aio.operations.ModelsOperations.with_raise": "SpecialWords.Models.withRaise", + "specialwords.operations.ModelsOperations.with_return": "SpecialWords.Models.withReturn", + "specialwords.aio.operations.ModelsOperations.with_return": "SpecialWords.Models.withReturn", + "specialwords.operations.ModelsOperations.with_try": "SpecialWords.Models.withTry", + "specialwords.aio.operations.ModelsOperations.with_try": "SpecialWords.Models.withTry", + "specialwords.operations.ModelsOperations.with_while": "SpecialWords.Models.withWhile", + "specialwords.aio.operations.ModelsOperations.with_while": "SpecialWords.Models.withWhile", + "specialwords.operations.ModelsOperations.with_with": "SpecialWords.Models.withWith", + "specialwords.aio.operations.ModelsOperations.with_with": "SpecialWords.Models.withWith", + "specialwords.operations.ModelsOperations.with_yield": "SpecialWords.Models.withYield", + "specialwords.aio.operations.ModelsOperations.with_yield": "SpecialWords.Models.withYield", + "specialwords.operations.ModelPropertiesOperations.same_as_model": "SpecialWords.ModelProperties.sameAsModel", + "specialwords.aio.operations.ModelPropertiesOperations.same_as_model": "SpecialWords.ModelProperties.sameAsModel", + "specialwords.operations.Operations.and_method": "SpecialWords.Operations.and", + "specialwords.aio.operations.Operations.and_method": "SpecialWords.Operations.and", + "specialwords.operations.Operations.as_method": "SpecialWords.Operations.as", + "specialwords.aio.operations.Operations.as_method": "SpecialWords.Operations.as", + "specialwords.operations.Operations.assert_method": "SpecialWords.Operations.assert", + "specialwords.aio.operations.Operations.assert_method": "SpecialWords.Operations.assert", + "specialwords.operations.Operations.async_method": "SpecialWords.Operations.async", + "specialwords.aio.operations.Operations.async_method": "SpecialWords.Operations.async", + "specialwords.operations.Operations.await_method": "SpecialWords.Operations.await", + "specialwords.aio.operations.Operations.await_method": "SpecialWords.Operations.await", + "specialwords.operations.Operations.break_method": "SpecialWords.Operations.break", + "specialwords.aio.operations.Operations.break_method": "SpecialWords.Operations.break", + "specialwords.operations.Operations.class_method": "SpecialWords.Operations.class", + "specialwords.aio.operations.Operations.class_method": "SpecialWords.Operations.class", + "specialwords.operations.Operations.constructor": "SpecialWords.Operations.constructor", + "specialwords.aio.operations.Operations.constructor": "SpecialWords.Operations.constructor", + "specialwords.operations.Operations.continue_method": "SpecialWords.Operations.continue", + "specialwords.aio.operations.Operations.continue_method": "SpecialWords.Operations.continue", + "specialwords.operations.Operations.def_method": "SpecialWords.Operations.def", + "specialwords.aio.operations.Operations.def_method": "SpecialWords.Operations.def", + "specialwords.operations.Operations.del_method": "SpecialWords.Operations.del", + "specialwords.aio.operations.Operations.del_method": "SpecialWords.Operations.del", + "specialwords.operations.Operations.elif_method": "SpecialWords.Operations.elif", + "specialwords.aio.operations.Operations.elif_method": "SpecialWords.Operations.elif", + "specialwords.operations.Operations.else_method": "SpecialWords.Operations.else", + "specialwords.aio.operations.Operations.else_method": "SpecialWords.Operations.else", + "specialwords.operations.Operations.except_method": "SpecialWords.Operations.except", + "specialwords.aio.operations.Operations.except_method": "SpecialWords.Operations.except", + "specialwords.operations.Operations.exec_method": "SpecialWords.Operations.exec", + "specialwords.aio.operations.Operations.exec_method": "SpecialWords.Operations.exec", + "specialwords.operations.Operations.finally_method": "SpecialWords.Operations.finally", + "specialwords.aio.operations.Operations.finally_method": "SpecialWords.Operations.finally", + "specialwords.operations.Operations.for_method": "SpecialWords.Operations.for", + "specialwords.aio.operations.Operations.for_method": "SpecialWords.Operations.for", + "specialwords.operations.Operations.from_method": "SpecialWords.Operations.from", + "specialwords.aio.operations.Operations.from_method": "SpecialWords.Operations.from", + "specialwords.operations.Operations.global_method": "SpecialWords.Operations.global", + "specialwords.aio.operations.Operations.global_method": "SpecialWords.Operations.global", + "specialwords.operations.Operations.if_method": "SpecialWords.Operations.if", + "specialwords.aio.operations.Operations.if_method": "SpecialWords.Operations.if", + "specialwords.operations.Operations.import_method": "SpecialWords.Operations.import", + "specialwords.aio.operations.Operations.import_method": "SpecialWords.Operations.import", + "specialwords.operations.Operations.in_method": "SpecialWords.Operations.in", + "specialwords.aio.operations.Operations.in_method": "SpecialWords.Operations.in", + "specialwords.operations.Operations.is_method": "SpecialWords.Operations.is", + "specialwords.aio.operations.Operations.is_method": "SpecialWords.Operations.is", + "specialwords.operations.Operations.lambda_method": "SpecialWords.Operations.lambda", + "specialwords.aio.operations.Operations.lambda_method": "SpecialWords.Operations.lambda", + "specialwords.operations.Operations.not_method": "SpecialWords.Operations.not", + "specialwords.aio.operations.Operations.not_method": "SpecialWords.Operations.not", + "specialwords.operations.Operations.or_method": "SpecialWords.Operations.or", + "specialwords.aio.operations.Operations.or_method": "SpecialWords.Operations.or", + "specialwords.operations.Operations.pass_method": "SpecialWords.Operations.pass", + "specialwords.aio.operations.Operations.pass_method": "SpecialWords.Operations.pass", + "specialwords.operations.Operations.raise_method": "SpecialWords.Operations.raise", + "specialwords.aio.operations.Operations.raise_method": "SpecialWords.Operations.raise", + "specialwords.operations.Operations.return_method": "SpecialWords.Operations.return", + "specialwords.aio.operations.Operations.return_method": "SpecialWords.Operations.return", + "specialwords.operations.Operations.try_method": "SpecialWords.Operations.try", + "specialwords.aio.operations.Operations.try_method": "SpecialWords.Operations.try", + "specialwords.operations.Operations.while_method": "SpecialWords.Operations.while", + "specialwords.aio.operations.Operations.while_method": "SpecialWords.Operations.while", + "specialwords.operations.Operations.with_method": "SpecialWords.Operations.with", + "specialwords.aio.operations.Operations.with_method": "SpecialWords.Operations.with", + "specialwords.operations.Operations.yield_method": "SpecialWords.Operations.yield", + "specialwords.aio.operations.Operations.yield_method": "SpecialWords.Operations.yield", + "specialwords.operations.ParametersOperations.with_and": "SpecialWords.Parameters.withAnd", + "specialwords.aio.operations.ParametersOperations.with_and": "SpecialWords.Parameters.withAnd", + "specialwords.operations.ParametersOperations.with_as": "SpecialWords.Parameters.withAs", + "specialwords.aio.operations.ParametersOperations.with_as": "SpecialWords.Parameters.withAs", + "specialwords.operations.ParametersOperations.with_assert": "SpecialWords.Parameters.withAssert", + "specialwords.aio.operations.ParametersOperations.with_assert": "SpecialWords.Parameters.withAssert", + "specialwords.operations.ParametersOperations.with_async": "SpecialWords.Parameters.withAsync", + "specialwords.aio.operations.ParametersOperations.with_async": "SpecialWords.Parameters.withAsync", + "specialwords.operations.ParametersOperations.with_await": "SpecialWords.Parameters.withAwait", + "specialwords.aio.operations.ParametersOperations.with_await": "SpecialWords.Parameters.withAwait", + "specialwords.operations.ParametersOperations.with_break": "SpecialWords.Parameters.withBreak", + "specialwords.aio.operations.ParametersOperations.with_break": "SpecialWords.Parameters.withBreak", + "specialwords.operations.ParametersOperations.with_class": "SpecialWords.Parameters.withClass", + "specialwords.aio.operations.ParametersOperations.with_class": "SpecialWords.Parameters.withClass", + "specialwords.operations.ParametersOperations.with_constructor": "SpecialWords.Parameters.withConstructor", + "specialwords.aio.operations.ParametersOperations.with_constructor": "SpecialWords.Parameters.withConstructor", + "specialwords.operations.ParametersOperations.with_continue": "SpecialWords.Parameters.withContinue", + "specialwords.aio.operations.ParametersOperations.with_continue": "SpecialWords.Parameters.withContinue", + "specialwords.operations.ParametersOperations.with_def": "SpecialWords.Parameters.withDef", + "specialwords.aio.operations.ParametersOperations.with_def": "SpecialWords.Parameters.withDef", + "specialwords.operations.ParametersOperations.with_del": "SpecialWords.Parameters.withDel", + "specialwords.aio.operations.ParametersOperations.with_del": "SpecialWords.Parameters.withDel", + "specialwords.operations.ParametersOperations.with_elif": "SpecialWords.Parameters.withElif", + "specialwords.aio.operations.ParametersOperations.with_elif": "SpecialWords.Parameters.withElif", + "specialwords.operations.ParametersOperations.with_else": "SpecialWords.Parameters.withElse", + "specialwords.aio.operations.ParametersOperations.with_else": "SpecialWords.Parameters.withElse", + "specialwords.operations.ParametersOperations.with_except": "SpecialWords.Parameters.withExcept", + "specialwords.aio.operations.ParametersOperations.with_except": "SpecialWords.Parameters.withExcept", + "specialwords.operations.ParametersOperations.with_exec": "SpecialWords.Parameters.withExec", + "specialwords.aio.operations.ParametersOperations.with_exec": "SpecialWords.Parameters.withExec", + "specialwords.operations.ParametersOperations.with_finally": "SpecialWords.Parameters.withFinally", + "specialwords.aio.operations.ParametersOperations.with_finally": "SpecialWords.Parameters.withFinally", + "specialwords.operations.ParametersOperations.with_for": "SpecialWords.Parameters.withFor", + "specialwords.aio.operations.ParametersOperations.with_for": "SpecialWords.Parameters.withFor", + "specialwords.operations.ParametersOperations.with_from": "SpecialWords.Parameters.withFrom", + "specialwords.aio.operations.ParametersOperations.with_from": "SpecialWords.Parameters.withFrom", + "specialwords.operations.ParametersOperations.with_global": "SpecialWords.Parameters.withGlobal", + "specialwords.aio.operations.ParametersOperations.with_global": "SpecialWords.Parameters.withGlobal", + "specialwords.operations.ParametersOperations.with_if": "SpecialWords.Parameters.withIf", + "specialwords.aio.operations.ParametersOperations.with_if": "SpecialWords.Parameters.withIf", + "specialwords.operations.ParametersOperations.with_import": "SpecialWords.Parameters.withImport", + "specialwords.aio.operations.ParametersOperations.with_import": "SpecialWords.Parameters.withImport", + "specialwords.operations.ParametersOperations.with_in": "SpecialWords.Parameters.withIn", + "specialwords.aio.operations.ParametersOperations.with_in": "SpecialWords.Parameters.withIn", + "specialwords.operations.ParametersOperations.with_is": "SpecialWords.Parameters.withIs", + "specialwords.aio.operations.ParametersOperations.with_is": "SpecialWords.Parameters.withIs", + "specialwords.operations.ParametersOperations.with_lambda": "SpecialWords.Parameters.withLambda", + "specialwords.aio.operations.ParametersOperations.with_lambda": "SpecialWords.Parameters.withLambda", + "specialwords.operations.ParametersOperations.with_not": "SpecialWords.Parameters.withNot", + "specialwords.aio.operations.ParametersOperations.with_not": "SpecialWords.Parameters.withNot", + "specialwords.operations.ParametersOperations.with_or": "SpecialWords.Parameters.withOr", + "specialwords.aio.operations.ParametersOperations.with_or": "SpecialWords.Parameters.withOr", + "specialwords.operations.ParametersOperations.with_pass": "SpecialWords.Parameters.withPass", + "specialwords.aio.operations.ParametersOperations.with_pass": "SpecialWords.Parameters.withPass", + "specialwords.operations.ParametersOperations.with_raise": "SpecialWords.Parameters.withRaise", + "specialwords.aio.operations.ParametersOperations.with_raise": "SpecialWords.Parameters.withRaise", + "specialwords.operations.ParametersOperations.with_return": "SpecialWords.Parameters.withReturn", + "specialwords.aio.operations.ParametersOperations.with_return": "SpecialWords.Parameters.withReturn", + "specialwords.operations.ParametersOperations.with_try": "SpecialWords.Parameters.withTry", + "specialwords.aio.operations.ParametersOperations.with_try": "SpecialWords.Parameters.withTry", + "specialwords.operations.ParametersOperations.with_while": "SpecialWords.Parameters.withWhile", + "specialwords.aio.operations.ParametersOperations.with_while": "SpecialWords.Parameters.withWhile", + "specialwords.operations.ParametersOperations.with_with": "SpecialWords.Parameters.withWith", + "specialwords.aio.operations.ParametersOperations.with_with": "SpecialWords.Parameters.withWith", + "specialwords.operations.ParametersOperations.with_yield": "SpecialWords.Parameters.withYield", + "specialwords.aio.operations.ParametersOperations.with_yield": "SpecialWords.Parameters.withYield", + "specialwords.operations.ParametersOperations.with_cancellation_token": "SpecialWords.Parameters.withCancellationToken", + "specialwords.aio.operations.ParametersOperations.with_cancellation_token": "SpecialWords.Parameters.withCancellationToken" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/streaming-jsonl/apiview-properties.json b/packages/typespec-python/test/azure/generated/streaming-jsonl/apiview-properties.json index f9c7a57ae46..2d9ab18ed5d 100644 --- a/packages/typespec-python/test/azure/generated/streaming-jsonl/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/streaming-jsonl/apiview-properties.json @@ -1,7 +1,9 @@ { "CrossLanguagePackageId": "Streaming.Jsonl", "CrossLanguageDefinitionId": { - "streaming.jsonl.JsonlClient.basic.send": "Streaming.Jsonl.Basic.send", - "streaming.jsonl.JsonlClient.basic.receive": "Streaming.Jsonl.Basic.receive" + "streaming.jsonl.operations.BasicOperations.send": "Streaming.Jsonl.Basic.send", + "streaming.jsonl.aio.operations.BasicOperations.send": "Streaming.Jsonl.Basic.send", + "streaming.jsonl.operations.BasicOperations.receive": "Streaming.Jsonl.Basic.receive", + "streaming.jsonl.aio.operations.BasicOperations.receive": "Streaming.Jsonl.Basic.receive" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-array/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-array/apiview-properties.json index 38aad93393e..55c1107ba63 100644 --- a/packages/typespec-python/test/azure/generated/typetest-array/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-array/apiview-properties.json @@ -2,33 +2,61 @@ "CrossLanguagePackageId": "Type.Array", "CrossLanguageDefinitionId": { "typetest.array.models.InnerModel": "Type.Array.InnerModel", - "typetest.array.ArrayClient.int32_value.get": "Type.Array.Int32Value.get", - "typetest.array.ArrayClient.int32_value.put": "Type.Array.Int32Value.put", - "typetest.array.ArrayClient.int64_value.get": "Type.Array.Int64Value.get", - "typetest.array.ArrayClient.int64_value.put": "Type.Array.Int64Value.put", - "typetest.array.ArrayClient.boolean_value.get": "Type.Array.BooleanValue.get", - "typetest.array.ArrayClient.boolean_value.put": "Type.Array.BooleanValue.put", - "typetest.array.ArrayClient.string_value.get": "Type.Array.StringValue.get", - "typetest.array.ArrayClient.string_value.put": "Type.Array.StringValue.put", - "typetest.array.ArrayClient.float32_value.get": "Type.Array.Float32Value.get", - "typetest.array.ArrayClient.float32_value.put": "Type.Array.Float32Value.put", - "typetest.array.ArrayClient.datetime_value.get": "Type.Array.DatetimeValue.get", - "typetest.array.ArrayClient.datetime_value.put": "Type.Array.DatetimeValue.put", - "typetest.array.ArrayClient.duration_value.get": "Type.Array.DurationValue.get", - "typetest.array.ArrayClient.duration_value.put": "Type.Array.DurationValue.put", - "typetest.array.ArrayClient.unknown_value.get": "Type.Array.UnknownValue.get", - "typetest.array.ArrayClient.unknown_value.put": "Type.Array.UnknownValue.put", - "typetest.array.ArrayClient.model_value.get": "Type.Array.ModelValue.get", - "typetest.array.ArrayClient.model_value.put": "Type.Array.ModelValue.put", - "typetest.array.ArrayClient.nullable_float_value.get": "Type.Array.NullableFloatValue.get", - "typetest.array.ArrayClient.nullable_float_value.put": "Type.Array.NullableFloatValue.put", - "typetest.array.ArrayClient.nullable_int32_value.get": "Type.Array.NullableInt32Value.get", - "typetest.array.ArrayClient.nullable_int32_value.put": "Type.Array.NullableInt32Value.put", - "typetest.array.ArrayClient.nullable_boolean_value.get": "Type.Array.NullableBooleanValue.get", - "typetest.array.ArrayClient.nullable_boolean_value.put": "Type.Array.NullableBooleanValue.put", - "typetest.array.ArrayClient.nullable_string_value.get": "Type.Array.NullableStringValue.get", - "typetest.array.ArrayClient.nullable_string_value.put": "Type.Array.NullableStringValue.put", - "typetest.array.ArrayClient.nullable_model_value.get": "Type.Array.NullableModelValue.get", - "typetest.array.ArrayClient.nullable_model_value.put": "Type.Array.NullableModelValue.put" + "typetest.array.operations.Int32ValueOperations.get": "Type.Array.Int32Value.get", + "typetest.array.aio.operations.Int32ValueOperations.get": "Type.Array.Int32Value.get", + "typetest.array.operations.Int32ValueOperations.put": "Type.Array.Int32Value.put", + "typetest.array.aio.operations.Int32ValueOperations.put": "Type.Array.Int32Value.put", + "typetest.array.operations.Int64ValueOperations.get": "Type.Array.Int64Value.get", + "typetest.array.aio.operations.Int64ValueOperations.get": "Type.Array.Int64Value.get", + "typetest.array.operations.Int64ValueOperations.put": "Type.Array.Int64Value.put", + "typetest.array.aio.operations.Int64ValueOperations.put": "Type.Array.Int64Value.put", + "typetest.array.operations.BooleanValueOperations.get": "Type.Array.BooleanValue.get", + "typetest.array.aio.operations.BooleanValueOperations.get": "Type.Array.BooleanValue.get", + "typetest.array.operations.BooleanValueOperations.put": "Type.Array.BooleanValue.put", + "typetest.array.aio.operations.BooleanValueOperations.put": "Type.Array.BooleanValue.put", + "typetest.array.operations.StringValueOperations.get": "Type.Array.StringValue.get", + "typetest.array.aio.operations.StringValueOperations.get": "Type.Array.StringValue.get", + "typetest.array.operations.StringValueOperations.put": "Type.Array.StringValue.put", + "typetest.array.aio.operations.StringValueOperations.put": "Type.Array.StringValue.put", + "typetest.array.operations.Float32ValueOperations.get": "Type.Array.Float32Value.get", + "typetest.array.aio.operations.Float32ValueOperations.get": "Type.Array.Float32Value.get", + "typetest.array.operations.Float32ValueOperations.put": "Type.Array.Float32Value.put", + "typetest.array.aio.operations.Float32ValueOperations.put": "Type.Array.Float32Value.put", + "typetest.array.operations.DatetimeValueOperations.get": "Type.Array.DatetimeValue.get", + "typetest.array.aio.operations.DatetimeValueOperations.get": "Type.Array.DatetimeValue.get", + "typetest.array.operations.DatetimeValueOperations.put": "Type.Array.DatetimeValue.put", + "typetest.array.aio.operations.DatetimeValueOperations.put": "Type.Array.DatetimeValue.put", + "typetest.array.operations.DurationValueOperations.get": "Type.Array.DurationValue.get", + "typetest.array.aio.operations.DurationValueOperations.get": "Type.Array.DurationValue.get", + "typetest.array.operations.DurationValueOperations.put": "Type.Array.DurationValue.put", + "typetest.array.aio.operations.DurationValueOperations.put": "Type.Array.DurationValue.put", + "typetest.array.operations.UnknownValueOperations.get": "Type.Array.UnknownValue.get", + "typetest.array.aio.operations.UnknownValueOperations.get": "Type.Array.UnknownValue.get", + "typetest.array.operations.UnknownValueOperations.put": "Type.Array.UnknownValue.put", + "typetest.array.aio.operations.UnknownValueOperations.put": "Type.Array.UnknownValue.put", + "typetest.array.operations.ModelValueOperations.get": "Type.Array.ModelValue.get", + "typetest.array.aio.operations.ModelValueOperations.get": "Type.Array.ModelValue.get", + "typetest.array.operations.ModelValueOperations.put": "Type.Array.ModelValue.put", + "typetest.array.aio.operations.ModelValueOperations.put": "Type.Array.ModelValue.put", + "typetest.array.operations.NullableFloatValueOperations.get": "Type.Array.NullableFloatValue.get", + "typetest.array.aio.operations.NullableFloatValueOperations.get": "Type.Array.NullableFloatValue.get", + "typetest.array.operations.NullableFloatValueOperations.put": "Type.Array.NullableFloatValue.put", + "typetest.array.aio.operations.NullableFloatValueOperations.put": "Type.Array.NullableFloatValue.put", + "typetest.array.operations.NullableInt32ValueOperations.get": "Type.Array.NullableInt32Value.get", + "typetest.array.aio.operations.NullableInt32ValueOperations.get": "Type.Array.NullableInt32Value.get", + "typetest.array.operations.NullableInt32ValueOperations.put": "Type.Array.NullableInt32Value.put", + "typetest.array.aio.operations.NullableInt32ValueOperations.put": "Type.Array.NullableInt32Value.put", + "typetest.array.operations.NullableBooleanValueOperations.get": "Type.Array.NullableBooleanValue.get", + "typetest.array.aio.operations.NullableBooleanValueOperations.get": "Type.Array.NullableBooleanValue.get", + "typetest.array.operations.NullableBooleanValueOperations.put": "Type.Array.NullableBooleanValue.put", + "typetest.array.aio.operations.NullableBooleanValueOperations.put": "Type.Array.NullableBooleanValue.put", + "typetest.array.operations.NullableStringValueOperations.get": "Type.Array.NullableStringValue.get", + "typetest.array.aio.operations.NullableStringValueOperations.get": "Type.Array.NullableStringValue.get", + "typetest.array.operations.NullableStringValueOperations.put": "Type.Array.NullableStringValue.put", + "typetest.array.aio.operations.NullableStringValueOperations.put": "Type.Array.NullableStringValue.put", + "typetest.array.operations.NullableModelValueOperations.get": "Type.Array.NullableModelValue.get", + "typetest.array.aio.operations.NullableModelValueOperations.get": "Type.Array.NullableModelValue.get", + "typetest.array.operations.NullableModelValueOperations.put": "Type.Array.NullableModelValue.put", + "typetest.array.aio.operations.NullableModelValueOperations.put": "Type.Array.NullableModelValue.put" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-dictionary/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-dictionary/apiview-properties.json index c0bc8d9fec4..4ea465f4f09 100644 --- a/packages/typespec-python/test/azure/generated/typetest-dictionary/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-dictionary/apiview-properties.json @@ -2,27 +2,49 @@ "CrossLanguagePackageId": "Type.Dictionary", "CrossLanguageDefinitionId": { "typetest.dictionary.models.InnerModel": "Type.Dictionary.InnerModel", - "typetest.dictionary.DictionaryClient.int32_value.get": "Type.Dictionary.Int32Value.get", - "typetest.dictionary.DictionaryClient.int32_value.put": "Type.Dictionary.Int32Value.put", - "typetest.dictionary.DictionaryClient.int64_value.get": "Type.Dictionary.Int64Value.get", - "typetest.dictionary.DictionaryClient.int64_value.put": "Type.Dictionary.Int64Value.put", - "typetest.dictionary.DictionaryClient.boolean_value.get": "Type.Dictionary.BooleanValue.get", - "typetest.dictionary.DictionaryClient.boolean_value.put": "Type.Dictionary.BooleanValue.put", - "typetest.dictionary.DictionaryClient.string_value.get": "Type.Dictionary.StringValue.get", - "typetest.dictionary.DictionaryClient.string_value.put": "Type.Dictionary.StringValue.put", - "typetest.dictionary.DictionaryClient.float32_value.get": "Type.Dictionary.Float32Value.get", - "typetest.dictionary.DictionaryClient.float32_value.put": "Type.Dictionary.Float32Value.put", - "typetest.dictionary.DictionaryClient.datetime_value.get": "Type.Dictionary.DatetimeValue.get", - "typetest.dictionary.DictionaryClient.datetime_value.put": "Type.Dictionary.DatetimeValue.put", - "typetest.dictionary.DictionaryClient.duration_value.get": "Type.Dictionary.DurationValue.get", - "typetest.dictionary.DictionaryClient.duration_value.put": "Type.Dictionary.DurationValue.put", - "typetest.dictionary.DictionaryClient.unknown_value.get": "Type.Dictionary.UnknownValue.get", - "typetest.dictionary.DictionaryClient.unknown_value.put": "Type.Dictionary.UnknownValue.put", - "typetest.dictionary.DictionaryClient.model_value.get": "Type.Dictionary.ModelValue.get", - "typetest.dictionary.DictionaryClient.model_value.put": "Type.Dictionary.ModelValue.put", - "typetest.dictionary.DictionaryClient.recursive_model_value.get": "Type.Dictionary.RecursiveModelValue.get", - "typetest.dictionary.DictionaryClient.recursive_model_value.put": "Type.Dictionary.RecursiveModelValue.put", - "typetest.dictionary.DictionaryClient.nullable_float_value.get": "Type.Dictionary.NullableFloatValue.get", - "typetest.dictionary.DictionaryClient.nullable_float_value.put": "Type.Dictionary.NullableFloatValue.put" + "typetest.dictionary.operations.Int32ValueOperations.get": "Type.Dictionary.Int32Value.get", + "typetest.dictionary.aio.operations.Int32ValueOperations.get": "Type.Dictionary.Int32Value.get", + "typetest.dictionary.operations.Int32ValueOperations.put": "Type.Dictionary.Int32Value.put", + "typetest.dictionary.aio.operations.Int32ValueOperations.put": "Type.Dictionary.Int32Value.put", + "typetest.dictionary.operations.Int64ValueOperations.get": "Type.Dictionary.Int64Value.get", + "typetest.dictionary.aio.operations.Int64ValueOperations.get": "Type.Dictionary.Int64Value.get", + "typetest.dictionary.operations.Int64ValueOperations.put": "Type.Dictionary.Int64Value.put", + "typetest.dictionary.aio.operations.Int64ValueOperations.put": "Type.Dictionary.Int64Value.put", + "typetest.dictionary.operations.BooleanValueOperations.get": "Type.Dictionary.BooleanValue.get", + "typetest.dictionary.aio.operations.BooleanValueOperations.get": "Type.Dictionary.BooleanValue.get", + "typetest.dictionary.operations.BooleanValueOperations.put": "Type.Dictionary.BooleanValue.put", + "typetest.dictionary.aio.operations.BooleanValueOperations.put": "Type.Dictionary.BooleanValue.put", + "typetest.dictionary.operations.StringValueOperations.get": "Type.Dictionary.StringValue.get", + "typetest.dictionary.aio.operations.StringValueOperations.get": "Type.Dictionary.StringValue.get", + "typetest.dictionary.operations.StringValueOperations.put": "Type.Dictionary.StringValue.put", + "typetest.dictionary.aio.operations.StringValueOperations.put": "Type.Dictionary.StringValue.put", + "typetest.dictionary.operations.Float32ValueOperations.get": "Type.Dictionary.Float32Value.get", + "typetest.dictionary.aio.operations.Float32ValueOperations.get": "Type.Dictionary.Float32Value.get", + "typetest.dictionary.operations.Float32ValueOperations.put": "Type.Dictionary.Float32Value.put", + "typetest.dictionary.aio.operations.Float32ValueOperations.put": "Type.Dictionary.Float32Value.put", + "typetest.dictionary.operations.DatetimeValueOperations.get": "Type.Dictionary.DatetimeValue.get", + "typetest.dictionary.aio.operations.DatetimeValueOperations.get": "Type.Dictionary.DatetimeValue.get", + "typetest.dictionary.operations.DatetimeValueOperations.put": "Type.Dictionary.DatetimeValue.put", + "typetest.dictionary.aio.operations.DatetimeValueOperations.put": "Type.Dictionary.DatetimeValue.put", + "typetest.dictionary.operations.DurationValueOperations.get": "Type.Dictionary.DurationValue.get", + "typetest.dictionary.aio.operations.DurationValueOperations.get": "Type.Dictionary.DurationValue.get", + "typetest.dictionary.operations.DurationValueOperations.put": "Type.Dictionary.DurationValue.put", + "typetest.dictionary.aio.operations.DurationValueOperations.put": "Type.Dictionary.DurationValue.put", + "typetest.dictionary.operations.UnknownValueOperations.get": "Type.Dictionary.UnknownValue.get", + "typetest.dictionary.aio.operations.UnknownValueOperations.get": "Type.Dictionary.UnknownValue.get", + "typetest.dictionary.operations.UnknownValueOperations.put": "Type.Dictionary.UnknownValue.put", + "typetest.dictionary.aio.operations.UnknownValueOperations.put": "Type.Dictionary.UnknownValue.put", + "typetest.dictionary.operations.ModelValueOperations.get": "Type.Dictionary.ModelValue.get", + "typetest.dictionary.aio.operations.ModelValueOperations.get": "Type.Dictionary.ModelValue.get", + "typetest.dictionary.operations.ModelValueOperations.put": "Type.Dictionary.ModelValue.put", + "typetest.dictionary.aio.operations.ModelValueOperations.put": "Type.Dictionary.ModelValue.put", + "typetest.dictionary.operations.RecursiveModelValueOperations.get": "Type.Dictionary.RecursiveModelValue.get", + "typetest.dictionary.aio.operations.RecursiveModelValueOperations.get": "Type.Dictionary.RecursiveModelValue.get", + "typetest.dictionary.operations.RecursiveModelValueOperations.put": "Type.Dictionary.RecursiveModelValue.put", + "typetest.dictionary.aio.operations.RecursiveModelValueOperations.put": "Type.Dictionary.RecursiveModelValue.put", + "typetest.dictionary.operations.NullableFloatValueOperations.get": "Type.Dictionary.NullableFloatValue.get", + "typetest.dictionary.aio.operations.NullableFloatValueOperations.get": "Type.Dictionary.NullableFloatValue.get", + "typetest.dictionary.operations.NullableFloatValueOperations.put": "Type.Dictionary.NullableFloatValue.put", + "typetest.dictionary.aio.operations.NullableFloatValueOperations.put": "Type.Dictionary.NullableFloatValue.put" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-enum-extensible/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-enum-extensible/apiview-properties.json index f340f88a7b3..03bd541218d 100644 --- a/packages/typespec-python/test/azure/generated/typetest-enum-extensible/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-enum-extensible/apiview-properties.json @@ -2,9 +2,13 @@ "CrossLanguagePackageId": "Type.Enum.Extensible", "CrossLanguageDefinitionId": { "typetest.enum.extensible.models.DaysOfWeekExtensibleEnum": "Type.Enum.Extensible.DaysOfWeekExtensibleEnum", - "typetest.enum.extensible.ExtensibleClient.string.get_known_value": "Type.Enum.Extensible.String.getKnownValue", - "typetest.enum.extensible.ExtensibleClient.string.get_unknown_value": "Type.Enum.Extensible.String.getUnknownValue", - "typetest.enum.extensible.ExtensibleClient.string.put_known_value": "Type.Enum.Extensible.String.putKnownValue", - "typetest.enum.extensible.ExtensibleClient.string.put_unknown_value": "Type.Enum.Extensible.String.putUnknownValue" + "typetest.enum.extensible.operations.StringOperations.get_known_value": "Type.Enum.Extensible.String.getKnownValue", + "typetest.enum.extensible.aio.operations.StringOperations.get_known_value": "Type.Enum.Extensible.String.getKnownValue", + "typetest.enum.extensible.operations.StringOperations.get_unknown_value": "Type.Enum.Extensible.String.getUnknownValue", + "typetest.enum.extensible.aio.operations.StringOperations.get_unknown_value": "Type.Enum.Extensible.String.getUnknownValue", + "typetest.enum.extensible.operations.StringOperations.put_known_value": "Type.Enum.Extensible.String.putKnownValue", + "typetest.enum.extensible.aio.operations.StringOperations.put_known_value": "Type.Enum.Extensible.String.putKnownValue", + "typetest.enum.extensible.operations.StringOperations.put_unknown_value": "Type.Enum.Extensible.String.putUnknownValue", + "typetest.enum.extensible.aio.operations.StringOperations.put_unknown_value": "Type.Enum.Extensible.String.putUnknownValue" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-enum-fixed/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-enum-fixed/apiview-properties.json index f98c36c91e0..a76b7f66d6a 100644 --- a/packages/typespec-python/test/azure/generated/typetest-enum-fixed/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-enum-fixed/apiview-properties.json @@ -2,8 +2,11 @@ "CrossLanguagePackageId": "Type.Enum.Fixed", "CrossLanguageDefinitionId": { "typetest.enum.fixed.models.DaysOfWeekEnum": "Type.Enum.Fixed.DaysOfWeekEnum", - "typetest.enum.fixed.FixedClient.string.get_known_value": "Type.Enum.Fixed.String.getKnownValue", - "typetest.enum.fixed.FixedClient.string.put_known_value": "Type.Enum.Fixed.String.putKnownValue", - "typetest.enum.fixed.FixedClient.string.put_unknown_value": "Type.Enum.Fixed.String.putUnknownValue" + "typetest.enum.fixed.operations.StringOperations.get_known_value": "Type.Enum.Fixed.String.getKnownValue", + "typetest.enum.fixed.aio.operations.StringOperations.get_known_value": "Type.Enum.Fixed.String.getKnownValue", + "typetest.enum.fixed.operations.StringOperations.put_known_value": "Type.Enum.Fixed.String.putKnownValue", + "typetest.enum.fixed.aio.operations.StringOperations.put_known_value": "Type.Enum.Fixed.String.putKnownValue", + "typetest.enum.fixed.operations.StringOperations.put_unknown_value": "Type.Enum.Fixed.String.putUnknownValue", + "typetest.enum.fixed.aio.operations.StringOperations.put_unknown_value": "Type.Enum.Fixed.String.putUnknownValue" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-model-empty/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-model-empty/apiview-properties.json index 8f54e6308e1..7e1db82c350 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-empty/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-model-empty/apiview-properties.json @@ -5,7 +5,10 @@ "typetest.model.empty.models.EmptyInputOutput": "Type.Model.Empty.EmptyInputOutput", "typetest.model.empty.models.EmptyOutput": "Type.Model.Empty.EmptyOutput", "typetest.model.empty.EmptyClient.put_empty": "Type.Model.Empty.putEmpty", + "typetest.model.empty.aio.EmptyClient.put_empty": "Type.Model.Empty.putEmpty", "typetest.model.empty.EmptyClient.get_empty": "Type.Model.Empty.getEmpty", - "typetest.model.empty.EmptyClient.post_round_trip_empty": "Type.Model.Empty.postRoundTripEmpty" + "typetest.model.empty.aio.EmptyClient.get_empty": "Type.Model.Empty.getEmpty", + "typetest.model.empty.EmptyClient.post_round_trip_empty": "Type.Model.Empty.postRoundTripEmpty", + "typetest.model.empty.aio.EmptyClient.post_round_trip_empty": "Type.Model.Empty.postRoundTripEmpty" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/apiview-properties.json index cf24f282bd4..8798f557c7a 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/apiview-properties.json @@ -8,12 +8,20 @@ "typetest.model.enumdiscriminator.models.DogKind": "Type.Model.Inheritance.EnumDiscriminator.DogKind", "typetest.model.enumdiscriminator.models.SnakeKind": "Type.Model.Inheritance.EnumDiscriminator.SnakeKind", "typetest.model.enumdiscriminator.EnumDiscriminatorClient.get_extensible_model": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel", + "typetest.model.enumdiscriminator.aio.EnumDiscriminatorClient.get_extensible_model": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModel", "typetest.model.enumdiscriminator.EnumDiscriminatorClient.put_extensible_model": "Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel", + "typetest.model.enumdiscriminator.aio.EnumDiscriminatorClient.put_extensible_model": "Type.Model.Inheritance.EnumDiscriminator.putExtensibleModel", "typetest.model.enumdiscriminator.EnumDiscriminatorClient.get_extensible_model_missing_discriminator": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator", + "typetest.model.enumdiscriminator.aio.EnumDiscriminatorClient.get_extensible_model_missing_discriminator": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelMissingDiscriminator", "typetest.model.enumdiscriminator.EnumDiscriminatorClient.get_extensible_model_wrong_discriminator": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator", + "typetest.model.enumdiscriminator.aio.EnumDiscriminatorClient.get_extensible_model_wrong_discriminator": "Type.Model.Inheritance.EnumDiscriminator.getExtensibleModelWrongDiscriminator", "typetest.model.enumdiscriminator.EnumDiscriminatorClient.get_fixed_model": "Type.Model.Inheritance.EnumDiscriminator.getFixedModel", + "typetest.model.enumdiscriminator.aio.EnumDiscriminatorClient.get_fixed_model": "Type.Model.Inheritance.EnumDiscriminator.getFixedModel", "typetest.model.enumdiscriminator.EnumDiscriminatorClient.put_fixed_model": "Type.Model.Inheritance.EnumDiscriminator.putFixedModel", + "typetest.model.enumdiscriminator.aio.EnumDiscriminatorClient.put_fixed_model": "Type.Model.Inheritance.EnumDiscriminator.putFixedModel", "typetest.model.enumdiscriminator.EnumDiscriminatorClient.get_fixed_model_missing_discriminator": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator", - "typetest.model.enumdiscriminator.EnumDiscriminatorClient.get_fixed_model_wrong_discriminator": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator" + "typetest.model.enumdiscriminator.aio.EnumDiscriminatorClient.get_fixed_model_missing_discriminator": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelMissingDiscriminator", + "typetest.model.enumdiscriminator.EnumDiscriminatorClient.get_fixed_model_wrong_discriminator": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator", + "typetest.model.enumdiscriminator.aio.EnumDiscriminatorClient.get_fixed_model_wrong_discriminator": "Type.Model.Inheritance.EnumDiscriminator.getFixedModelWrongDiscriminator" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/apiview-properties.json index 630c033ff8b..c2721b99620 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/apiview-properties.json @@ -7,10 +7,16 @@ "typetest.model.nesteddiscriminator.models.Salmon": "Type.Model.Inheritance.NestedDiscriminator.Salmon", "typetest.model.nesteddiscriminator.models.SawShark": "Type.Model.Inheritance.NestedDiscriminator.SawShark", "typetest.model.nesteddiscriminator.NestedDiscriminatorClient.get_model": "Type.Model.Inheritance.NestedDiscriminator.getModel", + "typetest.model.nesteddiscriminator.aio.NestedDiscriminatorClient.get_model": "Type.Model.Inheritance.NestedDiscriminator.getModel", "typetest.model.nesteddiscriminator.NestedDiscriminatorClient.put_model": "Type.Model.Inheritance.NestedDiscriminator.putModel", + "typetest.model.nesteddiscriminator.aio.NestedDiscriminatorClient.put_model": "Type.Model.Inheritance.NestedDiscriminator.putModel", "typetest.model.nesteddiscriminator.NestedDiscriminatorClient.get_recursive_model": "Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel", + "typetest.model.nesteddiscriminator.aio.NestedDiscriminatorClient.get_recursive_model": "Type.Model.Inheritance.NestedDiscriminator.getRecursiveModel", "typetest.model.nesteddiscriminator.NestedDiscriminatorClient.put_recursive_model": "Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel", + "typetest.model.nesteddiscriminator.aio.NestedDiscriminatorClient.put_recursive_model": "Type.Model.Inheritance.NestedDiscriminator.putRecursiveModel", "typetest.model.nesteddiscriminator.NestedDiscriminatorClient.get_missing_discriminator": "Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator", - "typetest.model.nesteddiscriminator.NestedDiscriminatorClient.get_wrong_discriminator": "Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator" + "typetest.model.nesteddiscriminator.aio.NestedDiscriminatorClient.get_missing_discriminator": "Type.Model.Inheritance.NestedDiscriminator.getMissingDiscriminator", + "typetest.model.nesteddiscriminator.NestedDiscriminatorClient.get_wrong_discriminator": "Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator", + "typetest.model.nesteddiscriminator.aio.NestedDiscriminatorClient.get_wrong_discriminator": "Type.Model.Inheritance.NestedDiscriminator.getWrongDiscriminator" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/apiview-properties.json index 69f8853c5d6..4e9bfd0e7ee 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/apiview-properties.json @@ -5,7 +5,10 @@ "typetest.model.notdiscriminated.models.Cat": "Type.Model.Inheritance.NotDiscriminated.Cat", "typetest.model.notdiscriminated.models.Siamese": "Type.Model.Inheritance.NotDiscriminated.Siamese", "typetest.model.notdiscriminated.NotDiscriminatedClient.post_valid": "Type.Model.Inheritance.NotDiscriminated.postValid", + "typetest.model.notdiscriminated.aio.NotDiscriminatedClient.post_valid": "Type.Model.Inheritance.NotDiscriminated.postValid", "typetest.model.notdiscriminated.NotDiscriminatedClient.get_valid": "Type.Model.Inheritance.NotDiscriminated.getValid", - "typetest.model.notdiscriminated.NotDiscriminatedClient.put_valid": "Type.Model.Inheritance.NotDiscriminated.putValid" + "typetest.model.notdiscriminated.aio.NotDiscriminatedClient.get_valid": "Type.Model.Inheritance.NotDiscriminated.getValid", + "typetest.model.notdiscriminated.NotDiscriminatedClient.put_valid": "Type.Model.Inheritance.NotDiscriminated.putValid", + "typetest.model.notdiscriminated.aio.NotDiscriminatedClient.put_valid": "Type.Model.Inheritance.NotDiscriminated.putValid" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-model-recursive/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-model-recursive/apiview-properties.json index 7aca52f643e..3de76b2251f 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-recursive/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-model-recursive/apiview-properties.json @@ -4,6 +4,8 @@ "typetest.model.recursive.models.Element": "Type.Model.Inheritance.Recursive.Element", "typetest.model.recursive.models.Extension": "Type.Model.Inheritance.Recursive.Extension", "typetest.model.recursive.RecursiveClient.put": "Type.Model.Inheritance.Recursive.put", - "typetest.model.recursive.RecursiveClient.get": "Type.Model.Inheritance.Recursive.get" + "typetest.model.recursive.aio.RecursiveClient.put": "Type.Model.Inheritance.Recursive.put", + "typetest.model.recursive.RecursiveClient.get": "Type.Model.Inheritance.Recursive.get", + "typetest.model.recursive.aio.RecursiveClient.get": "Type.Model.Inheritance.Recursive.get" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/apiview-properties.json index 77f58e314c8..b925b3bf447 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/apiview-properties.json @@ -9,11 +9,18 @@ "typetest.model.singlediscriminator.models.Sparrow": "Type.Model.Inheritance.SingleDiscriminator.Sparrow", "typetest.model.singlediscriminator.models.TRex": "Type.Model.Inheritance.SingleDiscriminator.TRex", "typetest.model.singlediscriminator.SingleDiscriminatorClient.get_model": "Type.Model.Inheritance.SingleDiscriminator.getModel", + "typetest.model.singlediscriminator.aio.SingleDiscriminatorClient.get_model": "Type.Model.Inheritance.SingleDiscriminator.getModel", "typetest.model.singlediscriminator.SingleDiscriminatorClient.put_model": "Type.Model.Inheritance.SingleDiscriminator.putModel", + "typetest.model.singlediscriminator.aio.SingleDiscriminatorClient.put_model": "Type.Model.Inheritance.SingleDiscriminator.putModel", "typetest.model.singlediscriminator.SingleDiscriminatorClient.get_recursive_model": "Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel", + "typetest.model.singlediscriminator.aio.SingleDiscriminatorClient.get_recursive_model": "Type.Model.Inheritance.SingleDiscriminator.getRecursiveModel", "typetest.model.singlediscriminator.SingleDiscriminatorClient.put_recursive_model": "Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel", + "typetest.model.singlediscriminator.aio.SingleDiscriminatorClient.put_recursive_model": "Type.Model.Inheritance.SingleDiscriminator.putRecursiveModel", "typetest.model.singlediscriminator.SingleDiscriminatorClient.get_missing_discriminator": "Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator", + "typetest.model.singlediscriminator.aio.SingleDiscriminatorClient.get_missing_discriminator": "Type.Model.Inheritance.SingleDiscriminator.getMissingDiscriminator", "typetest.model.singlediscriminator.SingleDiscriminatorClient.get_wrong_discriminator": "Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator", - "typetest.model.singlediscriminator.SingleDiscriminatorClient.get_legacy_model": "Type.Model.Inheritance.SingleDiscriminator.getLegacyModel" + "typetest.model.singlediscriminator.aio.SingleDiscriminatorClient.get_wrong_discriminator": "Type.Model.Inheritance.SingleDiscriminator.getWrongDiscriminator", + "typetest.model.singlediscriminator.SingleDiscriminatorClient.get_legacy_model": "Type.Model.Inheritance.SingleDiscriminator.getLegacyModel", + "typetest.model.singlediscriminator.aio.SingleDiscriminatorClient.get_legacy_model": "Type.Model.Inheritance.SingleDiscriminator.getLegacyModel" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-model-usage/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-model-usage/apiview-properties.json index be1978739e7..25be2bb02f8 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-usage/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-model-usage/apiview-properties.json @@ -5,7 +5,10 @@ "typetest.model.usage.models.InputRecord": "Type.Model.Usage.InputRecord", "typetest.model.usage.models.OutputRecord": "Type.Model.Usage.OutputRecord", "typetest.model.usage.UsageClient.input": "Type.Model.Usage.input", + "typetest.model.usage.aio.UsageClient.input": "Type.Model.Usage.input", "typetest.model.usage.UsageClient.output": "Type.Model.Usage.output", - "typetest.model.usage.UsageClient.input_and_output": "Type.Model.Usage.inputAndOutput" + "typetest.model.usage.aio.UsageClient.output": "Type.Model.Usage.output", + "typetest.model.usage.UsageClient.input_and_output": "Type.Model.Usage.inputAndOutput", + "typetest.model.usage.aio.UsageClient.input_and_output": "Type.Model.Usage.inputAndOutput" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-model-visibility/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-model-visibility/apiview-properties.json index d8d41373f8b..b23fcd17ab0 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-visibility/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-model-visibility/apiview-properties.json @@ -4,11 +4,18 @@ "typetest.model.visibility.models.ReadOnlyModel": "Type.Model.Visibility.ReadOnlyModel", "typetest.model.visibility.models.VisibilityModel": "Type.Model.Visibility.VisibilityModel", "typetest.model.visibility.VisibilityClient.get_model": "Type.Model.Visibility.getModel", + "typetest.model.visibility.aio.VisibilityClient.get_model": "Type.Model.Visibility.getModel", "typetest.model.visibility.VisibilityClient.head_model": "Type.Model.Visibility.headModel", + "typetest.model.visibility.aio.VisibilityClient.head_model": "Type.Model.Visibility.headModel", "typetest.model.visibility.VisibilityClient.put_model": "Type.Model.Visibility.putModel", + "typetest.model.visibility.aio.VisibilityClient.put_model": "Type.Model.Visibility.putModel", "typetest.model.visibility.VisibilityClient.patch_model": "Type.Model.Visibility.patchModel", + "typetest.model.visibility.aio.VisibilityClient.patch_model": "Type.Model.Visibility.patchModel", "typetest.model.visibility.VisibilityClient.post_model": "Type.Model.Visibility.postModel", + "typetest.model.visibility.aio.VisibilityClient.post_model": "Type.Model.Visibility.postModel", "typetest.model.visibility.VisibilityClient.delete_model": "Type.Model.Visibility.deleteModel", - "typetest.model.visibility.VisibilityClient.put_read_only_model": "Type.Model.Visibility.putReadOnlyModel" + "typetest.model.visibility.aio.VisibilityClient.delete_model": "Type.Model.Visibility.deleteModel", + "typetest.model.visibility.VisibilityClient.put_read_only_model": "Type.Model.Visibility.putReadOnlyModel", + "typetest.model.visibility.aio.VisibilityClient.put_read_only_model": "Type.Model.Visibility.putReadOnlyModel" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/apiview-properties.json index c7916a6249c..e3374cfe24b 100644 --- a/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/apiview-properties.json @@ -38,67 +38,129 @@ "typetest.property.additionalproperties.models.WidgetData0": "Type.Property.AdditionalProperties.WidgetData0", "typetest.property.additionalproperties.models.WidgetData1": "Type.Property.AdditionalProperties.WidgetData1", "typetest.property.additionalproperties.models.WidgetData2": "Type.Property.AdditionalProperties.WidgetData2", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_unknown.get": "Type.Property.AdditionalProperties.ExtendsUnknown.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_unknown.put": "Type.Property.AdditionalProperties.ExtendsUnknown.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_unknown_derived.get": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_unknown_derived.put": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_unknown_discriminated.get": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_unknown_discriminated.put": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.is_unknown.get": "Type.Property.AdditionalProperties.IsUnknown.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.is_unknown.put": "Type.Property.AdditionalProperties.IsUnknown.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.is_unknown_derived.get": "Type.Property.AdditionalProperties.IsUnknownDerived.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.is_unknown_derived.put": "Type.Property.AdditionalProperties.IsUnknownDerived.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.is_unknown_discriminated.get": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.is_unknown_discriminated.put": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_string.get": "Type.Property.AdditionalProperties.ExtendsString.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_string.put": "Type.Property.AdditionalProperties.ExtendsString.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.is_string.get": "Type.Property.AdditionalProperties.IsString.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.is_string.put": "Type.Property.AdditionalProperties.IsString.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_string.get": "Type.Property.AdditionalProperties.SpreadString.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_string.put": "Type.Property.AdditionalProperties.SpreadString.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_float.get": "Type.Property.AdditionalProperties.ExtendsFloat.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_float.put": "Type.Property.AdditionalProperties.ExtendsFloat.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.is_float.get": "Type.Property.AdditionalProperties.IsFloat.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.is_float.put": "Type.Property.AdditionalProperties.IsFloat.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_float.get": "Type.Property.AdditionalProperties.SpreadFloat.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_float.put": "Type.Property.AdditionalProperties.SpreadFloat.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_model.get": "Type.Property.AdditionalProperties.ExtendsModel.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_model.put": "Type.Property.AdditionalProperties.ExtendsModel.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.is_model.get": "Type.Property.AdditionalProperties.IsModel.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.is_model.put": "Type.Property.AdditionalProperties.IsModel.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_model.get": "Type.Property.AdditionalProperties.SpreadModel.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_model.put": "Type.Property.AdditionalProperties.SpreadModel.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_model_array.get": "Type.Property.AdditionalProperties.ExtendsModelArray.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_model_array.put": "Type.Property.AdditionalProperties.ExtendsModelArray.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.is_model_array.get": "Type.Property.AdditionalProperties.IsModelArray.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.is_model_array.put": "Type.Property.AdditionalProperties.IsModelArray.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_model_array.get": "Type.Property.AdditionalProperties.SpreadModelArray.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_model_array.put": "Type.Property.AdditionalProperties.SpreadModelArray.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_different_string.get": "Type.Property.AdditionalProperties.SpreadDifferentString.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_different_string.put": "Type.Property.AdditionalProperties.SpreadDifferentString.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_different_float.get": "Type.Property.AdditionalProperties.SpreadDifferentFloat.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_different_float.put": "Type.Property.AdditionalProperties.SpreadDifferentFloat.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_different_model.get": "Type.Property.AdditionalProperties.SpreadDifferentModel.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_different_model.put": "Type.Property.AdditionalProperties.SpreadDifferentModel.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_different_model_array.get": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_different_model_array.put": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_different_spread_string.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_different_spread_string.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_different_spread_float.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_different_spread_float.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_different_spread_model.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_different_spread_model.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_different_spread_model_array.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.extends_different_spread_model_array.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.multiple_spread.get": "Type.Property.AdditionalProperties.MultipleSpread.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.multiple_spread.put": "Type.Property.AdditionalProperties.MultipleSpread.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_record_union.get": "Type.Property.AdditionalProperties.SpreadRecordUnion.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_record_union.put": "Type.Property.AdditionalProperties.SpreadRecordUnion.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_record_non_discriminated_union.get": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_record_non_discriminated_union.put": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_record_non_discriminated_union2.get": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_record_non_discriminated_union2.put": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_record_non_discriminated_union3.get": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get", - "typetest.property.additionalproperties.AdditionalPropertiesClient.spread_record_non_discriminated_union3.put": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put" + "typetest.property.additionalproperties.operations.ExtendsUnknownOperations.get": "Type.Property.AdditionalProperties.ExtendsUnknown.get", + "typetest.property.additionalproperties.aio.operations.ExtendsUnknownOperations.get": "Type.Property.AdditionalProperties.ExtendsUnknown.get", + "typetest.property.additionalproperties.operations.ExtendsUnknownOperations.put": "Type.Property.AdditionalProperties.ExtendsUnknown.put", + "typetest.property.additionalproperties.aio.operations.ExtendsUnknownOperations.put": "Type.Property.AdditionalProperties.ExtendsUnknown.put", + "typetest.property.additionalproperties.operations.ExtendsUnknownDerivedOperations.get": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.get", + "typetest.property.additionalproperties.aio.operations.ExtendsUnknownDerivedOperations.get": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.get", + "typetest.property.additionalproperties.operations.ExtendsUnknownDerivedOperations.put": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.put", + "typetest.property.additionalproperties.aio.operations.ExtendsUnknownDerivedOperations.put": "Type.Property.AdditionalProperties.ExtendsUnknownDerived.put", + "typetest.property.additionalproperties.operations.ExtendsUnknownDiscriminatedOperations.get": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get", + "typetest.property.additionalproperties.aio.operations.ExtendsUnknownDiscriminatedOperations.get": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.get", + "typetest.property.additionalproperties.operations.ExtendsUnknownDiscriminatedOperations.put": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put", + "typetest.property.additionalproperties.aio.operations.ExtendsUnknownDiscriminatedOperations.put": "Type.Property.AdditionalProperties.ExtendsUnknownDiscriminated.put", + "typetest.property.additionalproperties.operations.IsUnknownOperations.get": "Type.Property.AdditionalProperties.IsUnknown.get", + "typetest.property.additionalproperties.aio.operations.IsUnknownOperations.get": "Type.Property.AdditionalProperties.IsUnknown.get", + "typetest.property.additionalproperties.operations.IsUnknownOperations.put": "Type.Property.AdditionalProperties.IsUnknown.put", + "typetest.property.additionalproperties.aio.operations.IsUnknownOperations.put": "Type.Property.AdditionalProperties.IsUnknown.put", + "typetest.property.additionalproperties.operations.IsUnknownDerivedOperations.get": "Type.Property.AdditionalProperties.IsUnknownDerived.get", + "typetest.property.additionalproperties.aio.operations.IsUnknownDerivedOperations.get": "Type.Property.AdditionalProperties.IsUnknownDerived.get", + "typetest.property.additionalproperties.operations.IsUnknownDerivedOperations.put": "Type.Property.AdditionalProperties.IsUnknownDerived.put", + "typetest.property.additionalproperties.aio.operations.IsUnknownDerivedOperations.put": "Type.Property.AdditionalProperties.IsUnknownDerived.put", + "typetest.property.additionalproperties.operations.IsUnknownDiscriminatedOperations.get": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.get", + "typetest.property.additionalproperties.aio.operations.IsUnknownDiscriminatedOperations.get": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.get", + "typetest.property.additionalproperties.operations.IsUnknownDiscriminatedOperations.put": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.put", + "typetest.property.additionalproperties.aio.operations.IsUnknownDiscriminatedOperations.put": "Type.Property.AdditionalProperties.IsUnknownDiscriminated.put", + "typetest.property.additionalproperties.operations.ExtendsStringOperations.get": "Type.Property.AdditionalProperties.ExtendsString.get", + "typetest.property.additionalproperties.aio.operations.ExtendsStringOperations.get": "Type.Property.AdditionalProperties.ExtendsString.get", + "typetest.property.additionalproperties.operations.ExtendsStringOperations.put": "Type.Property.AdditionalProperties.ExtendsString.put", + "typetest.property.additionalproperties.aio.operations.ExtendsStringOperations.put": "Type.Property.AdditionalProperties.ExtendsString.put", + "typetest.property.additionalproperties.operations.IsStringOperations.get": "Type.Property.AdditionalProperties.IsString.get", + "typetest.property.additionalproperties.aio.operations.IsStringOperations.get": "Type.Property.AdditionalProperties.IsString.get", + "typetest.property.additionalproperties.operations.IsStringOperations.put": "Type.Property.AdditionalProperties.IsString.put", + "typetest.property.additionalproperties.aio.operations.IsStringOperations.put": "Type.Property.AdditionalProperties.IsString.put", + "typetest.property.additionalproperties.operations.SpreadStringOperations.get": "Type.Property.AdditionalProperties.SpreadString.get", + "typetest.property.additionalproperties.aio.operations.SpreadStringOperations.get": "Type.Property.AdditionalProperties.SpreadString.get", + "typetest.property.additionalproperties.operations.SpreadStringOperations.put": "Type.Property.AdditionalProperties.SpreadString.put", + "typetest.property.additionalproperties.aio.operations.SpreadStringOperations.put": "Type.Property.AdditionalProperties.SpreadString.put", + "typetest.property.additionalproperties.operations.ExtendsFloatOperations.get": "Type.Property.AdditionalProperties.ExtendsFloat.get", + "typetest.property.additionalproperties.aio.operations.ExtendsFloatOperations.get": "Type.Property.AdditionalProperties.ExtendsFloat.get", + "typetest.property.additionalproperties.operations.ExtendsFloatOperations.put": "Type.Property.AdditionalProperties.ExtendsFloat.put", + "typetest.property.additionalproperties.aio.operations.ExtendsFloatOperations.put": "Type.Property.AdditionalProperties.ExtendsFloat.put", + "typetest.property.additionalproperties.operations.IsFloatOperations.get": "Type.Property.AdditionalProperties.IsFloat.get", + "typetest.property.additionalproperties.aio.operations.IsFloatOperations.get": "Type.Property.AdditionalProperties.IsFloat.get", + "typetest.property.additionalproperties.operations.IsFloatOperations.put": "Type.Property.AdditionalProperties.IsFloat.put", + "typetest.property.additionalproperties.aio.operations.IsFloatOperations.put": "Type.Property.AdditionalProperties.IsFloat.put", + "typetest.property.additionalproperties.operations.SpreadFloatOperations.get": "Type.Property.AdditionalProperties.SpreadFloat.get", + "typetest.property.additionalproperties.aio.operations.SpreadFloatOperations.get": "Type.Property.AdditionalProperties.SpreadFloat.get", + "typetest.property.additionalproperties.operations.SpreadFloatOperations.put": "Type.Property.AdditionalProperties.SpreadFloat.put", + "typetest.property.additionalproperties.aio.operations.SpreadFloatOperations.put": "Type.Property.AdditionalProperties.SpreadFloat.put", + "typetest.property.additionalproperties.operations.ExtendsModelOperations.get": "Type.Property.AdditionalProperties.ExtendsModel.get", + "typetest.property.additionalproperties.aio.operations.ExtendsModelOperations.get": "Type.Property.AdditionalProperties.ExtendsModel.get", + "typetest.property.additionalproperties.operations.ExtendsModelOperations.put": "Type.Property.AdditionalProperties.ExtendsModel.put", + "typetest.property.additionalproperties.aio.operations.ExtendsModelOperations.put": "Type.Property.AdditionalProperties.ExtendsModel.put", + "typetest.property.additionalproperties.operations.IsModelOperations.get": "Type.Property.AdditionalProperties.IsModel.get", + "typetest.property.additionalproperties.aio.operations.IsModelOperations.get": "Type.Property.AdditionalProperties.IsModel.get", + "typetest.property.additionalproperties.operations.IsModelOperations.put": "Type.Property.AdditionalProperties.IsModel.put", + "typetest.property.additionalproperties.aio.operations.IsModelOperations.put": "Type.Property.AdditionalProperties.IsModel.put", + "typetest.property.additionalproperties.operations.SpreadModelOperations.get": "Type.Property.AdditionalProperties.SpreadModel.get", + "typetest.property.additionalproperties.aio.operations.SpreadModelOperations.get": "Type.Property.AdditionalProperties.SpreadModel.get", + "typetest.property.additionalproperties.operations.SpreadModelOperations.put": "Type.Property.AdditionalProperties.SpreadModel.put", + "typetest.property.additionalproperties.aio.operations.SpreadModelOperations.put": "Type.Property.AdditionalProperties.SpreadModel.put", + "typetest.property.additionalproperties.operations.ExtendsModelArrayOperations.get": "Type.Property.AdditionalProperties.ExtendsModelArray.get", + "typetest.property.additionalproperties.aio.operations.ExtendsModelArrayOperations.get": "Type.Property.AdditionalProperties.ExtendsModelArray.get", + "typetest.property.additionalproperties.operations.ExtendsModelArrayOperations.put": "Type.Property.AdditionalProperties.ExtendsModelArray.put", + "typetest.property.additionalproperties.aio.operations.ExtendsModelArrayOperations.put": "Type.Property.AdditionalProperties.ExtendsModelArray.put", + "typetest.property.additionalproperties.operations.IsModelArrayOperations.get": "Type.Property.AdditionalProperties.IsModelArray.get", + "typetest.property.additionalproperties.aio.operations.IsModelArrayOperations.get": "Type.Property.AdditionalProperties.IsModelArray.get", + "typetest.property.additionalproperties.operations.IsModelArrayOperations.put": "Type.Property.AdditionalProperties.IsModelArray.put", + "typetest.property.additionalproperties.aio.operations.IsModelArrayOperations.put": "Type.Property.AdditionalProperties.IsModelArray.put", + "typetest.property.additionalproperties.operations.SpreadModelArrayOperations.get": "Type.Property.AdditionalProperties.SpreadModelArray.get", + "typetest.property.additionalproperties.aio.operations.SpreadModelArrayOperations.get": "Type.Property.AdditionalProperties.SpreadModelArray.get", + "typetest.property.additionalproperties.operations.SpreadModelArrayOperations.put": "Type.Property.AdditionalProperties.SpreadModelArray.put", + "typetest.property.additionalproperties.aio.operations.SpreadModelArrayOperations.put": "Type.Property.AdditionalProperties.SpreadModelArray.put", + "typetest.property.additionalproperties.operations.SpreadDifferentStringOperations.get": "Type.Property.AdditionalProperties.SpreadDifferentString.get", + "typetest.property.additionalproperties.aio.operations.SpreadDifferentStringOperations.get": "Type.Property.AdditionalProperties.SpreadDifferentString.get", + "typetest.property.additionalproperties.operations.SpreadDifferentStringOperations.put": "Type.Property.AdditionalProperties.SpreadDifferentString.put", + "typetest.property.additionalproperties.aio.operations.SpreadDifferentStringOperations.put": "Type.Property.AdditionalProperties.SpreadDifferentString.put", + "typetest.property.additionalproperties.operations.SpreadDifferentFloatOperations.get": "Type.Property.AdditionalProperties.SpreadDifferentFloat.get", + "typetest.property.additionalproperties.aio.operations.SpreadDifferentFloatOperations.get": "Type.Property.AdditionalProperties.SpreadDifferentFloat.get", + "typetest.property.additionalproperties.operations.SpreadDifferentFloatOperations.put": "Type.Property.AdditionalProperties.SpreadDifferentFloat.put", + "typetest.property.additionalproperties.aio.operations.SpreadDifferentFloatOperations.put": "Type.Property.AdditionalProperties.SpreadDifferentFloat.put", + "typetest.property.additionalproperties.operations.SpreadDifferentModelOperations.get": "Type.Property.AdditionalProperties.SpreadDifferentModel.get", + "typetest.property.additionalproperties.aio.operations.SpreadDifferentModelOperations.get": "Type.Property.AdditionalProperties.SpreadDifferentModel.get", + "typetest.property.additionalproperties.operations.SpreadDifferentModelOperations.put": "Type.Property.AdditionalProperties.SpreadDifferentModel.put", + "typetest.property.additionalproperties.aio.operations.SpreadDifferentModelOperations.put": "Type.Property.AdditionalProperties.SpreadDifferentModel.put", + "typetest.property.additionalproperties.operations.SpreadDifferentModelArrayOperations.get": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.get", + "typetest.property.additionalproperties.aio.operations.SpreadDifferentModelArrayOperations.get": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.get", + "typetest.property.additionalproperties.operations.SpreadDifferentModelArrayOperations.put": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.put", + "typetest.property.additionalproperties.aio.operations.SpreadDifferentModelArrayOperations.put": "Type.Property.AdditionalProperties.SpreadDifferentModelArray.put", + "typetest.property.additionalproperties.operations.ExtendsDifferentSpreadStringOperations.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get", + "typetest.property.additionalproperties.aio.operations.ExtendsDifferentSpreadStringOperations.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.get", + "typetest.property.additionalproperties.operations.ExtendsDifferentSpreadStringOperations.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put", + "typetest.property.additionalproperties.aio.operations.ExtendsDifferentSpreadStringOperations.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadString.put", + "typetest.property.additionalproperties.operations.ExtendsDifferentSpreadFloatOperations.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get", + "typetest.property.additionalproperties.aio.operations.ExtendsDifferentSpreadFloatOperations.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.get", + "typetest.property.additionalproperties.operations.ExtendsDifferentSpreadFloatOperations.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put", + "typetest.property.additionalproperties.aio.operations.ExtendsDifferentSpreadFloatOperations.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadFloat.put", + "typetest.property.additionalproperties.operations.ExtendsDifferentSpreadModelOperations.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get", + "typetest.property.additionalproperties.aio.operations.ExtendsDifferentSpreadModelOperations.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.get", + "typetest.property.additionalproperties.operations.ExtendsDifferentSpreadModelOperations.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put", + "typetest.property.additionalproperties.aio.operations.ExtendsDifferentSpreadModelOperations.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModel.put", + "typetest.property.additionalproperties.operations.ExtendsDifferentSpreadModelArrayOperations.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get", + "typetest.property.additionalproperties.aio.operations.ExtendsDifferentSpreadModelArrayOperations.get": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.get", + "typetest.property.additionalproperties.operations.ExtendsDifferentSpreadModelArrayOperations.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put", + "typetest.property.additionalproperties.aio.operations.ExtendsDifferentSpreadModelArrayOperations.put": "Type.Property.AdditionalProperties.ExtendsDifferentSpreadModelArray.put", + "typetest.property.additionalproperties.operations.MultipleSpreadOperations.get": "Type.Property.AdditionalProperties.MultipleSpread.get", + "typetest.property.additionalproperties.aio.operations.MultipleSpreadOperations.get": "Type.Property.AdditionalProperties.MultipleSpread.get", + "typetest.property.additionalproperties.operations.MultipleSpreadOperations.put": "Type.Property.AdditionalProperties.MultipleSpread.put", + "typetest.property.additionalproperties.aio.operations.MultipleSpreadOperations.put": "Type.Property.AdditionalProperties.MultipleSpread.put", + "typetest.property.additionalproperties.operations.SpreadRecordUnionOperations.get": "Type.Property.AdditionalProperties.SpreadRecordUnion.get", + "typetest.property.additionalproperties.aio.operations.SpreadRecordUnionOperations.get": "Type.Property.AdditionalProperties.SpreadRecordUnion.get", + "typetest.property.additionalproperties.operations.SpreadRecordUnionOperations.put": "Type.Property.AdditionalProperties.SpreadRecordUnion.put", + "typetest.property.additionalproperties.aio.operations.SpreadRecordUnionOperations.put": "Type.Property.AdditionalProperties.SpreadRecordUnion.put", + "typetest.property.additionalproperties.operations.SpreadRecordNonDiscriminatedUnionOperations.get": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get", + "typetest.property.additionalproperties.aio.operations.SpreadRecordNonDiscriminatedUnionOperations.get": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.get", + "typetest.property.additionalproperties.operations.SpreadRecordNonDiscriminatedUnionOperations.put": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put", + "typetest.property.additionalproperties.aio.operations.SpreadRecordNonDiscriminatedUnionOperations.put": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion.put", + "typetest.property.additionalproperties.operations.SpreadRecordNonDiscriminatedUnion2Operations.get": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get", + "typetest.property.additionalproperties.aio.operations.SpreadRecordNonDiscriminatedUnion2Operations.get": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.get", + "typetest.property.additionalproperties.operations.SpreadRecordNonDiscriminatedUnion2Operations.put": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put", + "typetest.property.additionalproperties.aio.operations.SpreadRecordNonDiscriminatedUnion2Operations.put": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion2.put", + "typetest.property.additionalproperties.operations.SpreadRecordNonDiscriminatedUnion3Operations.get": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get", + "typetest.property.additionalproperties.aio.operations.SpreadRecordNonDiscriminatedUnion3Operations.get": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.get", + "typetest.property.additionalproperties.operations.SpreadRecordNonDiscriminatedUnion3Operations.put": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put", + "typetest.property.additionalproperties.aio.operations.SpreadRecordNonDiscriminatedUnion3Operations.put": "Type.Property.AdditionalProperties.SpreadRecordNonDiscriminatedUnion3.put" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-property-nullable/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-property-nullable/apiview-properties.json index b0189abde37..f1e46c1672e 100644 --- a/packages/typespec-python/test/azure/generated/typetest-property-nullable/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-property-nullable/apiview-properties.json @@ -9,33 +9,61 @@ "typetest.property.nullable.models.DurationProperty": "Type.Property.Nullable.DurationProperty", "typetest.property.nullable.models.InnerModel": "Type.Property.Nullable.InnerModel", "typetest.property.nullable.models.StringProperty": "Type.Property.Nullable.StringProperty", - "typetest.property.nullable.NullableClient.string.get_non_null": "Type.Property.Nullable.String.getNonNull", - "typetest.property.nullable.NullableClient.string.get_null": "Type.Property.Nullable.String.getNull", - "typetest.property.nullable.NullableClient.string.patch_non_null": "Type.Property.Nullable.String.patchNonNull", - "typetest.property.nullable.NullableClient.string.patch_null": "Type.Property.Nullable.String.patchNull", - "typetest.property.nullable.NullableClient.bytes.get_non_null": "Type.Property.Nullable.Bytes.getNonNull", - "typetest.property.nullable.NullableClient.bytes.get_null": "Type.Property.Nullable.Bytes.getNull", - "typetest.property.nullable.NullableClient.bytes.patch_non_null": "Type.Property.Nullable.Bytes.patchNonNull", - "typetest.property.nullable.NullableClient.bytes.patch_null": "Type.Property.Nullable.Bytes.patchNull", - "typetest.property.nullable.NullableClient.datetime.get_non_null": "Type.Property.Nullable.Datetime.getNonNull", - "typetest.property.nullable.NullableClient.datetime.get_null": "Type.Property.Nullable.Datetime.getNull", - "typetest.property.nullable.NullableClient.datetime.patch_non_null": "Type.Property.Nullable.Datetime.patchNonNull", - "typetest.property.nullable.NullableClient.datetime.patch_null": "Type.Property.Nullable.Datetime.patchNull", - "typetest.property.nullable.NullableClient.duration.get_non_null": "Type.Property.Nullable.Duration.getNonNull", - "typetest.property.nullable.NullableClient.duration.get_null": "Type.Property.Nullable.Duration.getNull", - "typetest.property.nullable.NullableClient.duration.patch_non_null": "Type.Property.Nullable.Duration.patchNonNull", - "typetest.property.nullable.NullableClient.duration.patch_null": "Type.Property.Nullable.Duration.patchNull", - "typetest.property.nullable.NullableClient.collections_byte.get_non_null": "Type.Property.Nullable.CollectionsByte.getNonNull", - "typetest.property.nullable.NullableClient.collections_byte.get_null": "Type.Property.Nullable.CollectionsByte.getNull", - "typetest.property.nullable.NullableClient.collections_byte.patch_non_null": "Type.Property.Nullable.CollectionsByte.patchNonNull", - "typetest.property.nullable.NullableClient.collections_byte.patch_null": "Type.Property.Nullable.CollectionsByte.patchNull", - "typetest.property.nullable.NullableClient.collections_model.get_non_null": "Type.Property.Nullable.CollectionsModel.getNonNull", - "typetest.property.nullable.NullableClient.collections_model.get_null": "Type.Property.Nullable.CollectionsModel.getNull", - "typetest.property.nullable.NullableClient.collections_model.patch_non_null": "Type.Property.Nullable.CollectionsModel.patchNonNull", - "typetest.property.nullable.NullableClient.collections_model.patch_null": "Type.Property.Nullable.CollectionsModel.patchNull", - "typetest.property.nullable.NullableClient.collections_string.get_non_null": "Type.Property.Nullable.CollectionsString.getNonNull", - "typetest.property.nullable.NullableClient.collections_string.get_null": "Type.Property.Nullable.CollectionsString.getNull", - "typetest.property.nullable.NullableClient.collections_string.patch_non_null": "Type.Property.Nullable.CollectionsString.patchNonNull", - "typetest.property.nullable.NullableClient.collections_string.patch_null": "Type.Property.Nullable.CollectionsString.patchNull" + "typetest.property.nullable.operations.StringOperations.get_non_null": "Type.Property.Nullable.String.getNonNull", + "typetest.property.nullable.aio.operations.StringOperations.get_non_null": "Type.Property.Nullable.String.getNonNull", + "typetest.property.nullable.operations.StringOperations.get_null": "Type.Property.Nullable.String.getNull", + "typetest.property.nullable.aio.operations.StringOperations.get_null": "Type.Property.Nullable.String.getNull", + "typetest.property.nullable.operations.StringOperations.patch_non_null": "Type.Property.Nullable.String.patchNonNull", + "typetest.property.nullable.aio.operations.StringOperations.patch_non_null": "Type.Property.Nullable.String.patchNonNull", + "typetest.property.nullable.operations.StringOperations.patch_null": "Type.Property.Nullable.String.patchNull", + "typetest.property.nullable.aio.operations.StringOperations.patch_null": "Type.Property.Nullable.String.patchNull", + "typetest.property.nullable.operations.BytesOperations.get_non_null": "Type.Property.Nullable.Bytes.getNonNull", + "typetest.property.nullable.aio.operations.BytesOperations.get_non_null": "Type.Property.Nullable.Bytes.getNonNull", + "typetest.property.nullable.operations.BytesOperations.get_null": "Type.Property.Nullable.Bytes.getNull", + "typetest.property.nullable.aio.operations.BytesOperations.get_null": "Type.Property.Nullable.Bytes.getNull", + "typetest.property.nullable.operations.BytesOperations.patch_non_null": "Type.Property.Nullable.Bytes.patchNonNull", + "typetest.property.nullable.aio.operations.BytesOperations.patch_non_null": "Type.Property.Nullable.Bytes.patchNonNull", + "typetest.property.nullable.operations.BytesOperations.patch_null": "Type.Property.Nullable.Bytes.patchNull", + "typetest.property.nullable.aio.operations.BytesOperations.patch_null": "Type.Property.Nullable.Bytes.patchNull", + "typetest.property.nullable.operations.DatetimeOperations.get_non_null": "Type.Property.Nullable.Datetime.getNonNull", + "typetest.property.nullable.aio.operations.DatetimeOperations.get_non_null": "Type.Property.Nullable.Datetime.getNonNull", + "typetest.property.nullable.operations.DatetimeOperations.get_null": "Type.Property.Nullable.Datetime.getNull", + "typetest.property.nullable.aio.operations.DatetimeOperations.get_null": "Type.Property.Nullable.Datetime.getNull", + "typetest.property.nullable.operations.DatetimeOperations.patch_non_null": "Type.Property.Nullable.Datetime.patchNonNull", + "typetest.property.nullable.aio.operations.DatetimeOperations.patch_non_null": "Type.Property.Nullable.Datetime.patchNonNull", + "typetest.property.nullable.operations.DatetimeOperations.patch_null": "Type.Property.Nullable.Datetime.patchNull", + "typetest.property.nullable.aio.operations.DatetimeOperations.patch_null": "Type.Property.Nullable.Datetime.patchNull", + "typetest.property.nullable.operations.DurationOperations.get_non_null": "Type.Property.Nullable.Duration.getNonNull", + "typetest.property.nullable.aio.operations.DurationOperations.get_non_null": "Type.Property.Nullable.Duration.getNonNull", + "typetest.property.nullable.operations.DurationOperations.get_null": "Type.Property.Nullable.Duration.getNull", + "typetest.property.nullable.aio.operations.DurationOperations.get_null": "Type.Property.Nullable.Duration.getNull", + "typetest.property.nullable.operations.DurationOperations.patch_non_null": "Type.Property.Nullable.Duration.patchNonNull", + "typetest.property.nullable.aio.operations.DurationOperations.patch_non_null": "Type.Property.Nullable.Duration.patchNonNull", + "typetest.property.nullable.operations.DurationOperations.patch_null": "Type.Property.Nullable.Duration.patchNull", + "typetest.property.nullable.aio.operations.DurationOperations.patch_null": "Type.Property.Nullable.Duration.patchNull", + "typetest.property.nullable.operations.CollectionsByteOperations.get_non_null": "Type.Property.Nullable.CollectionsByte.getNonNull", + "typetest.property.nullable.aio.operations.CollectionsByteOperations.get_non_null": "Type.Property.Nullable.CollectionsByte.getNonNull", + "typetest.property.nullable.operations.CollectionsByteOperations.get_null": "Type.Property.Nullable.CollectionsByte.getNull", + "typetest.property.nullable.aio.operations.CollectionsByteOperations.get_null": "Type.Property.Nullable.CollectionsByte.getNull", + "typetest.property.nullable.operations.CollectionsByteOperations.patch_non_null": "Type.Property.Nullable.CollectionsByte.patchNonNull", + "typetest.property.nullable.aio.operations.CollectionsByteOperations.patch_non_null": "Type.Property.Nullable.CollectionsByte.patchNonNull", + "typetest.property.nullable.operations.CollectionsByteOperations.patch_null": "Type.Property.Nullable.CollectionsByte.patchNull", + "typetest.property.nullable.aio.operations.CollectionsByteOperations.patch_null": "Type.Property.Nullable.CollectionsByte.patchNull", + "typetest.property.nullable.operations.CollectionsModelOperations.get_non_null": "Type.Property.Nullable.CollectionsModel.getNonNull", + "typetest.property.nullable.aio.operations.CollectionsModelOperations.get_non_null": "Type.Property.Nullable.CollectionsModel.getNonNull", + "typetest.property.nullable.operations.CollectionsModelOperations.get_null": "Type.Property.Nullable.CollectionsModel.getNull", + "typetest.property.nullable.aio.operations.CollectionsModelOperations.get_null": "Type.Property.Nullable.CollectionsModel.getNull", + "typetest.property.nullable.operations.CollectionsModelOperations.patch_non_null": "Type.Property.Nullable.CollectionsModel.patchNonNull", + "typetest.property.nullable.aio.operations.CollectionsModelOperations.patch_non_null": "Type.Property.Nullable.CollectionsModel.patchNonNull", + "typetest.property.nullable.operations.CollectionsModelOperations.patch_null": "Type.Property.Nullable.CollectionsModel.patchNull", + "typetest.property.nullable.aio.operations.CollectionsModelOperations.patch_null": "Type.Property.Nullable.CollectionsModel.patchNull", + "typetest.property.nullable.operations.CollectionsStringOperations.get_non_null": "Type.Property.Nullable.CollectionsString.getNonNull", + "typetest.property.nullable.aio.operations.CollectionsStringOperations.get_non_null": "Type.Property.Nullable.CollectionsString.getNonNull", + "typetest.property.nullable.operations.CollectionsStringOperations.get_null": "Type.Property.Nullable.CollectionsString.getNull", + "typetest.property.nullable.aio.operations.CollectionsStringOperations.get_null": "Type.Property.Nullable.CollectionsString.getNull", + "typetest.property.nullable.operations.CollectionsStringOperations.patch_non_null": "Type.Property.Nullable.CollectionsString.patchNonNull", + "typetest.property.nullable.aio.operations.CollectionsStringOperations.patch_non_null": "Type.Property.Nullable.CollectionsString.patchNonNull", + "typetest.property.nullable.operations.CollectionsStringOperations.patch_null": "Type.Property.Nullable.CollectionsString.patchNull", + "typetest.property.nullable.aio.operations.CollectionsStringOperations.patch_null": "Type.Property.Nullable.CollectionsString.patchNull" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/apiview-properties.json index 3dedf9858c1..159c153dfb7 100644 --- a/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/apiview-properties.json @@ -34,63 +34,121 @@ "typetest.property.valuetypes.models.FixedInnerEnum": "Type.Property.ValueTypes.FixedInnerEnum", "typetest.property.valuetypes.models.InnerEnum": "Type.Property.ValueTypes.InnerEnum", "typetest.property.valuetypes.models.ExtendedEnum": "Type.Property.ValueTypes.ExtendedEnum", - "typetest.property.valuetypes.ValueTypesClient.boolean.get": "Type.Property.ValueTypes.Boolean.get", - "typetest.property.valuetypes.ValueTypesClient.boolean.put": "Type.Property.ValueTypes.Boolean.put", - "typetest.property.valuetypes.ValueTypesClient.string.get": "Type.Property.ValueTypes.String.get", - "typetest.property.valuetypes.ValueTypesClient.string.put": "Type.Property.ValueTypes.String.put", - "typetest.property.valuetypes.ValueTypesClient.bytes.get": "Type.Property.ValueTypes.Bytes.get", - "typetest.property.valuetypes.ValueTypesClient.bytes.put": "Type.Property.ValueTypes.Bytes.put", - "typetest.property.valuetypes.ValueTypesClient.int_operations.get": "Type.Property.ValueTypes.Int.get", - "typetest.property.valuetypes.ValueTypesClient.int_operations.put": "Type.Property.ValueTypes.Int.put", - "typetest.property.valuetypes.ValueTypesClient.float.get": "Type.Property.ValueTypes.Float.get", - "typetest.property.valuetypes.ValueTypesClient.float.put": "Type.Property.ValueTypes.Float.put", - "typetest.property.valuetypes.ValueTypesClient.decimal.get": "Type.Property.ValueTypes.Decimal.get", - "typetest.property.valuetypes.ValueTypesClient.decimal.put": "Type.Property.ValueTypes.Decimal.put", - "typetest.property.valuetypes.ValueTypesClient.decimal128.get": "Type.Property.ValueTypes.Decimal128.get", - "typetest.property.valuetypes.ValueTypesClient.decimal128.put": "Type.Property.ValueTypes.Decimal128.put", - "typetest.property.valuetypes.ValueTypesClient.datetime.get": "Type.Property.ValueTypes.Datetime.get", - "typetest.property.valuetypes.ValueTypesClient.datetime.put": "Type.Property.ValueTypes.Datetime.put", - "typetest.property.valuetypes.ValueTypesClient.duration.get": "Type.Property.ValueTypes.Duration.get", - "typetest.property.valuetypes.ValueTypesClient.duration.put": "Type.Property.ValueTypes.Duration.put", - "typetest.property.valuetypes.ValueTypesClient.enum.get": "Type.Property.ValueTypes.Enum.get", - "typetest.property.valuetypes.ValueTypesClient.enum.put": "Type.Property.ValueTypes.Enum.put", - "typetest.property.valuetypes.ValueTypesClient.extensible_enum.get": "Type.Property.ValueTypes.ExtensibleEnum.get", - "typetest.property.valuetypes.ValueTypesClient.extensible_enum.put": "Type.Property.ValueTypes.ExtensibleEnum.put", - "typetest.property.valuetypes.ValueTypesClient.model.get": "Type.Property.ValueTypes.Model.get", - "typetest.property.valuetypes.ValueTypesClient.model.put": "Type.Property.ValueTypes.Model.put", - "typetest.property.valuetypes.ValueTypesClient.collections_string.get": "Type.Property.ValueTypes.CollectionsString.get", - "typetest.property.valuetypes.ValueTypesClient.collections_string.put": "Type.Property.ValueTypes.CollectionsString.put", - "typetest.property.valuetypes.ValueTypesClient.collections_int.get": "Type.Property.ValueTypes.CollectionsInt.get", - "typetest.property.valuetypes.ValueTypesClient.collections_int.put": "Type.Property.ValueTypes.CollectionsInt.put", - "typetest.property.valuetypes.ValueTypesClient.collections_model.get": "Type.Property.ValueTypes.CollectionsModel.get", - "typetest.property.valuetypes.ValueTypesClient.collections_model.put": "Type.Property.ValueTypes.CollectionsModel.put", - "typetest.property.valuetypes.ValueTypesClient.dictionary_string.get": "Type.Property.ValueTypes.DictionaryString.get", - "typetest.property.valuetypes.ValueTypesClient.dictionary_string.put": "Type.Property.ValueTypes.DictionaryString.put", - "typetest.property.valuetypes.ValueTypesClient.never.get": "Type.Property.ValueTypes.Never.get", - "typetest.property.valuetypes.ValueTypesClient.never.put": "Type.Property.ValueTypes.Never.put", - "typetest.property.valuetypes.ValueTypesClient.unknown_string.get": "Type.Property.ValueTypes.UnknownString.get", - "typetest.property.valuetypes.ValueTypesClient.unknown_string.put": "Type.Property.ValueTypes.UnknownString.put", - "typetest.property.valuetypes.ValueTypesClient.unknown_int.get": "Type.Property.ValueTypes.UnknownInt.get", - "typetest.property.valuetypes.ValueTypesClient.unknown_int.put": "Type.Property.ValueTypes.UnknownInt.put", - "typetest.property.valuetypes.ValueTypesClient.unknown_dict.get": "Type.Property.ValueTypes.UnknownDict.get", - "typetest.property.valuetypes.ValueTypesClient.unknown_dict.put": "Type.Property.ValueTypes.UnknownDict.put", - "typetest.property.valuetypes.ValueTypesClient.unknown_array.get": "Type.Property.ValueTypes.UnknownArray.get", - "typetest.property.valuetypes.ValueTypesClient.unknown_array.put": "Type.Property.ValueTypes.UnknownArray.put", - "typetest.property.valuetypes.ValueTypesClient.string_literal.get": "Type.Property.ValueTypes.StringLiteral.get", - "typetest.property.valuetypes.ValueTypesClient.string_literal.put": "Type.Property.ValueTypes.StringLiteral.put", - "typetest.property.valuetypes.ValueTypesClient.int_literal.get": "Type.Property.ValueTypes.IntLiteral.get", - "typetest.property.valuetypes.ValueTypesClient.int_literal.put": "Type.Property.ValueTypes.IntLiteral.put", - "typetest.property.valuetypes.ValueTypesClient.float_literal.get": "Type.Property.ValueTypes.FloatLiteral.get", - "typetest.property.valuetypes.ValueTypesClient.float_literal.put": "Type.Property.ValueTypes.FloatLiteral.put", - "typetest.property.valuetypes.ValueTypesClient.boolean_literal.get": "Type.Property.ValueTypes.BooleanLiteral.get", - "typetest.property.valuetypes.ValueTypesClient.boolean_literal.put": "Type.Property.ValueTypes.BooleanLiteral.put", - "typetest.property.valuetypes.ValueTypesClient.union_string_literal.get": "Type.Property.ValueTypes.UnionStringLiteral.get", - "typetest.property.valuetypes.ValueTypesClient.union_string_literal.put": "Type.Property.ValueTypes.UnionStringLiteral.put", - "typetest.property.valuetypes.ValueTypesClient.union_int_literal.get": "Type.Property.ValueTypes.UnionIntLiteral.get", - "typetest.property.valuetypes.ValueTypesClient.union_int_literal.put": "Type.Property.ValueTypes.UnionIntLiteral.put", - "typetest.property.valuetypes.ValueTypesClient.union_float_literal.get": "Type.Property.ValueTypes.UnionFloatLiteral.get", - "typetest.property.valuetypes.ValueTypesClient.union_float_literal.put": "Type.Property.ValueTypes.UnionFloatLiteral.put", - "typetest.property.valuetypes.ValueTypesClient.union_enum_value.get": "Type.Property.ValueTypes.UnionEnumValue.get", - "typetest.property.valuetypes.ValueTypesClient.union_enum_value.put": "Type.Property.ValueTypes.UnionEnumValue.put" + "typetest.property.valuetypes.operations.BooleanOperations.get": "Type.Property.ValueTypes.Boolean.get", + "typetest.property.valuetypes.aio.operations.BooleanOperations.get": "Type.Property.ValueTypes.Boolean.get", + "typetest.property.valuetypes.operations.BooleanOperations.put": "Type.Property.ValueTypes.Boolean.put", + "typetest.property.valuetypes.aio.operations.BooleanOperations.put": "Type.Property.ValueTypes.Boolean.put", + "typetest.property.valuetypes.operations.StringOperations.get": "Type.Property.ValueTypes.String.get", + "typetest.property.valuetypes.aio.operations.StringOperations.get": "Type.Property.ValueTypes.String.get", + "typetest.property.valuetypes.operations.StringOperations.put": "Type.Property.ValueTypes.String.put", + "typetest.property.valuetypes.aio.operations.StringOperations.put": "Type.Property.ValueTypes.String.put", + "typetest.property.valuetypes.operations.BytesOperations.get": "Type.Property.ValueTypes.Bytes.get", + "typetest.property.valuetypes.aio.operations.BytesOperations.get": "Type.Property.ValueTypes.Bytes.get", + "typetest.property.valuetypes.operations.BytesOperations.put": "Type.Property.ValueTypes.Bytes.put", + "typetest.property.valuetypes.aio.operations.BytesOperations.put": "Type.Property.ValueTypes.Bytes.put", + "typetest.property.valuetypes.operations.IntOperations.get": "Type.Property.ValueTypes.Int.get", + "typetest.property.valuetypes.aio.operations.IntOperations.get": "Type.Property.ValueTypes.Int.get", + "typetest.property.valuetypes.operations.IntOperations.put": "Type.Property.ValueTypes.Int.put", + "typetest.property.valuetypes.aio.operations.IntOperations.put": "Type.Property.ValueTypes.Int.put", + "typetest.property.valuetypes.operations.FloatOperations.get": "Type.Property.ValueTypes.Float.get", + "typetest.property.valuetypes.aio.operations.FloatOperations.get": "Type.Property.ValueTypes.Float.get", + "typetest.property.valuetypes.operations.FloatOperations.put": "Type.Property.ValueTypes.Float.put", + "typetest.property.valuetypes.aio.operations.FloatOperations.put": "Type.Property.ValueTypes.Float.put", + "typetest.property.valuetypes.operations.DecimalOperations.get": "Type.Property.ValueTypes.Decimal.get", + "typetest.property.valuetypes.aio.operations.DecimalOperations.get": "Type.Property.ValueTypes.Decimal.get", + "typetest.property.valuetypes.operations.DecimalOperations.put": "Type.Property.ValueTypes.Decimal.put", + "typetest.property.valuetypes.aio.operations.DecimalOperations.put": "Type.Property.ValueTypes.Decimal.put", + "typetest.property.valuetypes.operations.Decimal128Operations.get": "Type.Property.ValueTypes.Decimal128.get", + "typetest.property.valuetypes.aio.operations.Decimal128Operations.get": "Type.Property.ValueTypes.Decimal128.get", + "typetest.property.valuetypes.operations.Decimal128Operations.put": "Type.Property.ValueTypes.Decimal128.put", + "typetest.property.valuetypes.aio.operations.Decimal128Operations.put": "Type.Property.ValueTypes.Decimal128.put", + "typetest.property.valuetypes.operations.DatetimeOperations.get": "Type.Property.ValueTypes.Datetime.get", + "typetest.property.valuetypes.aio.operations.DatetimeOperations.get": "Type.Property.ValueTypes.Datetime.get", + "typetest.property.valuetypes.operations.DatetimeOperations.put": "Type.Property.ValueTypes.Datetime.put", + "typetest.property.valuetypes.aio.operations.DatetimeOperations.put": "Type.Property.ValueTypes.Datetime.put", + "typetest.property.valuetypes.operations.DurationOperations.get": "Type.Property.ValueTypes.Duration.get", + "typetest.property.valuetypes.aio.operations.DurationOperations.get": "Type.Property.ValueTypes.Duration.get", + "typetest.property.valuetypes.operations.DurationOperations.put": "Type.Property.ValueTypes.Duration.put", + "typetest.property.valuetypes.aio.operations.DurationOperations.put": "Type.Property.ValueTypes.Duration.put", + "typetest.property.valuetypes.operations.EnumOperations.get": "Type.Property.ValueTypes.Enum.get", + "typetest.property.valuetypes.aio.operations.EnumOperations.get": "Type.Property.ValueTypes.Enum.get", + "typetest.property.valuetypes.operations.EnumOperations.put": "Type.Property.ValueTypes.Enum.put", + "typetest.property.valuetypes.aio.operations.EnumOperations.put": "Type.Property.ValueTypes.Enum.put", + "typetest.property.valuetypes.operations.ExtensibleEnumOperations.get": "Type.Property.ValueTypes.ExtensibleEnum.get", + "typetest.property.valuetypes.aio.operations.ExtensibleEnumOperations.get": "Type.Property.ValueTypes.ExtensibleEnum.get", + "typetest.property.valuetypes.operations.ExtensibleEnumOperations.put": "Type.Property.ValueTypes.ExtensibleEnum.put", + "typetest.property.valuetypes.aio.operations.ExtensibleEnumOperations.put": "Type.Property.ValueTypes.ExtensibleEnum.put", + "typetest.property.valuetypes.operations.ModelOperations.get": "Type.Property.ValueTypes.Model.get", + "typetest.property.valuetypes.aio.operations.ModelOperations.get": "Type.Property.ValueTypes.Model.get", + "typetest.property.valuetypes.operations.ModelOperations.put": "Type.Property.ValueTypes.Model.put", + "typetest.property.valuetypes.aio.operations.ModelOperations.put": "Type.Property.ValueTypes.Model.put", + "typetest.property.valuetypes.operations.CollectionsStringOperations.get": "Type.Property.ValueTypes.CollectionsString.get", + "typetest.property.valuetypes.aio.operations.CollectionsStringOperations.get": "Type.Property.ValueTypes.CollectionsString.get", + "typetest.property.valuetypes.operations.CollectionsStringOperations.put": "Type.Property.ValueTypes.CollectionsString.put", + "typetest.property.valuetypes.aio.operations.CollectionsStringOperations.put": "Type.Property.ValueTypes.CollectionsString.put", + "typetest.property.valuetypes.operations.CollectionsIntOperations.get": "Type.Property.ValueTypes.CollectionsInt.get", + "typetest.property.valuetypes.aio.operations.CollectionsIntOperations.get": "Type.Property.ValueTypes.CollectionsInt.get", + "typetest.property.valuetypes.operations.CollectionsIntOperations.put": "Type.Property.ValueTypes.CollectionsInt.put", + "typetest.property.valuetypes.aio.operations.CollectionsIntOperations.put": "Type.Property.ValueTypes.CollectionsInt.put", + "typetest.property.valuetypes.operations.CollectionsModelOperations.get": "Type.Property.ValueTypes.CollectionsModel.get", + "typetest.property.valuetypes.aio.operations.CollectionsModelOperations.get": "Type.Property.ValueTypes.CollectionsModel.get", + "typetest.property.valuetypes.operations.CollectionsModelOperations.put": "Type.Property.ValueTypes.CollectionsModel.put", + "typetest.property.valuetypes.aio.operations.CollectionsModelOperations.put": "Type.Property.ValueTypes.CollectionsModel.put", + "typetest.property.valuetypes.operations.DictionaryStringOperations.get": "Type.Property.ValueTypes.DictionaryString.get", + "typetest.property.valuetypes.aio.operations.DictionaryStringOperations.get": "Type.Property.ValueTypes.DictionaryString.get", + "typetest.property.valuetypes.operations.DictionaryStringOperations.put": "Type.Property.ValueTypes.DictionaryString.put", + "typetest.property.valuetypes.aio.operations.DictionaryStringOperations.put": "Type.Property.ValueTypes.DictionaryString.put", + "typetest.property.valuetypes.operations.NeverOperations.get": "Type.Property.ValueTypes.Never.get", + "typetest.property.valuetypes.aio.operations.NeverOperations.get": "Type.Property.ValueTypes.Never.get", + "typetest.property.valuetypes.operations.NeverOperations.put": "Type.Property.ValueTypes.Never.put", + "typetest.property.valuetypes.aio.operations.NeverOperations.put": "Type.Property.ValueTypes.Never.put", + "typetest.property.valuetypes.operations.UnknownStringOperations.get": "Type.Property.ValueTypes.UnknownString.get", + "typetest.property.valuetypes.aio.operations.UnknownStringOperations.get": "Type.Property.ValueTypes.UnknownString.get", + "typetest.property.valuetypes.operations.UnknownStringOperations.put": "Type.Property.ValueTypes.UnknownString.put", + "typetest.property.valuetypes.aio.operations.UnknownStringOperations.put": "Type.Property.ValueTypes.UnknownString.put", + "typetest.property.valuetypes.operations.UnknownIntOperations.get": "Type.Property.ValueTypes.UnknownInt.get", + "typetest.property.valuetypes.aio.operations.UnknownIntOperations.get": "Type.Property.ValueTypes.UnknownInt.get", + "typetest.property.valuetypes.operations.UnknownIntOperations.put": "Type.Property.ValueTypes.UnknownInt.put", + "typetest.property.valuetypes.aio.operations.UnknownIntOperations.put": "Type.Property.ValueTypes.UnknownInt.put", + "typetest.property.valuetypes.operations.UnknownDictOperations.get": "Type.Property.ValueTypes.UnknownDict.get", + "typetest.property.valuetypes.aio.operations.UnknownDictOperations.get": "Type.Property.ValueTypes.UnknownDict.get", + "typetest.property.valuetypes.operations.UnknownDictOperations.put": "Type.Property.ValueTypes.UnknownDict.put", + "typetest.property.valuetypes.aio.operations.UnknownDictOperations.put": "Type.Property.ValueTypes.UnknownDict.put", + "typetest.property.valuetypes.operations.UnknownArrayOperations.get": "Type.Property.ValueTypes.UnknownArray.get", + "typetest.property.valuetypes.aio.operations.UnknownArrayOperations.get": "Type.Property.ValueTypes.UnknownArray.get", + "typetest.property.valuetypes.operations.UnknownArrayOperations.put": "Type.Property.ValueTypes.UnknownArray.put", + "typetest.property.valuetypes.aio.operations.UnknownArrayOperations.put": "Type.Property.ValueTypes.UnknownArray.put", + "typetest.property.valuetypes.operations.StringLiteralOperations.get": "Type.Property.ValueTypes.StringLiteral.get", + "typetest.property.valuetypes.aio.operations.StringLiteralOperations.get": "Type.Property.ValueTypes.StringLiteral.get", + "typetest.property.valuetypes.operations.StringLiteralOperations.put": "Type.Property.ValueTypes.StringLiteral.put", + "typetest.property.valuetypes.aio.operations.StringLiteralOperations.put": "Type.Property.ValueTypes.StringLiteral.put", + "typetest.property.valuetypes.operations.IntLiteralOperations.get": "Type.Property.ValueTypes.IntLiteral.get", + "typetest.property.valuetypes.aio.operations.IntLiteralOperations.get": "Type.Property.ValueTypes.IntLiteral.get", + "typetest.property.valuetypes.operations.IntLiteralOperations.put": "Type.Property.ValueTypes.IntLiteral.put", + "typetest.property.valuetypes.aio.operations.IntLiteralOperations.put": "Type.Property.ValueTypes.IntLiteral.put", + "typetest.property.valuetypes.operations.FloatLiteralOperations.get": "Type.Property.ValueTypes.FloatLiteral.get", + "typetest.property.valuetypes.aio.operations.FloatLiteralOperations.get": "Type.Property.ValueTypes.FloatLiteral.get", + "typetest.property.valuetypes.operations.FloatLiteralOperations.put": "Type.Property.ValueTypes.FloatLiteral.put", + "typetest.property.valuetypes.aio.operations.FloatLiteralOperations.put": "Type.Property.ValueTypes.FloatLiteral.put", + "typetest.property.valuetypes.operations.BooleanLiteralOperations.get": "Type.Property.ValueTypes.BooleanLiteral.get", + "typetest.property.valuetypes.aio.operations.BooleanLiteralOperations.get": "Type.Property.ValueTypes.BooleanLiteral.get", + "typetest.property.valuetypes.operations.BooleanLiteralOperations.put": "Type.Property.ValueTypes.BooleanLiteral.put", + "typetest.property.valuetypes.aio.operations.BooleanLiteralOperations.put": "Type.Property.ValueTypes.BooleanLiteral.put", + "typetest.property.valuetypes.operations.UnionStringLiteralOperations.get": "Type.Property.ValueTypes.UnionStringLiteral.get", + "typetest.property.valuetypes.aio.operations.UnionStringLiteralOperations.get": "Type.Property.ValueTypes.UnionStringLiteral.get", + "typetest.property.valuetypes.operations.UnionStringLiteralOperations.put": "Type.Property.ValueTypes.UnionStringLiteral.put", + "typetest.property.valuetypes.aio.operations.UnionStringLiteralOperations.put": "Type.Property.ValueTypes.UnionStringLiteral.put", + "typetest.property.valuetypes.operations.UnionIntLiteralOperations.get": "Type.Property.ValueTypes.UnionIntLiteral.get", + "typetest.property.valuetypes.aio.operations.UnionIntLiteralOperations.get": "Type.Property.ValueTypes.UnionIntLiteral.get", + "typetest.property.valuetypes.operations.UnionIntLiteralOperations.put": "Type.Property.ValueTypes.UnionIntLiteral.put", + "typetest.property.valuetypes.aio.operations.UnionIntLiteralOperations.put": "Type.Property.ValueTypes.UnionIntLiteral.put", + "typetest.property.valuetypes.operations.UnionFloatLiteralOperations.get": "Type.Property.ValueTypes.UnionFloatLiteral.get", + "typetest.property.valuetypes.aio.operations.UnionFloatLiteralOperations.get": "Type.Property.ValueTypes.UnionFloatLiteral.get", + "typetest.property.valuetypes.operations.UnionFloatLiteralOperations.put": "Type.Property.ValueTypes.UnionFloatLiteral.put", + "typetest.property.valuetypes.aio.operations.UnionFloatLiteralOperations.put": "Type.Property.ValueTypes.UnionFloatLiteral.put", + "typetest.property.valuetypes.operations.UnionEnumValueOperations.get": "Type.Property.ValueTypes.UnionEnumValue.get", + "typetest.property.valuetypes.aio.operations.UnionEnumValueOperations.get": "Type.Property.ValueTypes.UnionEnumValue.get", + "typetest.property.valuetypes.operations.UnionEnumValueOperations.put": "Type.Property.ValueTypes.UnionEnumValue.put", + "typetest.property.valuetypes.aio.operations.UnionEnumValueOperations.put": "Type.Property.ValueTypes.UnionEnumValue.put" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-scalar/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-scalar/apiview-properties.json index b1fe8917acc..aab6c2e96ba 100644 --- a/packages/typespec-python/test/azure/generated/typetest-scalar/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-scalar/apiview-properties.json @@ -1,21 +1,37 @@ { "CrossLanguagePackageId": "Type.Scalar", "CrossLanguageDefinitionId": { - "typetest.scalar.ScalarClient.string.get": "Type.Scalar.String.get", - "typetest.scalar.ScalarClient.string.put": "Type.Scalar.String.put", - "typetest.scalar.ScalarClient.boolean.get": "Type.Scalar.Boolean.get", - "typetest.scalar.ScalarClient.boolean.put": "Type.Scalar.Boolean.put", - "typetest.scalar.ScalarClient.unknown.get": "Type.Scalar.Unknown.get", - "typetest.scalar.ScalarClient.unknown.put": "Type.Scalar.Unknown.put", - "typetest.scalar.ScalarClient.decimal_type.response_body": "Type.Scalar.DecimalType.responseBody", - "typetest.scalar.ScalarClient.decimal_type.request_body": "Type.Scalar.DecimalType.requestBody", - "typetest.scalar.ScalarClient.decimal_type.request_parameter": "Type.Scalar.DecimalType.requestParameter", - "typetest.scalar.ScalarClient.decimal128_type.response_body": "Type.Scalar.Decimal128Type.responseBody", - "typetest.scalar.ScalarClient.decimal128_type.request_body": "Type.Scalar.Decimal128Type.requestBody", - "typetest.scalar.ScalarClient.decimal128_type.request_parameter": "Type.Scalar.Decimal128Type.requestParameter", - "typetest.scalar.ScalarClient.decimal_verify.prepare_verify": "Type.Scalar.DecimalVerify.prepareVerify", - "typetest.scalar.ScalarClient.decimal_verify.verify": "Type.Scalar.DecimalVerify.verify", - "typetest.scalar.ScalarClient.decimal128_verify.prepare_verify": "Type.Scalar.Decimal128Verify.prepareVerify", - "typetest.scalar.ScalarClient.decimal128_verify.verify": "Type.Scalar.Decimal128Verify.verify" + "typetest.scalar.operations.StringOperations.get": "Type.Scalar.String.get", + "typetest.scalar.aio.operations.StringOperations.get": "Type.Scalar.String.get", + "typetest.scalar.operations.StringOperations.put": "Type.Scalar.String.put", + "typetest.scalar.aio.operations.StringOperations.put": "Type.Scalar.String.put", + "typetest.scalar.operations.BooleanOperations.get": "Type.Scalar.Boolean.get", + "typetest.scalar.aio.operations.BooleanOperations.get": "Type.Scalar.Boolean.get", + "typetest.scalar.operations.BooleanOperations.put": "Type.Scalar.Boolean.put", + "typetest.scalar.aio.operations.BooleanOperations.put": "Type.Scalar.Boolean.put", + "typetest.scalar.operations.UnknownOperations.get": "Type.Scalar.Unknown.get", + "typetest.scalar.aio.operations.UnknownOperations.get": "Type.Scalar.Unknown.get", + "typetest.scalar.operations.UnknownOperations.put": "Type.Scalar.Unknown.put", + "typetest.scalar.aio.operations.UnknownOperations.put": "Type.Scalar.Unknown.put", + "typetest.scalar.operations.DecimalTypeOperations.response_body": "Type.Scalar.DecimalType.responseBody", + "typetest.scalar.aio.operations.DecimalTypeOperations.response_body": "Type.Scalar.DecimalType.responseBody", + "typetest.scalar.operations.DecimalTypeOperations.request_body": "Type.Scalar.DecimalType.requestBody", + "typetest.scalar.aio.operations.DecimalTypeOperations.request_body": "Type.Scalar.DecimalType.requestBody", + "typetest.scalar.operations.DecimalTypeOperations.request_parameter": "Type.Scalar.DecimalType.requestParameter", + "typetest.scalar.aio.operations.DecimalTypeOperations.request_parameter": "Type.Scalar.DecimalType.requestParameter", + "typetest.scalar.operations.Decimal128TypeOperations.response_body": "Type.Scalar.Decimal128Type.responseBody", + "typetest.scalar.aio.operations.Decimal128TypeOperations.response_body": "Type.Scalar.Decimal128Type.responseBody", + "typetest.scalar.operations.Decimal128TypeOperations.request_body": "Type.Scalar.Decimal128Type.requestBody", + "typetest.scalar.aio.operations.Decimal128TypeOperations.request_body": "Type.Scalar.Decimal128Type.requestBody", + "typetest.scalar.operations.Decimal128TypeOperations.request_parameter": "Type.Scalar.Decimal128Type.requestParameter", + "typetest.scalar.aio.operations.Decimal128TypeOperations.request_parameter": "Type.Scalar.Decimal128Type.requestParameter", + "typetest.scalar.operations.DecimalVerifyOperations.prepare_verify": "Type.Scalar.DecimalVerify.prepareVerify", + "typetest.scalar.aio.operations.DecimalVerifyOperations.prepare_verify": "Type.Scalar.DecimalVerify.prepareVerify", + "typetest.scalar.operations.DecimalVerifyOperations.verify": "Type.Scalar.DecimalVerify.verify", + "typetest.scalar.aio.operations.DecimalVerifyOperations.verify": "Type.Scalar.DecimalVerify.verify", + "typetest.scalar.operations.Decimal128VerifyOperations.prepare_verify": "Type.Scalar.Decimal128Verify.prepareVerify", + "typetest.scalar.aio.operations.Decimal128VerifyOperations.prepare_verify": "Type.Scalar.Decimal128Verify.prepareVerify", + "typetest.scalar.operations.Decimal128VerifyOperations.verify": "Type.Scalar.Decimal128Verify.verify", + "typetest.scalar.aio.operations.Decimal128VerifyOperations.verify": "Type.Scalar.Decimal128Verify.verify" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-union/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-union/apiview-properties.json index a4ddeed3ca1..b5847de2fd0 100644 --- a/packages/typespec-python/test/azure/generated/typetest-union/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/typetest-union/apiview-properties.json @@ -18,25 +18,45 @@ "typetest.union.models.MixedTypesCases": "Type.Union.MixedTypesCases", "typetest.union.models.StringAndArrayCases": "Type.Union.StringAndArrayCases", "typetest.union.models.StringExtensibleNamedUnion": "Type.Union.StringExtensibleNamedUnion", - "typetest.union.UnionClient.strings_only.get": "Type.Union.StringsOnly.get", - "typetest.union.UnionClient.strings_only.send": "Type.Union.StringsOnly.send", - "typetest.union.UnionClient.string_extensible.get": "Type.Union.StringExtensible.get", - "typetest.union.UnionClient.string_extensible.send": "Type.Union.StringExtensible.send", - "typetest.union.UnionClient.string_extensible_named.get": "Type.Union.StringExtensibleNamed.get", - "typetest.union.UnionClient.string_extensible_named.send": "Type.Union.StringExtensibleNamed.send", - "typetest.union.UnionClient.ints_only.get": "Type.Union.IntsOnly.get", - "typetest.union.UnionClient.ints_only.send": "Type.Union.IntsOnly.send", - "typetest.union.UnionClient.floats_only.get": "Type.Union.FloatsOnly.get", - "typetest.union.UnionClient.floats_only.send": "Type.Union.FloatsOnly.send", - "typetest.union.UnionClient.models_only.get": "Type.Union.ModelsOnly.get", - "typetest.union.UnionClient.models_only.send": "Type.Union.ModelsOnly.send", - "typetest.union.UnionClient.enums_only.get": "Type.Union.EnumsOnly.get", - "typetest.union.UnionClient.enums_only.send": "Type.Union.EnumsOnly.send", - "typetest.union.UnionClient.string_and_array.get": "Type.Union.StringAndArray.get", - "typetest.union.UnionClient.string_and_array.send": "Type.Union.StringAndArray.send", - "typetest.union.UnionClient.mixed_literals.get": "Type.Union.MixedLiterals.get", - "typetest.union.UnionClient.mixed_literals.send": "Type.Union.MixedLiterals.send", - "typetest.union.UnionClient.mixed_types.get": "Type.Union.MixedTypes.get", - "typetest.union.UnionClient.mixed_types.send": "Type.Union.MixedTypes.send" + "typetest.union.operations.StringsOnlyOperations.get": "Type.Union.StringsOnly.get", + "typetest.union.aio.operations.StringsOnlyOperations.get": "Type.Union.StringsOnly.get", + "typetest.union.operations.StringsOnlyOperations.send": "Type.Union.StringsOnly.send", + "typetest.union.aio.operations.StringsOnlyOperations.send": "Type.Union.StringsOnly.send", + "typetest.union.operations.StringExtensibleOperations.get": "Type.Union.StringExtensible.get", + "typetest.union.aio.operations.StringExtensibleOperations.get": "Type.Union.StringExtensible.get", + "typetest.union.operations.StringExtensibleOperations.send": "Type.Union.StringExtensible.send", + "typetest.union.aio.operations.StringExtensibleOperations.send": "Type.Union.StringExtensible.send", + "typetest.union.operations.StringExtensibleNamedOperations.get": "Type.Union.StringExtensibleNamed.get", + "typetest.union.aio.operations.StringExtensibleNamedOperations.get": "Type.Union.StringExtensibleNamed.get", + "typetest.union.operations.StringExtensibleNamedOperations.send": "Type.Union.StringExtensibleNamed.send", + "typetest.union.aio.operations.StringExtensibleNamedOperations.send": "Type.Union.StringExtensibleNamed.send", + "typetest.union.operations.IntsOnlyOperations.get": "Type.Union.IntsOnly.get", + "typetest.union.aio.operations.IntsOnlyOperations.get": "Type.Union.IntsOnly.get", + "typetest.union.operations.IntsOnlyOperations.send": "Type.Union.IntsOnly.send", + "typetest.union.aio.operations.IntsOnlyOperations.send": "Type.Union.IntsOnly.send", + "typetest.union.operations.FloatsOnlyOperations.get": "Type.Union.FloatsOnly.get", + "typetest.union.aio.operations.FloatsOnlyOperations.get": "Type.Union.FloatsOnly.get", + "typetest.union.operations.FloatsOnlyOperations.send": "Type.Union.FloatsOnly.send", + "typetest.union.aio.operations.FloatsOnlyOperations.send": "Type.Union.FloatsOnly.send", + "typetest.union.operations.ModelsOnlyOperations.get": "Type.Union.ModelsOnly.get", + "typetest.union.aio.operations.ModelsOnlyOperations.get": "Type.Union.ModelsOnly.get", + "typetest.union.operations.ModelsOnlyOperations.send": "Type.Union.ModelsOnly.send", + "typetest.union.aio.operations.ModelsOnlyOperations.send": "Type.Union.ModelsOnly.send", + "typetest.union.operations.EnumsOnlyOperations.get": "Type.Union.EnumsOnly.get", + "typetest.union.aio.operations.EnumsOnlyOperations.get": "Type.Union.EnumsOnly.get", + "typetest.union.operations.EnumsOnlyOperations.send": "Type.Union.EnumsOnly.send", + "typetest.union.aio.operations.EnumsOnlyOperations.send": "Type.Union.EnumsOnly.send", + "typetest.union.operations.StringAndArrayOperations.get": "Type.Union.StringAndArray.get", + "typetest.union.aio.operations.StringAndArrayOperations.get": "Type.Union.StringAndArray.get", + "typetest.union.operations.StringAndArrayOperations.send": "Type.Union.StringAndArray.send", + "typetest.union.aio.operations.StringAndArrayOperations.send": "Type.Union.StringAndArray.send", + "typetest.union.operations.MixedLiteralsOperations.get": "Type.Union.MixedLiterals.get", + "typetest.union.aio.operations.MixedLiteralsOperations.get": "Type.Union.MixedLiterals.get", + "typetest.union.operations.MixedLiteralsOperations.send": "Type.Union.MixedLiterals.send", + "typetest.union.aio.operations.MixedLiteralsOperations.send": "Type.Union.MixedLiterals.send", + "typetest.union.operations.MixedTypesOperations.get": "Type.Union.MixedTypes.get", + "typetest.union.aio.operations.MixedTypesOperations.get": "Type.Union.MixedTypes.get", + "typetest.union.operations.MixedTypesOperations.send": "Type.Union.MixedTypes.send", + "typetest.union.aio.operations.MixedTypesOperations.send": "Type.Union.MixedTypes.send" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/versioning-added/apiview-properties.json b/packages/typespec-python/test/azure/generated/versioning-added/apiview-properties.json index d321897fab4..ebaed00d174 100644 --- a/packages/typespec-python/test/azure/generated/versioning-added/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/versioning-added/apiview-properties.json @@ -6,8 +6,11 @@ "versioning.added.models.Versions": "Versioning.Added.Versions", "versioning.added.models.EnumV2": "Versioning.Added.EnumV2", "versioning.added.models.EnumV1": "Versioning.Added.EnumV1", - "versioning.added.AddedClient.interface_v2.v2_in_interface": "Versioning.Added.InterfaceV2.v2InInterface", + "versioning.added.operations.InterfaceV2Operations.v2_in_interface": "Versioning.Added.InterfaceV2.v2InInterface", + "versioning.added.aio.operations.InterfaceV2Operations.v2_in_interface": "Versioning.Added.InterfaceV2.v2InInterface", "versioning.added.AddedClient.v1": "Versioning.Added.v1", - "versioning.added.AddedClient.v2": "Versioning.Added.v2" + "versioning.added.aio.AddedClient.v1": "Versioning.Added.v1", + "versioning.added.AddedClient.v2": "Versioning.Added.v2", + "versioning.added.aio.AddedClient.v2": "Versioning.Added.v2" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/versioning-removed/apiview-properties.json b/packages/typespec-python/test/azure/generated/versioning-removed/apiview-properties.json index f686bc04843..bab171b24ea 100644 --- a/packages/typespec-python/test/azure/generated/versioning-removed/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/versioning-removed/apiview-properties.json @@ -7,6 +7,8 @@ "versioning.removed.models.EnumV2": "Versioning.Removed.EnumV2", "versioning.removed.models.EnumV3": "Versioning.Removed.EnumV3", "versioning.removed.RemovedClient.v2": "Versioning.Removed.v2", - "versioning.removed.RemovedClient.model_v3": "Versioning.Removed.modelV3" + "versioning.removed.aio.RemovedClient.v2": "Versioning.Removed.v2", + "versioning.removed.RemovedClient.model_v3": "Versioning.Removed.modelV3", + "versioning.removed.aio.RemovedClient.model_v3": "Versioning.Removed.modelV3" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/versioning-renamedfrom/apiview-properties.json b/packages/typespec-python/test/azure/generated/versioning-renamedfrom/apiview-properties.json index 678730c888c..1b134ddfa66 100644 --- a/packages/typespec-python/test/azure/generated/versioning-renamedfrom/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/versioning-renamedfrom/apiview-properties.json @@ -4,7 +4,9 @@ "versioning.renamedfrom.models.NewModel": "Versioning.RenamedFrom.NewModel", "versioning.renamedfrom.models.Versions": "Versioning.RenamedFrom.Versions", "versioning.renamedfrom.models.NewEnum": "Versioning.RenamedFrom.NewEnum", - "versioning.renamedfrom.RenamedFromClient.new_interface.new_op_in_new_interface": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface", - "versioning.renamedfrom.RenamedFromClient.new_op": "Versioning.RenamedFrom.newOp" + "versioning.renamedfrom.operations.NewInterfaceOperations.new_op_in_new_interface": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface", + "versioning.renamedfrom.aio.operations.NewInterfaceOperations.new_op_in_new_interface": "Versioning.RenamedFrom.NewInterface.newOpInNewInterface", + "versioning.renamedfrom.RenamedFromClient.new_op": "Versioning.RenamedFrom.newOp", + "versioning.renamedfrom.aio.RenamedFromClient.new_op": "Versioning.RenamedFrom.newOp" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/versioning-returntypechangedfrom/apiview-properties.json b/packages/typespec-python/test/azure/generated/versioning-returntypechangedfrom/apiview-properties.json index d1196a50db0..34b15cfc896 100644 --- a/packages/typespec-python/test/azure/generated/versioning-returntypechangedfrom/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/versioning-returntypechangedfrom/apiview-properties.json @@ -2,6 +2,7 @@ "CrossLanguagePackageId": "Versioning.ReturnTypeChangedFrom", "CrossLanguageDefinitionId": { "versioning.returntypechangedfrom.models.Versions": "Versioning.ReturnTypeChangedFrom.Versions", - "versioning.returntypechangedfrom.ReturnTypeChangedFromClient.test": "Versioning.ReturnTypeChangedFrom.test" + "versioning.returntypechangedfrom.ReturnTypeChangedFromClient.test": "Versioning.ReturnTypeChangedFrom.test", + "versioning.returntypechangedfrom.aio.ReturnTypeChangedFromClient.test": "Versioning.ReturnTypeChangedFrom.test" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/versioning-typechangedfrom/apiview-properties.json b/packages/typespec-python/test/azure/generated/versioning-typechangedfrom/apiview-properties.json index 3bf66dbd872..384aab6c47d 100644 --- a/packages/typespec-python/test/azure/generated/versioning-typechangedfrom/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/versioning-typechangedfrom/apiview-properties.json @@ -3,6 +3,7 @@ "CrossLanguageDefinitionId": { "versioning.typechangedfrom.models.TestModel": "Versioning.TypeChangedFrom.TestModel", "versioning.typechangedfrom.models.Versions": "Versioning.TypeChangedFrom.Versions", - "versioning.typechangedfrom.TypeChangedFromClient.test": "Versioning.TypeChangedFrom.test" + "versioning.typechangedfrom.TypeChangedFromClient.test": "Versioning.TypeChangedFrom.test", + "versioning.typechangedfrom.aio.TypeChangedFromClient.test": "Versioning.TypeChangedFrom.test" } } \ No newline at end of file