diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json index 97c5e3522ac..81d8a5133f3 100644 --- a/packages/typespec-python/package.json +++ b/packages/typespec-python/package.json @@ -66,7 +66,7 @@ "@azure-tools/typespec-azure-resource-manager": "~0.41.0", "@azure-tools/typespec-autorest": "~0.41.0", "@azure-tools/cadl-ranch-expect": "~0.13.3", - "@azure-tools/cadl-ranch-specs": "~0.32.0", + "@azure-tools/cadl-ranch-specs": "~0.33.0", "@types/js-yaml": "~4.0.5", "@types/mocha": "~10.0.1", "@types/node": "^18.16.3", diff --git a/packages/typespec-python/tasks.py b/packages/typespec-python/tasks.py index 75893ea319f..266e8ff7238 100644 --- a/packages/typespec-python/tasks.py +++ b/packages/typespec-python/tasks.py @@ -59,6 +59,9 @@ "type/model/empty": { "package-name": "typetest-model-empty", }, + "type/model/flatten": { + "package-name": "typetest-model-flatten", + }, "type/model/inheritance/enum-discriminator": { "package-name": "typetest-model-enumdiscriminator", }, diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/MANIFEST.in deleted file mode 100644 index 3da09f9a651..00000000000 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/MANIFEST.in +++ /dev/null @@ -1,7 +0,0 @@ -include *.md -include LICENSE -include type/model/flatten/py.typed -recursive-include tests *.py -recursive-include samples *.py *.md -include type/__init__.py -include type/model/__init__.py \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/apiview_mapping_python.json b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/apiview_mapping_python.json deleted file mode 100644 index d27440c087c..00000000000 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/apiview_mapping_python.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "CrossLanguagePackageId": "Type.Model.Flatten", - "CrossLanguageDefinitionId": { - "type.model.flatten.models.ChildFlattenModel": "Type.Model.Flatten.ChildFlattenModel", - "type.model.flatten.models.ChildModel": "Type.Model.Flatten.ChildModel", - "type.model.flatten.models.FlattenModel": "Type.Model.Flatten.FlattenModel", - "type.model.flatten.models.NestedFlattenModel": "Type.Model.Flatten.NestedFlattenModel", - "type.model.flatten.FlattenClient.put_flatten_model": "putFlattenModel", - "type.model.flatten.FlattenClient.put_nested_flatten_model": "putNestedFlattenModel" - } -} \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/apiview_mapping_python.json b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/apiview_mapping_python.json deleted file mode 100644 index d27440c087c..00000000000 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/apiview_mapping_python.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "CrossLanguagePackageId": "Type.Model.Flatten", - "CrossLanguageDefinitionId": { - "type.model.flatten.models.ChildFlattenModel": "Type.Model.Flatten.ChildFlattenModel", - "type.model.flatten.models.ChildModel": "Type.Model.Flatten.ChildModel", - "type.model.flatten.models.FlattenModel": "Type.Model.Flatten.FlattenModel", - "type.model.flatten.models.NestedFlattenModel": "Type.Model.Flatten.NestedFlattenModel", - "type.model.flatten.FlattenClient.put_flatten_model": "putFlattenModel", - "type.model.flatten.FlattenClient.put_nested_flatten_model": "putNestedFlattenModel" - } -} \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/CHANGELOG.md b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/CHANGELOG.md similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/CHANGELOG.md rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/CHANGELOG.md diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/LICENSE b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/LICENSE similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/LICENSE rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/LICENSE diff --git a/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/MANIFEST.in new file mode 100644 index 00000000000..beed8344015 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/MANIFEST.in @@ -0,0 +1,7 @@ +include *.md +include LICENSE +include azure/specialheaders/xmsclientrequestid/py.typed +recursive-include tests *.py +recursive-include samples *.py *.md +include azure/__init__.py +include azure/specialheaders/__init__.py \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/README.md b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/README.md similarity index 89% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/README.md rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/README.md index 5ab961256d5..9043e7ec7da 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/README.md +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/README.md @@ -1,6 +1,6 @@ -# Specialheaders Clientrequestid client library for Python +# Azure Specialheaders Xmsclientrequestid client library for Python ## Getting started @@ -8,14 +8,14 @@ ### Install the package ```bash -python -m pip install specialheaders-clientrequestid +python -m pip install azure-specialheaders-xmsclientrequestid ``` #### Prequisites - Python 3.8 or later is required to use this package. - You need an [Azure subscription][azure_sub] to use this package. -- An existing Specialheaders Clientrequestid instance. +- An existing Azure Specialheaders Xmsclientrequestid instance. ## Contributing diff --git a/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/apiview_mapping_python.json b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/apiview_mapping_python.json new file mode 100644 index 00000000000..0c8ee6703da --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/apiview_mapping_python.json @@ -0,0 +1,6 @@ +{ + "CrossLanguagePackageId": "Azure.SpecialHeaders.XmsClientRequestId", + "CrossLanguageDefinitionId": { + "azure.specialheaders.xmsclientrequestid.XmsClientRequestIdClient.get": "get" + } +} \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/__init__.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/__init__.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/__init__.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/__init__.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/__init__.py diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/__init__.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/__init__.py similarity index 91% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/__init__.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/__init__.py index b7358b093b5..8be103a939f 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/__init__.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._client import ClientRequestIdClient +from ._client import XmsClientRequestIdClient from ._version import VERSION __version__ = VERSION @@ -19,7 +19,7 @@ from ._patch import patch_sdk as _patch_sdk __all__ = [ - "ClientRequestIdClient", + "XmsClientRequestIdClient", ] __all__.extend([p for p in _patch_all if p not in __all__]) diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_client.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_client.py similarity index 90% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_client.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_client.py index 12ac8421a5c..58d105272e2 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_client.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_client.py @@ -13,12 +13,14 @@ from azure.core.pipeline import policies from azure.core.rest import HttpRequest, HttpResponse -from ._configuration import ClientRequestIdClientConfiguration -from ._operations import ClientRequestIdClientOperationsMixin +from ._configuration import XmsClientRequestIdClientConfiguration +from ._operations import XmsClientRequestIdClientOperationsMixin from ._serialization import Deserializer, Serializer -class ClientRequestIdClient(ClientRequestIdClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword +class XmsClientRequestIdClient( + XmsClientRequestIdClientOperationsMixin +): # pylint: disable=client-accepts-api-version-keyword """Azure client request id header configurations. :keyword endpoint: Service host. Default value is "http://localhost:3000". @@ -28,8 +30,7 @@ class ClientRequestIdClient(ClientRequestIdClientOperationsMixin): # pylint: di def __init__( # pylint: disable=missing-client-constructor-parameter-credential self, *, endpoint: str = "http://localhost:3000", **kwargs: Any ) -> None: - self._config = ClientRequestIdClientConfiguration(**kwargs) - kwargs["request_id_header_name"] = "client-request-id" + self._config = XmsClientRequestIdClientConfiguration(**kwargs) _policies = kwargs.pop("policies", None) if _policies is None: _policies = [ @@ -78,7 +79,7 @@ def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: def close(self) -> None: self._client.close() - def __enter__(self) -> "ClientRequestIdClient": + def __enter__(self) -> "XmsClientRequestIdClient": self._client.__enter__() return self diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_configuration.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_configuration.py similarity index 87% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_configuration.py index a4666df2618..e26994a7bdf 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_configuration.py @@ -13,8 +13,8 @@ from ._version import VERSION -class ClientRequestIdClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long - """Configuration for ClientRequestIdClient. +class XmsClientRequestIdClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long + """Configuration for XmsClientRequestIdClient. Note that all parameters used to create this instance are saved as instance attributes. @@ -22,7 +22,7 @@ class ClientRequestIdClientConfiguration: # pylint: disable=too-many-instance-a def __init__(self, **kwargs: Any) -> None: - kwargs.setdefault("sdk_moniker", "specialheaders-clientrequestid/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "specialheaders-xmsclientrequestid/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_model_base.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_operations/__init__.py similarity index 86% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_operations/__init__.py index 285b295e20d..bda1b61cc22 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_operations/__init__.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_operations/__init__.py @@ -6,14 +6,14 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._operations import ClientRequestIdClientOperationsMixin +from ._operations import XmsClientRequestIdClientOperationsMixin from ._patch import __all__ as _patch_all from ._patch import * # pylint: disable=unused-wildcard-import from ._patch import patch_sdk as _patch_sdk __all__ = [ - "ClientRequestIdClientOperationsMixin", + "XmsClientRequestIdClientOperationsMixin", ] __all__.extend([p for p in _patch_all if p not in __all__]) _patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_operations/_operations.py similarity index 88% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_operations/_operations.py index 9fac7c7090c..f9f0b174afe 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_operations/_operations.py @@ -23,7 +23,7 @@ from azure.core.utils import case_insensitive_dict from .._serialization import Serializer -from .._vendor import ClientRequestIdClientMixinABC +from .._vendor import XmsClientRequestIdClientMixinABC if sys.version_info >= (3, 9): from collections.abc import MutableMapping @@ -36,22 +36,22 @@ _SERIALIZER.client_side_validation = False -def build_client_request_id_get_request(**kwargs: Any) -> HttpRequest: +def build_xms_client_request_id_get_request(**kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) # Construct URL - _url = "/special-headers/client-request-id" + _url = "/azure/special-headers/x-ms-client-request-id" # Construct headers return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) -class ClientRequestIdClientOperationsMixin(ClientRequestIdClientMixinABC): +class XmsClientRequestIdClientOperationsMixin(XmsClientRequestIdClientMixinABC): @distributed_trace def get(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements - """Get operation with azure client request id header. + """Get operation with azure ``x-ms-client-request-id`` header. :return: None :rtype: None @@ -70,7 +70,7 @@ def get(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-sta cls: ClsType[None] = kwargs.pop("cls", None) - _request = build_client_request_id_get_request( + _request = build_xms_client_request_id_get_request( headers=_headers, params=_params, ) diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_patch.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_patch.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_serialization.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_serialization.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_serialization.py diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_vendor.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_vendor.py similarity index 83% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_vendor.py index 9ff577f3a71..bb6e2a34c38 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_vendor.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_vendor.py @@ -8,7 +8,7 @@ from abc import ABC from typing import TYPE_CHECKING -from ._configuration import ClientRequestIdClientConfiguration +from ._configuration import XmsClientRequestIdClientConfiguration if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports @@ -17,10 +17,10 @@ from ._serialization import Deserializer, Serializer -class ClientRequestIdClientMixinABC(ABC): +class XmsClientRequestIdClientMixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" _client: "PipelineClient" - _config: ClientRequestIdClientConfiguration + _config: XmsClientRequestIdClientConfiguration _serialize: "Serializer" _deserialize: "Deserializer" diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_version.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_version.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_version.py diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/__init__.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/__init__.py similarity index 90% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/__init__.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/__init__.py index da97e259aa1..061181fc756 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/__init__.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._client import ClientRequestIdClient +from ._client import XmsClientRequestIdClient try: from ._patch import __all__ as _patch_all @@ -16,7 +16,7 @@ from ._patch import patch_sdk as _patch_sdk __all__ = [ - "ClientRequestIdClient", + "XmsClientRequestIdClient", ] __all__.extend([p for p in _patch_all if p not in __all__]) diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_client.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_client.py similarity index 90% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_client.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_client.py index 33817958e13..a6443e851d2 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_client.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_client.py @@ -14,11 +14,13 @@ from azure.core.rest import AsyncHttpResponse, HttpRequest from .._serialization import Deserializer, Serializer -from ._configuration import ClientRequestIdClientConfiguration -from ._operations import ClientRequestIdClientOperationsMixin +from ._configuration import XmsClientRequestIdClientConfiguration +from ._operations import XmsClientRequestIdClientOperationsMixin -class ClientRequestIdClient(ClientRequestIdClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword +class XmsClientRequestIdClient( + XmsClientRequestIdClientOperationsMixin +): # pylint: disable=client-accepts-api-version-keyword """Azure client request id header configurations. :keyword endpoint: Service host. Default value is "http://localhost:3000". @@ -28,8 +30,7 @@ class ClientRequestIdClient(ClientRequestIdClientOperationsMixin): # pylint: di def __init__( # pylint: disable=missing-client-constructor-parameter-credential self, *, endpoint: str = "http://localhost:3000", **kwargs: Any ) -> None: - self._config = ClientRequestIdClientConfiguration(**kwargs) - kwargs["request_id_header_name"] = "client-request-id" + self._config = XmsClientRequestIdClientConfiguration(**kwargs) _policies = kwargs.pop("policies", None) if _policies is None: _policies = [ @@ -80,7 +81,7 @@ def send_request( async def close(self) -> None: await self._client.close() - async def __aenter__(self) -> "ClientRequestIdClient": + async def __aenter__(self) -> "XmsClientRequestIdClient": await self._client.__aenter__() return self diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_configuration.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_configuration.py similarity index 87% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_configuration.py index 125d20b5120..c69aaebbf8a 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_configuration.py @@ -13,8 +13,8 @@ from .._version import VERSION -class ClientRequestIdClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long - """Configuration for ClientRequestIdClient. +class XmsClientRequestIdClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long + """Configuration for XmsClientRequestIdClient. Note that all parameters used to create this instance are saved as instance attributes. @@ -22,7 +22,7 @@ class ClientRequestIdClientConfiguration: # pylint: disable=too-many-instance-a def __init__(self, **kwargs: Any) -> None: - kwargs.setdefault("sdk_moniker", "specialheaders-clientrequestid/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "specialheaders-xmsclientrequestid/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_operations/__init__.py similarity index 86% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_operations/__init__.py index 285b295e20d..bda1b61cc22 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_operations/__init__.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_operations/__init__.py @@ -6,14 +6,14 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._operations import ClientRequestIdClientOperationsMixin +from ._operations import XmsClientRequestIdClientOperationsMixin from ._patch import __all__ as _patch_all from ._patch import * # pylint: disable=unused-wildcard-import from ._patch import patch_sdk as _patch_sdk __all__ = [ - "ClientRequestIdClientOperationsMixin", + "XmsClientRequestIdClientOperationsMixin", ] __all__.extend([p for p in _patch_all if p not in __all__]) _patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_operations/_operations.py similarity index 88% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_operations/_operations.py index fd832af17f6..456ecbf6b20 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_operations/_operations.py @@ -21,8 +21,8 @@ from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.core.tracing.decorator_async import distributed_trace_async -from ..._operations._operations import build_client_request_id_get_request -from .._vendor import ClientRequestIdClientMixinABC +from ..._operations._operations import build_xms_client_request_id_get_request +from .._vendor import XmsClientRequestIdClientMixinABC if sys.version_info >= (3, 9): from collections.abc import MutableMapping @@ -32,11 +32,11 @@ ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] -class ClientRequestIdClientOperationsMixin(ClientRequestIdClientMixinABC): +class XmsClientRequestIdClientOperationsMixin(XmsClientRequestIdClientMixinABC): @distributed_trace_async async def get(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements - """Get operation with azure client request id header. + """Get operation with azure ``x-ms-client-request-id`` header. :return: None :rtype: None @@ -55,7 +55,7 @@ async def get(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu cls: ClsType[None] = kwargs.pop("cls", None) - _request = build_client_request_id_get_request( + _request = build_xms_client_request_id_get_request( headers=_headers, params=_params, ) diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/_patch.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/_patch.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_vendor.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_vendor.py similarity index 84% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_vendor.py index 43000195795..873eeba05db 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_vendor.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/aio/_vendor.py @@ -8,7 +8,7 @@ from abc import ABC from typing import TYPE_CHECKING -from ._configuration import ClientRequestIdClientConfiguration +from ._configuration import XmsClientRequestIdClientConfiguration if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports @@ -17,10 +17,10 @@ from .._serialization import Deserializer, Serializer -class ClientRequestIdClientMixinABC(ABC): +class XmsClientRequestIdClientMixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" _client: "AsyncPipelineClient" - _config: ClientRequestIdClientConfiguration + _config: XmsClientRequestIdClientConfiguration _serialize: "Serializer" _deserialize: "Deserializer" diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/py.typed b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/py.typed rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/py.typed diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/dev_requirements.txt b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/dev_requirements.txt similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/dev_requirements.txt rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/dev_requirements.txt diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/generated_tests/conftest.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/generated_tests/conftest.py similarity index 53% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/generated_tests/conftest.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/generated_tests/conftest.py index 7d81663dd9e..b9364deb4e4 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/generated_tests/conftest.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/generated_tests/conftest.py @@ -21,14 +21,16 @@ # aovid record sensitive identity information in recordings @pytest.fixture(scope="session", autouse=True) def add_sanitizers(test_proxy): - requestid_subscription_id = os.environ.get("REQUESTID_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") - requestid_tenant_id = os.environ.get("REQUESTID_TENANT_ID", "00000000-0000-0000-0000-000000000000") - requestid_client_id = os.environ.get("REQUESTID_CLIENT_ID", "00000000-0000-0000-0000-000000000000") - requestid_client_secret = os.environ.get("REQUESTID_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") - add_general_regex_sanitizer(regex=requestid_subscription_id, value="00000000-0000-0000-0000-000000000000") - add_general_regex_sanitizer(regex=requestid_tenant_id, value="00000000-0000-0000-0000-000000000000") - add_general_regex_sanitizer(regex=requestid_client_id, value="00000000-0000-0000-0000-000000000000") - add_general_regex_sanitizer(regex=requestid_client_secret, value="00000000-0000-0000-0000-000000000000") + xmsrequestid_subscription_id = os.environ.get( + "XMSREQUESTID_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000" + ) + xmsrequestid_tenant_id = os.environ.get("XMSREQUESTID_TENANT_ID", "00000000-0000-0000-0000-000000000000") + xmsrequestid_client_id = os.environ.get("XMSREQUESTID_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + xmsrequestid_client_secret = os.environ.get("XMSREQUESTID_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=xmsrequestid_subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=xmsrequestid_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=xmsrequestid_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=xmsrequestid_client_secret, value="00000000-0000-0000-0000-000000000000") add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]") add_header_regex_sanitizer(key="Cookie", value="cookie;") diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/generated_tests/test_request_id.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/generated_tests/test_xms_request_id.py similarity index 72% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/generated_tests/test_request_id.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/generated_tests/test_xms_request_id.py index 6962e483b77..adb49afe641 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/generated_tests/test_request_id.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/generated_tests/test_xms_request_id.py @@ -7,15 +7,15 @@ # -------------------------------------------------------------------------- import pytest from devtools_testutils import recorded_by_proxy -from testpreparer import ClientRequestIdClientTestBase, RequestIdPreparer +from testpreparer import XmsClientRequestIdClientTestBase, XmsRequestIdPreparer @pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestRequestId(ClientRequestIdClientTestBase): - @RequestIdPreparer() +class TestXmsRequestId(XmsClientRequestIdClientTestBase): + @XmsRequestIdPreparer() @recorded_by_proxy - def test_get(self, requestid_endpoint): - client = self.create_client(endpoint=requestid_endpoint) + def test_get(self, xmsrequestid_endpoint): + client = self.create_client(endpoint=xmsrequestid_endpoint) response = client.get() # please add some check logic here by yourself diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/generated_tests/test_request_id_async.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/generated_tests/test_xms_request_id_async.py similarity index 69% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/generated_tests/test_request_id_async.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/generated_tests/test_xms_request_id_async.py index 0e46a9f7d0c..8830328ad72 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/generated_tests/test_request_id_async.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/generated_tests/test_xms_request_id_async.py @@ -7,16 +7,16 @@ # -------------------------------------------------------------------------- import pytest from devtools_testutils.aio import recorded_by_proxy_async -from testpreparer import RequestIdPreparer -from testpreparer_async import ClientRequestIdClientTestBaseAsync +from testpreparer import XmsRequestIdPreparer +from testpreparer_async import XmsClientRequestIdClientTestBaseAsync @pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestRequestIdAsync(ClientRequestIdClientTestBaseAsync): - @RequestIdPreparer() +class TestXmsRequestIdAsync(XmsClientRequestIdClientTestBaseAsync): + @XmsRequestIdPreparer() @recorded_by_proxy_async - async def test_get(self, requestid_endpoint): - client = self.create_async_client(endpoint=requestid_endpoint) + async def test_get(self, xmsrequestid_endpoint): + client = self.create_async_client(endpoint=xmsrequestid_endpoint) response = await client.get() # please add some check logic here by yourself diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/generated_tests/testpreparer.py similarity index 65% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/generated_tests/testpreparer.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/generated_tests/testpreparer.py index fb66eace9aa..975eab0459d 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/generated_tests/testpreparer.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/generated_tests/testpreparer.py @@ -5,22 +5,22 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.specialheaders.xmsclientrequestid import XmsClientRequestIdClient from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer import functools -from specialheaders.clientrequestid import ClientRequestIdClient -class ClientRequestIdClientTestBase(AzureRecordedTestCase): +class XmsClientRequestIdClientTestBase(AzureRecordedTestCase): def create_client(self, endpoint): - credential = self.get_credential(ClientRequestIdClient) + credential = self.get_credential(XmsClientRequestIdClient) return self.create_client_from_credential( - ClientRequestIdClient, + XmsClientRequestIdClient, credential=credential, endpoint=endpoint, ) -RequestIdPreparer = functools.partial( - PowerShellPreparer, "requestid", requestid_endpoint="https://fake_requestid_endpoint.com" +XmsRequestIdPreparer = functools.partial( + PowerShellPreparer, "xmsrequestid", xmsrequestid_endpoint="https://fake_xmsrequestid_endpoint.com" ) diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/generated_tests/testpreparer_async.py similarity index 72% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/generated_tests/testpreparer_async.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/generated_tests/testpreparer_async.py index 8e5b0ae6a72..df7d540a17b 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/generated_tests/testpreparer_async.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/generated_tests/testpreparer_async.py @@ -5,16 +5,16 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.specialheaders.xmsclientrequestid.aio import XmsClientRequestIdClient from devtools_testutils import AzureRecordedTestCase -from specialheaders.clientrequestid.aio import ClientRequestIdClient -class ClientRequestIdClientTestBaseAsync(AzureRecordedTestCase): +class XmsClientRequestIdClientTestBaseAsync(AzureRecordedTestCase): def create_async_client(self, endpoint): - credential = self.get_credential(ClientRequestIdClient, is_async=True) + credential = self.get_credential(XmsClientRequestIdClient, is_async=True) return self.create_client_from_credential( - ClientRequestIdClient, + XmsClientRequestIdClient, credential=credential, endpoint=endpoint, ) diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/setup.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/setup.py similarity index 90% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/setup.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/setup.py index bdc837e7a75..c5d4520cdd9 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/setup.py +++ b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/setup.py @@ -12,8 +12,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "specialheaders-clientrequestid" -PACKAGE_PPRINT_NAME = "Specialheaders Clientrequestid" +PACKAGE_NAME = "azure-specialheaders-xmsclientrequestid" +PACKAGE_PPRINT_NAME = "Azure Specialheaders Xmsclientrequestid" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace("-", "/") @@ -54,12 +54,13 @@ exclude=[ "tests", # Exclude packages that will be covered by PEP420 or nspkg - "specialheaders", + "azure", + "azure.specialheaders", ] ), include_package_data=True, package_data={ - "specialheaders.clientrequestid": ["py.typed"], + "azure.specialheaders.xmsclientrequestid": ["py.typed"], }, install_requires=[ "isodate>=0.6.1", diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/MANIFEST.in b/packages/typespec-python/test/azure/generated/special-headers-client-request-id/MANIFEST.in deleted file mode 100644 index d199c3e9ce1..00000000000 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/MANIFEST.in +++ /dev/null @@ -1,6 +0,0 @@ -include *.md -include LICENSE -include specialheaders/clientrequestid/py.typed -recursive-include tests *.py -recursive-include samples *.py *.md -include specialheaders/__init__.py \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/apiview_mapping_python.json b/packages/typespec-python/test/azure/generated/special-headers-client-request-id/apiview_mapping_python.json deleted file mode 100644 index bb5c027301f..00000000000 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/apiview_mapping_python.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "CrossLanguagePackageId": "SpecialHeaders.ClientRequestId", - "CrossLanguageDefinitionId": { - "specialheaders.clientrequestid.ClientRequestIdClient.get": "get" - } -} \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/apiview_mapping_python.json b/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/apiview_mapping_python.json deleted file mode 100644 index bb5c027301f..00000000000 --- a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/apiview_mapping_python.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "CrossLanguagePackageId": "SpecialHeaders.ClientRequestId", - "CrossLanguageDefinitionId": { - "specialheaders.clientrequestid.ClientRequestIdClient.get": "get" - } -} \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/CHANGELOG.md b/packages/typespec-python/test/azure/generated/typetest-model-flatten/CHANGELOG.md similarity index 100% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/CHANGELOG.md rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/CHANGELOG.md diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/LICENSE b/packages/typespec-python/test/azure/generated/typetest-model-flatten/LICENSE similarity index 100% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/LICENSE rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/LICENSE diff --git a/packages/typespec-python/test/azure/generated/typetest-model-flatten/MANIFEST.in b/packages/typespec-python/test/azure/generated/typetest-model-flatten/MANIFEST.in new file mode 100644 index 00000000000..bc0c9a338b1 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/typetest-model-flatten/MANIFEST.in @@ -0,0 +1,7 @@ +include *.md +include LICENSE +include typetest/model/flatten/py.typed +recursive-include tests *.py +recursive-include samples *.py *.md +include typetest/__init__.py +include typetest/model/__init__.py \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/README.md b/packages/typespec-python/test/azure/generated/typetest-model-flatten/README.md similarity index 92% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/README.md rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/README.md index 8d023ed1513..bac993a98da 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/README.md +++ b/packages/typespec-python/test/azure/generated/typetest-model-flatten/README.md @@ -1,6 +1,6 @@ -# Type Model Flatten client library for Python +# Typetest Model Flatten client library for Python ## Getting started @@ -8,14 +8,14 @@ ### Install the package ```bash -python -m pip install type-model-flatten +python -m pip install typetest-model-flatten ``` #### Prequisites - Python 3.8 or later is required to use this package. - You need an [Azure subscription][azure_sub] to use this package. -- An existing Type Model Flatten instance. +- An existing Typetest Model Flatten instance. ## Contributing diff --git a/packages/typespec-python/test/azure/generated/typetest-model-flatten/apiview_mapping_python.json b/packages/typespec-python/test/azure/generated/typetest-model-flatten/apiview_mapping_python.json new file mode 100644 index 00000000000..92ab16d2c7c --- /dev/null +++ b/packages/typespec-python/test/azure/generated/typetest-model-flatten/apiview_mapping_python.json @@ -0,0 +1,11 @@ +{ + "CrossLanguagePackageId": "Type.Model.Flatten", + "CrossLanguageDefinitionId": { + "typetest.model.flatten.models.ChildFlattenModel": "Type.Model.Flatten.ChildFlattenModel", + "typetest.model.flatten.models.ChildModel": "Type.Model.Flatten.ChildModel", + "typetest.model.flatten.models.FlattenModel": "Type.Model.Flatten.FlattenModel", + "typetest.model.flatten.models.NestedFlattenModel": "Type.Model.Flatten.NestedFlattenModel", + "typetest.model.flatten.FlattenClient.put_flatten_model": "putFlattenModel", + "typetest.model.flatten.FlattenClient.put_nested_flatten_model": "putNestedFlattenModel" + } +} \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/dev_requirements.txt b/packages/typespec-python/test/azure/generated/typetest-model-flatten/dev_requirements.txt similarity index 100% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/dev_requirements.txt rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/dev_requirements.txt diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/generated_tests/conftest.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/generated_tests/conftest.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/generated_tests/conftest.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/generated_tests/conftest.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/generated_tests/test_flatten.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/generated_tests/test_flatten.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/generated_tests/test_flatten.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/generated_tests/test_flatten.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/generated_tests/test_flatten_async.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/generated_tests/test_flatten_async.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/generated_tests/test_flatten_async.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/generated_tests/test_flatten_async.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/generated_tests/testpreparer.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/generated_tests/testpreparer.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/generated_tests/testpreparer.py index db9530746cf..fba87872c83 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/generated_tests/testpreparer.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-flatten/generated_tests/testpreparer.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer import functools -from type.model.flatten import FlattenClient +from typetest.model.flatten import FlattenClient class FlattenClientTestBase(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/generated_tests/testpreparer_async.py similarity index 94% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/generated_tests/testpreparer_async.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/generated_tests/testpreparer_async.py index abb54eaede9..74edfa0fe47 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/generated_tests/testpreparer_async.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-flatten/generated_tests/testpreparer_async.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from devtools_testutils import AzureRecordedTestCase -from type.model.flatten.aio import FlattenClient +from typetest.model.flatten.aio import FlattenClient class FlattenClientTestBaseAsync(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/setup.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/setup.py similarity index 92% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/setup.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/setup.py index 1b15a75a872..c3c9f7e57b3 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/setup.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-flatten/setup.py @@ -12,8 +12,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "type-model-flatten" -PACKAGE_PPRINT_NAME = "Type Model Flatten" +PACKAGE_NAME = "typetest-model-flatten" +PACKAGE_PPRINT_NAME = "Typetest Model Flatten" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace("-", "/") @@ -54,13 +54,13 @@ exclude=[ "tests", # Exclude packages that will be covered by PEP420 or nspkg - "type", - "type.model", + "typetest", + "typetest.model", ] ), include_package_data=True, package_data={ - "type.model.flatten": ["py.typed"], + "typetest.model.flatten": ["py.typed"], }, install_requires=[ "isodate>=0.6.1", diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/__init__.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/__init__.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/__init__.py diff --git a/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/__init__.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/__init__.py new file mode 100644 index 00000000000..d55ccad1f57 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/__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-flatten/type/model/flatten/__init__.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/__init__.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_client.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_client.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_configuration.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_configuration.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_configuration.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_configuration.py index b1d53ffbc90..0941b1003bc 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_configuration.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_configuration.py @@ -22,7 +22,7 @@ class FlattenClientConfiguration: # pylint: disable=too-many-instance-attribute def __init__(self, **kwargs: Any) -> None: - kwargs.setdefault("sdk_moniker", "type-model-flatten/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "typetest-model-flatten/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_operations/__init__.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_operations/_operations.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_operations/_operations.py index 22a7cce030b..4a71538268b 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_operations/_operations.py @@ -84,12 +84,12 @@ def put_flatten_model( """put_flatten_model. :param input: Required. - :type input: ~type.model.flatten.models.FlattenModel + :type input: ~typetest.model.flatten.models.FlattenModel :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: FlattenModel. The FlattenModel is compatible with MutableMapping - :rtype: ~type.model.flatten.models.FlattenModel + :rtype: ~typetest.model.flatten.models.FlattenModel :raises ~azure.core.exceptions.HttpResponseError: Example: @@ -126,7 +126,7 @@ def put_flatten_model( Default value is "application/json". :paramtype content_type: str :return: FlattenModel. The FlattenModel is compatible with MutableMapping - :rtype: ~type.model.flatten.models.FlattenModel + :rtype: ~typetest.model.flatten.models.FlattenModel :raises ~azure.core.exceptions.HttpResponseError: Example: @@ -154,7 +154,7 @@ def put_flatten_model( Default value is "application/json". :paramtype content_type: str :return: FlattenModel. The FlattenModel is compatible with MutableMapping - :rtype: ~type.model.flatten.models.FlattenModel + :rtype: ~typetest.model.flatten.models.FlattenModel :raises ~azure.core.exceptions.HttpResponseError: Example: @@ -177,9 +177,9 @@ def put_flatten_model( """put_flatten_model. :param input: Is one of the following types: FlattenModel, JSON, IO[bytes] Required. - :type input: ~type.model.flatten.models.FlattenModel or JSON or IO[bytes] + :type input: ~typetest.model.flatten.models.FlattenModel or JSON or IO[bytes] :return: FlattenModel. The FlattenModel is compatible with MutableMapping - :rtype: ~type.model.flatten.models.FlattenModel + :rtype: ~typetest.model.flatten.models.FlattenModel :raises ~azure.core.exceptions.HttpResponseError: Example: @@ -262,12 +262,12 @@ def put_nested_flatten_model( """put_nested_flatten_model. :param input: Required. - :type input: ~type.model.flatten.models.NestedFlattenModel + :type input: ~typetest.model.flatten.models.NestedFlattenModel :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping - :rtype: ~type.model.flatten.models.NestedFlattenModel + :rtype: ~typetest.model.flatten.models.NestedFlattenModel :raises ~azure.core.exceptions.HttpResponseError: Example: @@ -310,7 +310,7 @@ def put_nested_flatten_model( Default value is "application/json". :paramtype content_type: str :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping - :rtype: ~type.model.flatten.models.NestedFlattenModel + :rtype: ~typetest.model.flatten.models.NestedFlattenModel :raises ~azure.core.exceptions.HttpResponseError: Example: @@ -341,7 +341,7 @@ def put_nested_flatten_model( Default value is "application/json". :paramtype content_type: str :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping - :rtype: ~type.model.flatten.models.NestedFlattenModel + :rtype: ~typetest.model.flatten.models.NestedFlattenModel :raises ~azure.core.exceptions.HttpResponseError: Example: @@ -367,9 +367,9 @@ def put_nested_flatten_model( """put_nested_flatten_model. :param input: Is one of the following types: NestedFlattenModel, JSON, IO[bytes] Required. - :type input: ~type.model.flatten.models.NestedFlattenModel or JSON or IO[bytes] + :type input: ~typetest.model.flatten.models.NestedFlattenModel or JSON or IO[bytes] :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping - :rtype: ~type.model.flatten.models.NestedFlattenModel + :rtype: ~typetest.model.flatten.models.NestedFlattenModel :raises ~azure.core.exceptions.HttpResponseError: Example: diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/models/_patch.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/models/_patch.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_operations/_patch.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_patch.py diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_serialization.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_serialization.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_serialization.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_vendor.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/_vendor.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_version.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_version.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_version.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/__init__.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/__init__.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/_client.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/_client.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/_configuration.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_configuration.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_configuration.py index ce4fcb53049..c6517cf00aa 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_configuration.py @@ -22,7 +22,7 @@ class FlattenClientConfiguration: # pylint: disable=too-many-instance-attribute def __init__(self, **kwargs: Any) -> None: - kwargs.setdefault("sdk_moniker", "type-model-flatten/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "typetest-model-flatten/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_operations.py similarity index 94% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_operations.py index bc533748824..34d603cb8fb 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_operations.py @@ -50,12 +50,12 @@ async def put_flatten_model( """put_flatten_model. :param input: Required. - :type input: ~type.model.flatten.models.FlattenModel + :type input: ~typetest.model.flatten.models.FlattenModel :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: FlattenModel. The FlattenModel is compatible with MutableMapping - :rtype: ~type.model.flatten.models.FlattenModel + :rtype: ~typetest.model.flatten.models.FlattenModel :raises ~azure.core.exceptions.HttpResponseError: Example: @@ -92,7 +92,7 @@ async def put_flatten_model( Default value is "application/json". :paramtype content_type: str :return: FlattenModel. The FlattenModel is compatible with MutableMapping - :rtype: ~type.model.flatten.models.FlattenModel + :rtype: ~typetest.model.flatten.models.FlattenModel :raises ~azure.core.exceptions.HttpResponseError: Example: @@ -120,7 +120,7 @@ async def put_flatten_model( Default value is "application/json". :paramtype content_type: str :return: FlattenModel. The FlattenModel is compatible with MutableMapping - :rtype: ~type.model.flatten.models.FlattenModel + :rtype: ~typetest.model.flatten.models.FlattenModel :raises ~azure.core.exceptions.HttpResponseError: Example: @@ -143,9 +143,9 @@ async def put_flatten_model( """put_flatten_model. :param input: Is one of the following types: FlattenModel, JSON, IO[bytes] Required. - :type input: ~type.model.flatten.models.FlattenModel or JSON or IO[bytes] + :type input: ~typetest.model.flatten.models.FlattenModel or JSON or IO[bytes] :return: FlattenModel. The FlattenModel is compatible with MutableMapping - :rtype: ~type.model.flatten.models.FlattenModel + :rtype: ~typetest.model.flatten.models.FlattenModel :raises ~azure.core.exceptions.HttpResponseError: Example: @@ -228,12 +228,12 @@ async def put_nested_flatten_model( """put_nested_flatten_model. :param input: Required. - :type input: ~type.model.flatten.models.NestedFlattenModel + :type input: ~typetest.model.flatten.models.NestedFlattenModel :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping - :rtype: ~type.model.flatten.models.NestedFlattenModel + :rtype: ~typetest.model.flatten.models.NestedFlattenModel :raises ~azure.core.exceptions.HttpResponseError: Example: @@ -276,7 +276,7 @@ async def put_nested_flatten_model( Default value is "application/json". :paramtype content_type: str :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping - :rtype: ~type.model.flatten.models.NestedFlattenModel + :rtype: ~typetest.model.flatten.models.NestedFlattenModel :raises ~azure.core.exceptions.HttpResponseError: Example: @@ -307,7 +307,7 @@ async def put_nested_flatten_model( Default value is "application/json". :paramtype content_type: str :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping - :rtype: ~type.model.flatten.models.NestedFlattenModel + :rtype: ~typetest.model.flatten.models.NestedFlattenModel :raises ~azure.core.exceptions.HttpResponseError: Example: @@ -333,9 +333,9 @@ async def put_nested_flatten_model( """put_nested_flatten_model. :param input: Is one of the following types: NestedFlattenModel, JSON, IO[bytes] Required. - :type input: ~type.model.flatten.models.NestedFlattenModel or JSON or IO[bytes] + :type input: ~typetest.model.flatten.models.NestedFlattenModel or JSON or IO[bytes] :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping - :rtype: ~type.model.flatten.models.NestedFlattenModel + :rtype: ~typetest.model.flatten.models.NestedFlattenModel :raises ~azure.core.exceptions.HttpResponseError: Example: diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_patch.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/_patch.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/_vendor.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/aio/_vendor.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/models/__init__.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/models/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/models/__init__.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/models/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/models/_models.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/models/_models.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/models/_models.py index cf85fb5c5aa..d862a3b8907 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/type/model/flatten/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/models/_models.py @@ -25,7 +25,7 @@ class ChildFlattenModel(_model_base.Model): :ivar summary: Required. :vartype summary: str :ivar properties: Required. - :vartype properties: ~type.model.flatten.models.ChildModel + :vartype properties: ~typetest.model.flatten.models.ChildModel """ summary: str = rest_field() @@ -115,7 +115,7 @@ class FlattenModel(_model_base.Model): :ivar name: Required. :vartype name: str :ivar properties: Required. - :vartype properties: ~type.model.flatten.models.ChildModel + :vartype properties: ~typetest.model.flatten.models.ChildModel """ name: str = rest_field() @@ -170,7 +170,7 @@ class NestedFlattenModel(_model_base.Model): :ivar name: Required. :vartype name: str :ivar properties: Required. - :vartype properties: ~type.model.flatten.models.ChildFlattenModel + :vartype properties: ~typetest.model.flatten.models.ChildFlattenModel """ name: str = rest_field() diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_patch.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/models/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/aio/_patch.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/models/_patch.py diff --git a/packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/py.typed b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/special-headers-client-request-id/specialheaders/clientrequestid/py.typed rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/py.typed diff --git a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_special_headers_client_request_id_async.py b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_special_headers_client_request_id_async.py similarity index 60% rename from packages/typespec-python/test/azure/mock_api_tests/asynctests/test_special_headers_client_request_id_async.py rename to packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_special_headers_client_request_id_async.py index 1e0a8566eb0..02d12b75017 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_special_headers_client_request_id_async.py +++ b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_special_headers_client_request_id_async.py @@ -7,27 +7,27 @@ import pytest -from specialheaders.clientrequestid.aio import ClientRequestIdClient +from azure.specialheaders.xmsclientrequestid.aio import XmsClientRequestIdClient @pytest.fixture async def client(): - async with ClientRequestIdClient() as client: + async with XmsClientRequestIdClient() as client: yield client @pytest.mark.asyncio -async def test_get(client: ClientRequestIdClient, check_client_request_id_header): +async def test_get(client: XmsClientRequestIdClient, check_client_request_id_header): checked = {} result, resp = await client.get( cls=lambda x, y, z: (y, x), raw_request_hook=functools.partial( - check_client_request_id_header, header="client-request-id", checked=checked + check_client_request_id_header, header="x-ms-client-request-id", checked=checked ), ) assert result is None assert ( - resp.http_response.headers["client-request-id"] - == checked["client-request-id"] + resp.http_response.headers["x-ms-client-request-id"] + == checked["x-ms-client-request-id"] ) pass diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_special_headers_client_request_id.py b/packages/typespec-python/test/azure/mock_api_tests/test_azure_special_headers_client_request_id.py similarity index 59% rename from packages/typespec-python/test/azure/mock_api_tests/test_special_headers_client_request_id.py rename to packages/typespec-python/test/azure/mock_api_tests/test_azure_special_headers_client_request_id.py index d6fcad6b9ab..b67151e8731 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_special_headers_client_request_id.py +++ b/packages/typespec-python/test/azure/mock_api_tests/test_azure_special_headers_client_request_id.py @@ -7,26 +7,26 @@ import pytest -from specialheaders.clientrequestid import ClientRequestIdClient +from azure.specialheaders.xmsclientrequestid import XmsClientRequestIdClient @pytest.fixture def client(): - with ClientRequestIdClient() as client: + with XmsClientRequestIdClient() as client: yield client -def test_get(client: ClientRequestIdClient, check_client_request_id_header): +def test_get(client: XmsClientRequestIdClient, check_client_request_id_header): checked = {} result, resp = client.get( cls=lambda x, y, z: (y, x), raw_request_hook=functools.partial( - check_client_request_id_header, header="client-request-id", checked=checked + check_client_request_id_header, header="x-ms-client-request-id", checked=checked ), ) assert result is None assert ( - resp.http_response.headers["client-request-id"] - == checked["client-request-id"] + resp.http_response.headers["x-ms-client-request-id"] + == checked["x-ms-client-request-id"] ) pass diff --git a/packages/typespec-python/test/azure/requirements.txt b/packages/typespec-python/test/azure/requirements.txt index 221074e58a3..76af8ccf5a9 100644 --- a/packages/typespec-python/test/azure/requirements.txt +++ b/packages/typespec-python/test/azure/requirements.txt @@ -7,13 +7,12 @@ azure-core==1.30.0 -e ./generated/azure-mgmt-spheredpg -e ./generated/azure-client-generator-core-access -e ./generated/azure-client-generator-core-usage --e ./generated/azure-client-generator-core-flatten -e ./generated/azure-core-basic -e ./generated/azure-core-scalar -e ./generated/azurecore-lro-rpc -e ./generated/azure-core-lro-standard -e ./generated/azure-core-traits --e ./generated/special-headers-client-request-id +-e ./generated/azure-special-headers-client-request-id/ # common test case -e ./generated/authentication-api-key @@ -38,6 +37,7 @@ azure-core==1.30.0 -e ./generated/typetest-enum-extensible -e ./generated/typetest-enum-fixed -e ./generated/typetest-model-enumdiscriminator +-e ./generated/typetest-model-flatten -e ./generated/typetest-model-nesteddiscriminator -e ./generated/typetest-model-notdiscriminated -e ./generated/typetest-model-singlediscriminator diff --git a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_flatten_async.py b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_typetest_model_flatten_async.py similarity index 91% rename from packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_flatten_async.py rename to packages/typespec-python/test/generic_mock_api_tests/asynctests/test_typetest_model_flatten_async.py index 5a9f277531f..94746ead4a5 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_flatten_async.py +++ b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_typetest_model_flatten_async.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from type.model.flatten.aio import FlattenClient -from type.model.flatten.models import FlattenModel, ChildModel, NestedFlattenModel, ChildFlattenModel +from typetest.model.flatten.aio import FlattenClient +from typetest.model.flatten.models import FlattenModel, ChildModel, NestedFlattenModel, ChildFlattenModel @pytest.fixture diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_flatten.py b/packages/typespec-python/test/generic_mock_api_tests/test_typetest_model_flatten.py similarity index 95% rename from packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_flatten.py rename to packages/typespec-python/test/generic_mock_api_tests/test_typetest_model_flatten.py index 4ccf3f51c89..d7866358683 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_flatten.py +++ b/packages/typespec-python/test/generic_mock_api_tests/test_typetest_model_flatten.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from type.model.flatten import FlattenClient -from type.model.flatten.models import FlattenModel, ChildModel, NestedFlattenModel, ChildFlattenModel +from typetest.model.flatten import FlattenClient +from typetest.model.flatten.models import FlattenModel, ChildModel, NestedFlattenModel, ChildFlattenModel @pytest.fixture diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/CHANGELOG.md b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/CHANGELOG.md new file mode 100644 index 00000000000..628743d283a --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/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/typetest-model-flatten/LICENSE b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/LICENSE new file mode 100644 index 00000000000..edd3f78edcc --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/LICENSE @@ -0,0 +1,21 @@ +Copyright (c) Unbranded 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/unbranded/generated/typetest-model-flatten/MANIFEST.in b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/MANIFEST.in new file mode 100644 index 00000000000..bc0c9a338b1 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/MANIFEST.in @@ -0,0 +1,7 @@ +include *.md +include LICENSE +include typetest/model/flatten/py.typed +recursive-include tests *.py +recursive-include samples *.py *.md +include typetest/__init__.py +include typetest/model/__init__.py \ No newline at end of file diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/README.md b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/README.md new file mode 100644 index 00000000000..e69de29bb2d diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/setup.py new file mode 100644 index 00000000000..25a47780618 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/setup.py @@ -0,0 +1,68 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Unbranded (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +# coding: utf-8 + +import os +import re +from setuptools import setup, find_packages + + +PACKAGE_NAME = "typetest-model-flatten" +PACKAGE_PPRINT_NAME = "Typetest Model Flatten" + +# 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="Unbranded {} 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="Unbranded Corporation", + classifiers=[ + "Development Status :: 4 - Beta", + "Programming Language :: Python", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.8", + "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 + "typetest", + "typetest.model", + ] + ), + include_package_data=True, + package_data={ + "typetest.model.flatten": ["py.typed"], + }, + install_requires=[ + "isodate>=0.6.1", + "corehttp[requests]", + "typing-extensions>=4.6.0", + ], + python_requires=">=3.8", +) diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/__init__.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/__init__.py new file mode 100644 index 00000000000..d55ccad1f57 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/__init__.py @@ -0,0 +1 @@ +__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/__init__.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/__init__.py new file mode 100644 index 00000000000..d55ccad1f57 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/__init__.py @@ -0,0 +1 @@ +__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/__init__.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/__init__.py new file mode 100644 index 00000000000..962ad77f9f1 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/__init__.py @@ -0,0 +1,26 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Unbranded (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._client import FlattenClient +from ._version import VERSION + +__version__ = VERSION + +try: + from ._patch import __all__ as _patch_all + from ._patch import * # pylint: disable=unused-wildcard-import +except ImportError: + _patch_all = [] +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "FlattenClient", +] +__all__.extend([p for p in _patch_all if p not in __all__]) + +_patch_sdk() diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_client.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_client.py new file mode 100644 index 00000000000..69bcd8dce90 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_client.py @@ -0,0 +1,78 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Unbranded (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 corehttp.rest import HttpRequest, HttpResponse +from corehttp.runtime import PipelineClient, policies + +from ._configuration import FlattenClientConfiguration +from ._operations import FlattenClientOperationsMixin +from ._serialization import Deserializer, Serializer + + +class FlattenClient(FlattenClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Illustrates the model flatten 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: + self._config = FlattenClientConfiguration(**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) + request_copy.url = self._client.format_url(request_copy.url) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + def close(self) -> None: + self._client.close() + + def __enter__(self) -> "FlattenClient": + 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/typetest-model-flatten/typetest/model/flatten/_configuration.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_configuration.py new file mode 100644 index 00000000000..0bb7d59c6b9 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_configuration.py @@ -0,0 +1,35 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Unbranded (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Any + +from corehttp.runtime import policies + +from ._version import VERSION + + +class FlattenClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for FlattenClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + """ + + def __init__(self, **kwargs: Any) -> None: + + kwargs.setdefault("sdk_moniker", "typetest-model-flatten/{}".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/typetest-model-flatten/typetest/model/flatten/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_model_base.py new file mode 100644 index 00000000000..948f464d21b --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_model_base.py @@ -0,0 +1,887 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +# pylint: disable=protected-access, arguments-differ, signature-differs, 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 +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 + +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping + +_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"] # pylint: disable=protected-access + 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)) + + +_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 rf and rf._format: + return _DESERIALIZE_MAPPING_WITHFORMAT.get(rf._format) + return _DESERIALIZE_MAPPING.get(annotation) + + +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]): # pylint: disable=unsubscriptable-object + 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]: + return self._data.keys() + + def values(self) -> typing.ValuesView[typing.Any]: + return self._data.values() + + def items(self) -> typing.ItemsView[str, typing.Any]: + return self._data.items() + + def get(self, key: str, default: typing.Any = None) -> typing.Any: + try: + return self[key] + except KeyError: + return default + + @typing.overload + def pop(self, key: str) -> typing.Any: ... + + @typing.overload + def pop(self, key: str, default: _T) -> _T: ... + + @typing.overload + def pop(self, key: str, default: typing.Any) -> typing.Any: ... + + def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: + if default is _UNSET: + return self._data.pop(key) + return self._data.pop(key, default) + + def popitem(self) -> typing.Tuple[str, typing.Any]: + return self._data.popitem() + + def clear(self) -> None: + self._data.clear() + + def update(self, *args: typing.Any, **kwargs: typing.Any) -> None: + 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: ... + + def setdefault(self, key: str, default: typing.Any = _UNSET) -> typing.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 + 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) + return _serialize(value, rf._format) + + +class Model(_MyMutableMapping): + _is_model = True + + 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: + 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: # pylint: disable=unused-argument + # we know the last three classes in mro are going to be 'Model', 'dict', and 'object' + mros = cls.__mro__[:-3][::-1] # ignore model, dict, and object 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__") # pylint: disable=no-member + for k, v in mro_class.__annotations__.items() # pylint: disable=no-member + } + 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()) + + return super().__new__(cls) # pylint: disable=no-value-for-parameter + + def __init_subclass__(cls, discriminator: typing.Optional[str] = None) -> None: + for base in cls.__bases__: + if hasattr(base, "__mapping__"): # pylint: disable=no-member + base.__mapping__[discriminator or cls.__name__] = cls # type: ignore # pylint: disable=no-member + + @classmethod + def _get_discriminator(cls, exist_discriminators) -> typing.Optional[str]: + for v in cls.__dict__.values(): + if ( + isinstance(v, _RestField) and v._is_discriminator and v._rest_name not in exist_discriminators + ): # pylint: disable=protected-access + return v._rest_name # pylint: disable=protected-access + return None + + @classmethod + def _deserialize(cls, data, exist_discriminators): + if not hasattr(cls, "__mapping__"): # pylint: disable=no-member + return cls(data) + discriminator = cls._get_discriminator(exist_discriminators) + exist_discriminators.append(discriminator) + mapped_cls = cls.__mapping__.get(data.get(discriminator), cls) # pyright: ignore # pylint: disable=no-member + if mapped_cls == cls: + return cls(data) + return mapped_cls._deserialize(data, exist_discriminators) # pylint: disable=protected-access + + def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + """Return a dict that can be JSONify using json.dump. + + :keyword bool exclude_readonly: Whether to remove the readonly properties. + :returns: A dict JSON compatible object + :rtype: dict + """ + + result = {} + 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 + 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 + 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=R0911, R0915, R0912 + annotation: typing.Any, + module: typing.Optional[str], + rf: typing.Optional["_RestField"] = None, +) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]: + if not annotation or annotation in [int, float]: + 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) + + 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, +): + try: + if value is None or isinstance(value, _Null): + return None + if deserializer is None: + return 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) + + +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, + ): + 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 + + @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, +) -> typing.Any: + return _RestField( + name=name, + type=type, + visibility=visibility, + default=default, + format=format, + is_multipart_file_input=is_multipart_file_input, + ) + + +def rest_discriminator( + *, + name: typing.Optional[str] = None, + type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin +) -> typing.Any: + return _RestField(name=name, type=type, is_discriminator=True) diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_operations/__init__.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_operations/__init__.py new file mode 100644 index 00000000000..c2b1da9f684 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_operations/__init__.py @@ -0,0 +1,19 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Unbranded (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._operations import FlattenClientOperationsMixin + +from ._patch import __all__ as _patch_all +from ._patch import * # pylint: disable=unused-wildcard-import +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "FlattenClientOperationsMixin", +] +__all__.extend([p for p in _patch_all if p not in __all__]) +_patch_sdk() diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_operations/_operations.py new file mode 100644 index 00000000000..57e6f70d1c1 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_operations/_operations.py @@ -0,0 +1,449 @@ +# pylint: disable=too-many-lines,too-many-statements +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Unbranded (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from io import IOBase +import json +import sys +from typing import Any, Callable, Dict, IO, Optional, Type, TypeVar, Union, overload + +from corehttp.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) +from corehttp.rest import HttpRequest, HttpResponse +from corehttp.runtime.pipeline import PipelineResponse +from corehttp.utils import case_insensitive_dict + +from .. import models as _models +from .._model_base import SdkJSONEncoder, _deserialize +from .._serialization import Serializer +from .._vendor import FlattenClientMixinABC + +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports +JSON = MutableMapping[str, Any] # pylint: disable=unsubscriptable-object +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +_SERIALIZER = Serializer() +_SERIALIZER.client_side_validation = False + + +def build_flatten_put_flatten_model_request(**kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + accept = _headers.pop("Accept", "application/json") + + # Construct URL + _url = "/type/model/flatten/flattenModel" + + # Construct headers + if content_type is not None: + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="PUT", url=_url, headers=_headers, **kwargs) + + +def build_flatten_put_nested_flatten_model_request(**kwargs: Any) -> HttpRequest: # pylint: disable=name-too-long + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + accept = _headers.pop("Accept", "application/json") + + # Construct URL + _url = "/type/model/flatten/nestedFlattenModel" + + # Construct headers + if content_type is not None: + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="PUT", url=_url, headers=_headers, **kwargs) + + +class FlattenClientOperationsMixin(FlattenClientMixinABC): + + @overload + def put_flatten_model( + self, input: _models.FlattenModel, *, content_type: str = "application/json", **kwargs: Any + ) -> _models.FlattenModel: + """put_flatten_model. + + :param input: Required. + :type input: ~typetest.model.flatten.models.FlattenModel + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: FlattenModel. The FlattenModel is compatible with MutableMapping + :rtype: ~typetest.model.flatten.models.FlattenModel + :raises ~corehttp.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # JSON input template you can fill out and use as your body input. + input = { + "name": "str", # Required. + "properties": { + "age": 0, # Required. + "description": "str" # Required. + } + } + + # response body for status code(s): 200 + response == { + "name": "str", # Required. + "properties": { + "age": 0, # Required. + "description": "str" # Required. + } + } + """ + + @overload + def put_flatten_model( + self, input: JSON, *, content_type: str = "application/json", **kwargs: Any + ) -> _models.FlattenModel: + """put_flatten_model. + + :param input: Required. + :type input: JSON + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: FlattenModel. The FlattenModel is compatible with MutableMapping + :rtype: ~typetest.model.flatten.models.FlattenModel + :raises ~corehttp.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # response body for status code(s): 200 + response == { + "name": "str", # Required. + "properties": { + "age": 0, # Required. + "description": "str" # Required. + } + } + """ + + @overload + def put_flatten_model( + self, input: IO[bytes], *, content_type: str = "application/json", **kwargs: Any + ) -> _models.FlattenModel: + """put_flatten_model. + + :param input: Required. + :type input: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: FlattenModel. The FlattenModel is compatible with MutableMapping + :rtype: ~typetest.model.flatten.models.FlattenModel + :raises ~corehttp.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # response body for status code(s): 200 + response == { + "name": "str", # Required. + "properties": { + "age": 0, # Required. + "description": "str" # Required. + } + } + """ + + def put_flatten_model( + self, input: Union[_models.FlattenModel, JSON, IO[bytes]], **kwargs: Any + ) -> _models.FlattenModel: + """put_flatten_model. + + :param input: Is one of the following types: FlattenModel, JSON, IO[bytes] Required. + :type input: ~typetest.model.flatten.models.FlattenModel or JSON or IO[bytes] + :return: FlattenModel. The FlattenModel is compatible with MutableMapping + :rtype: ~typetest.model.flatten.models.FlattenModel + :raises ~corehttp.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # JSON input template you can fill out and use as your body input. + input = { + "name": "str", # Required. + "properties": { + "age": 0, # Required. + "description": "str" # Required. + } + } + + # response body for status code(s): 200 + response == { + "name": "str", # Required. + "properties": { + "age": 0, # Required. + "description": "str" # Required. + } + } + """ + error_map: MutableMapping[int, Type[HttpResponseError]] = { + 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[_models.FlattenModel] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(input, (IOBase, bytes)): + _content = input + else: + _content = json.dumps(input, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_flatten_put_flatten_model_request( + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + _request.url = self._client.format_url(_request.url) + + _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: + response.read() # Load the body in memory and close the socket + 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.FlattenModel, response.json()) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore + + @overload + def put_nested_flatten_model( + self, input: _models.NestedFlattenModel, *, content_type: str = "application/json", **kwargs: Any + ) -> _models.NestedFlattenModel: + """put_nested_flatten_model. + + :param input: Required. + :type input: ~typetest.model.flatten.models.NestedFlattenModel + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping + :rtype: ~typetest.model.flatten.models.NestedFlattenModel + :raises ~corehttp.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # JSON input template you can fill out and use as your body input. + input = { + "name": "str", # Required. + "properties": { + "properties": { + "age": 0, # Required. + "description": "str" # Required. + }, + "summary": "str" # Required. + } + } + + # response body for status code(s): 200 + response == { + "name": "str", # Required. + "properties": { + "properties": { + "age": 0, # Required. + "description": "str" # Required. + }, + "summary": "str" # Required. + } + } + """ + + @overload + def put_nested_flatten_model( + self, input: JSON, *, content_type: str = "application/json", **kwargs: Any + ) -> _models.NestedFlattenModel: + """put_nested_flatten_model. + + :param input: Required. + :type input: JSON + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping + :rtype: ~typetest.model.flatten.models.NestedFlattenModel + :raises ~corehttp.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # response body for status code(s): 200 + response == { + "name": "str", # Required. + "properties": { + "properties": { + "age": 0, # Required. + "description": "str" # Required. + }, + "summary": "str" # Required. + } + } + """ + + @overload + def put_nested_flatten_model( + self, input: IO[bytes], *, content_type: str = "application/json", **kwargs: Any + ) -> _models.NestedFlattenModel: + """put_nested_flatten_model. + + :param input: Required. + :type input: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping + :rtype: ~typetest.model.flatten.models.NestedFlattenModel + :raises ~corehttp.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # response body for status code(s): 200 + response == { + "name": "str", # Required. + "properties": { + "properties": { + "age": 0, # Required. + "description": "str" # Required. + }, + "summary": "str" # Required. + } + } + """ + + def put_nested_flatten_model( + self, input: Union[_models.NestedFlattenModel, JSON, IO[bytes]], **kwargs: Any + ) -> _models.NestedFlattenModel: + """put_nested_flatten_model. + + :param input: Is one of the following types: NestedFlattenModel, JSON, IO[bytes] Required. + :type input: ~typetest.model.flatten.models.NestedFlattenModel or JSON or IO[bytes] + :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping + :rtype: ~typetest.model.flatten.models.NestedFlattenModel + :raises ~corehttp.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # JSON input template you can fill out and use as your body input. + input = { + "name": "str", # Required. + "properties": { + "properties": { + "age": 0, # Required. + "description": "str" # Required. + }, + "summary": "str" # Required. + } + } + + # response body for status code(s): 200 + response == { + "name": "str", # Required. + "properties": { + "properties": { + "age": 0, # Required. + "description": "str" # Required. + }, + "summary": "str" # Required. + } + } + """ + error_map: MutableMapping[int, Type[HttpResponseError]] = { + 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[_models.NestedFlattenModel] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(input, (IOBase, bytes)): + _content = input + else: + _content = json.dumps(input, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_flatten_put_nested_flatten_model_request( + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + _request.url = self._client.format_url(_request.url) + + _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: + response.read() # Load the body in memory and close the socket + 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.NestedFlattenModel, response.json()) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_operations/_patch.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_operations/_patch.py new file mode 100644 index 00000000000..cc9d8be1c50 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_operations/_patch.py @@ -0,0 +1,20 @@ +# ------------------------------------ +# Copyright (c) Unbranded Corporation. +# Licensed under the MIT License. +# ------------------------------------ +"""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/typetest-model-flatten/typetest/model/flatten/_patch.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_patch.py new file mode 100644 index 00000000000..cc9d8be1c50 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_patch.py @@ -0,0 +1,20 @@ +# ------------------------------------ +# Copyright (c) Unbranded Corporation. +# Licensed under the MIT License. +# ------------------------------------ +"""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/typetest-model-flatten/typetest/model/flatten/_serialization.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_serialization.py new file mode 100644 index 00000000000..117b6f42adb --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_serialization.py @@ -0,0 +1,1998 @@ +# -------------------------------------------------------------------------- +# +# Copyright (c) Unbranded Corporation. All rights reserved. +# +# The MIT License (MIT) +# +# 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. +# +# -------------------------------------------------------------------------- + +# pylint: skip-file +# 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, + TypeVar, + MutableMapping, + Type, + List, + Mapping, +) + +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 corehttp.exceptions import DeserializationError, SerializationError +from corehttp.serialization import NULL as CoreNull + +_BOM = codecs.BOM_UTF8.decode(encoding="utf-8") + +ModelType = TypeVar("ModelType", bound="Model") +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. + """ + 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) + 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 + 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" + """ + # 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 + + +class UTC(datetime.tzinfo): + """Time Zone info for handling UTC""" + + def utcoffset(self, dt): + """UTF offset for UTC is 0.""" + return datetime.timedelta(0) + + def tzname(self, dt): + """Timestamp representation.""" + return "Z" + + def dst(self, dt): + """No daylight saving for UTC.""" + return datetime.timedelta(hours=1) + + +try: + from datetime import timezone as _FixedOffset # type: ignore +except ImportError: # Python 2.7 + + class _FixedOffset(datetime.tzinfo): # type: ignore + """Fixed offset in minutes east from UTC. + Copy/pasted from Python doc + :param datetime.timedelta offset: offset in timedelta format + """ + + def __init__(self, offset): + self.__offset = offset + + def utcoffset(self, dt): + return self.__offset + + def tzname(self, dt): + return str(self.__offset.total_seconds() / 3600) + + def __repr__(self): + return "".format(self.tzname(None)) + + def dst(self, dt): + return datetime.timedelta(0) + + def __getinitargs__(self): + return (self.__offset,) + + +try: + from datetime import timezone + + TZ_UTC = timezone.utc +except ImportError: + TZ_UTC = UTC() # type: ignore + +_FLATTEN = re.compile(r"(? None: + self.additional_properties: Optional[Dict[str, Any]] = {} + for k in kwargs: + 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.""" + if isinstance(other, self.__class__): + return self.__dict__ == other.__dict__ + return False + + def __ne__(self, other: Any) -> bool: + """Compare objects by comparing all attributes.""" + 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.""" + 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(self, keep_readonly=keep_readonly, **kwargs) # type: ignore + + 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 function key_transformer: A key transformer function. + :returns: A dict JSON compatible object + :rtype: dict + """ + serializer = Serializer(self._infer_class_models()) + return serializer._serialize(self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs) # type: ignore + + @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: + # Assume it's not Autorest generated (tests?). Add ourselves as dependencies. + client_models = {cls.__name__: cls} + return client_models + + @classmethod + def deserialize(cls: Type[ModelType], data: Any, content_type: Optional[str] = None) -> ModelType: + """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 + """ + deserializer = Deserializer(cls._infer_class_models()) + return deserializer(cls.__name__, data, content_type=content_type) # type: ignore + + @classmethod + def from_dict( + cls: Type[ModelType], + data: Any, + key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + content_type: Optional[str] = None, + ) -> ModelType: + """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 str content_type: JSON by default, set application/xml if XML. + :returns: An instance of this model + :raises: DeserializationError if something went wrong + """ + 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)) + 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. + Remove the polymorphic key from the initial data. + """ + 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.pop(rest_api_response_key, None) or response.pop(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 + """ + return key.replace("\\.", ".") + + +class Serializer(object): + """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): + 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(self, target_obj, data_type=None, **kwargs): + """Serialize data into a string according to type. + + :param 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. + """ + 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() + try: + attributes = target_obj._attribute_map + for attr, attr_desc in attributes.items(): + attr_name = attr + if not keep_readonly and target_obj._validation.get(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 + else: + return serialized + + def body(self, data, data_type, **kwargs): + """Serialize data intended for a request body. + + :param 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 + """ + + # 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) + 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 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 + """ + 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: + raise TypeError("{} must be type {}.".format(name, data_type)) + else: + return output + + def query(self, name, data, data_type, **kwargs): + """Serialize data intended for a URL query. + + :param data: The data to be serialized. + :param str data_type: The type to be serialized from. + :keyword bool skip_quote: Whether to skip quote the serialized result. + Defaults to False. + :rtype: str, list + :raises: TypeError if serialization fails. + :raises: ValueError if data is None + """ + 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: + raise TypeError("{} must be type {}.".format(name, data_type)) + else: + return str(output) + + def header(self, name, data, data_type, **kwargs): + """Serialize data intended for a request header. + + :param 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 + """ + 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: + raise TypeError("{} must be type {}.".format(name, data_type)) + else: + return str(output) + + def serialize_data(self, data, data_type, **kwargs): + """Serialize generic data according to supplied data type. + + :param data: The data to be serialized. + :param str data_type: The type to be serialized from. + :param bool required: Whether it's essential that the data not be + empty or None + :raises: AttributeError if required data is None. + :raises: ValueError if data is None + :raises: SerializationError if serialization fails. + """ + 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) + + elif 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 + else: + return self._serialize(data, **kwargs) + + @classmethod + def _get_custom_serializers(cls, data_type, **kwargs): + 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 data: Object to be serialized. + :param str data_type: Type of object in the iterable. + """ + 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 + + @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 data: Object to be serialized. + :rtype: str + """ + 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) + else: + 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 attr: Object to be serialized. + :param str iter_type: Type of object in the iterable. + :param bool required: Whether the objects in the iterable must + not be None or empty. + :param str div: If set, this str will be used to combine the elements + in the iterable into a combined string. Default is 'None'. + :keyword bool do_quote: Whether to quote the serialized result of each iterable element. + Defaults to False. + :rtype: list, str + """ + 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. + :param bool required: Whether the objects in the dictionary must + not be None or empty. + :rtype: dict + """ + 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): + """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 + """ + 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 + elif 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: + 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)) + + @staticmethod + def serialize_bytearray(attr, **kwargs): + """Serialize bytearray into base-64 string. + + :param attr: Object to be serialized. + :rtype: str + """ + return b64encode(attr).decode() + + @staticmethod + def serialize_base64(attr, **kwargs): + """Serialize str into base-64 string. + + :param attr: Object to be serialized. + :rtype: str + """ + encoded = b64encode(attr).decode("ascii") + return encoded.strip("=").replace("+", "-").replace("/", "_") + + @staticmethod + def serialize_decimal(attr, **kwargs): + """Serialize Decimal object to float. + + :param attr: Object to be serialized. + :rtype: float + """ + return float(attr) + + @staticmethod + def serialize_long(attr, **kwargs): + """Serialize long (Py2) or int (Py3). + + :param attr: Object to be serialized. + :rtype: int/long + """ + return _long_type(attr) + + @staticmethod + def serialize_date(attr, **kwargs): + """Serialize Date object into ISO-8601 formatted string. + + :param Date attr: Object to be serialized. + :rtype: str + """ + 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): + """Serialize Time object into ISO-8601 formatted string. + + :param datetime.time attr: Object to be serialized. + :rtype: str + """ + 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): + """Serialize TimeDelta object into ISO-8601 formatted string. + + :param TimeDelta attr: Object to be serialized. + :rtype: str + """ + if isinstance(attr, str): + attr = isodate.parse_duration(attr) + return isodate.duration_isoformat(attr) + + @staticmethod + def serialize_rfc(attr, **kwargs): + """Serialize Datetime object into RFC-1123 formatted string. + + :param Datetime attr: Object to be serialized. + :rtype: str + :raises: TypeError if format invalid. + """ + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + utc = attr.utctimetuple() + except AttributeError: + raise TypeError("RFC1123 object must be valid Datetime object.") + + 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): + """Serialize Datetime object into ISO-8601 formatted string. + + :param Datetime attr: Object to be serialized. + :rtype: str + :raises: SerializationError if format invalid. + """ + 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): + """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 + """ + 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: + raise TypeError("Unix time object must be valid Datetime object.") + + +def rest_key_extractor(attr, attr_desc, data): + 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(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): + """Extract the attribute in "data" based on the last part of the JSON path key.""" + 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): + """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" + """ + 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): + 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 + else: + 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 + else: # 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(object): + """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}" r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") + + def __init__(self, classes: Optional[Mapping[str, type]] = 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. + """ + data = self._unpack_content(response_data, content_type) + return self._deserialize(target_obj, data) + + def _deserialize(self, target_obj, data): + """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. + """ + # 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(): + 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) + elif isinstance(response, type) and issubclass(response, Enum): + return self.deserialize_enum(data, response) + + if data is None: + return data + try: + attributes = response._attribute_map # type: ignore + 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 + else: + 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. + """ + 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 + 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. + """ + try: + return self(target_obj, data, content_type=content_type) + 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 raw_data: Data to be processed. + :param 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 + """ + # 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: The response model class. + :param d_attrs: The deserialized response attributes. + """ + if callable(response): + subtype = getattr(response, "_subtype_map", {}) + try: + readonly = [k for k, v in response._validation.items() if v.get("readonly")] + const = [k for k, v in response._validation.items() 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 + return response_obj + except TypeError as err: + msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) # type: ignore + raise DeserializationError(msg + str(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) + + def deserialize_data(self, data, data_type): + """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. + """ + 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 ["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 + else: + 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. + :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. + :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): + """Deserialize a generic object. + This will be handled as a dictionary. + + :param dict attr: Dictionary to be deserialized. + :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 + + else: + error = "Cannot deserialize generic object with type: " + raise TypeError(error + str(obj_type)) + + def deserialize_basic(self, attr, data_type): + """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. + :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 "" + else: + # 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) + elif isinstance(attr, str): + if attr.lower() in ["true", "1"]: + return True + elif 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 + + @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. + :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) + else: + 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. + :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: + error = "{!r} is not a valid index for enum {!r}" + raise DeserializationError(error.format(data, enum_obj)) + 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. + :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. + :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. + :rtype: Decimal + :raises: DeserializationError if string format invalid. + """ + 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. + :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. + :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 + else: + return duration + + @staticmethod + def deserialize_date(attr): + """Deserialize ISO-8601 formatted string into Date object. + + :param str attr: response string to be deserialized. + :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. + :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. + :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=_FixedOffset(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 + else: + return date_obj + + @staticmethod + def deserialize_iso(attr): + """Deserialize ISO-8601 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :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 + else: + 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. + :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 + else: + return date_obj diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_vendor.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_vendor.py new file mode 100644 index 00000000000..3f156beee68 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_vendor.py @@ -0,0 +1,26 @@ +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Unbranded (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 FlattenClientConfiguration + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from corehttp.runtime import PipelineClient + + from ._serialization import Deserializer, Serializer + + +class FlattenClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "PipelineClient" + _config: FlattenClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_version.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_version.py new file mode 100644 index 00000000000..2a6e487ad06 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_version.py @@ -0,0 +1,9 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Unbranded (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +VERSION = "1.0.0b1" diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/__init__.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/__init__.py new file mode 100644 index 00000000000..3f8dda4c796 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/__init__.py @@ -0,0 +1,23 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Unbranded (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._client import FlattenClient + +try: + from ._patch import __all__ as _patch_all + from ._patch import * # pylint: disable=unused-wildcard-import +except ImportError: + _patch_all = [] +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "FlattenClient", +] +__all__.extend([p for p in _patch_all if p not in __all__]) + +_patch_sdk() diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_client.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_client.py new file mode 100644 index 00000000000..e31cb47242d --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_client.py @@ -0,0 +1,80 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Unbranded (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 corehttp.rest import AsyncHttpResponse, HttpRequest +from corehttp.runtime import AsyncPipelineClient, policies + +from .._serialization import Deserializer, Serializer +from ._configuration import FlattenClientConfiguration +from ._operations import FlattenClientOperationsMixin + + +class FlattenClient(FlattenClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Illustrates the model flatten 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: + self._config = FlattenClientConfiguration(**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) + request_copy.url = self._client.format_url(request_copy.url) + 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) -> "FlattenClient": + 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/typetest-model-flatten/typetest/model/flatten/aio/_configuration.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_configuration.py new file mode 100644 index 00000000000..c1abb93ef47 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_configuration.py @@ -0,0 +1,35 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Unbranded (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Any + +from corehttp.runtime import policies + +from .._version import VERSION + + +class FlattenClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for FlattenClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + """ + + def __init__(self, **kwargs: Any) -> None: + + kwargs.setdefault("sdk_moniker", "typetest-model-flatten/{}".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/typetest-model-flatten/typetest/model/flatten/aio/_operations/__init__.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/__init__.py new file mode 100644 index 00000000000..c2b1da9f684 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/__init__.py @@ -0,0 +1,19 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Unbranded (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._operations import FlattenClientOperationsMixin + +from ._patch import __all__ as _patch_all +from ._patch import * # pylint: disable=unused-wildcard-import +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "FlattenClientOperationsMixin", +] +__all__.extend([p for p in _patch_all if p not in __all__]) +_patch_sdk() diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_operations.py new file mode 100644 index 00000000000..57923f15cb3 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_operations.py @@ -0,0 +1,415 @@ +# pylint: disable=too-many-lines,too-many-statements +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Unbranded (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from io import IOBase +import json +import sys +from typing import Any, Callable, Dict, IO, Optional, Type, TypeVar, Union, overload + +from corehttp.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) +from corehttp.rest import AsyncHttpResponse, HttpRequest +from corehttp.runtime.pipeline import PipelineResponse +from corehttp.utils import case_insensitive_dict + +from ... import models as _models +from ..._model_base import SdkJSONEncoder, _deserialize +from ..._operations._operations import ( + build_flatten_put_flatten_model_request, + build_flatten_put_nested_flatten_model_request, +) +from .._vendor import FlattenClientMixinABC + +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports +JSON = MutableMapping[str, Any] # pylint: disable=unsubscriptable-object +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + + +class FlattenClientOperationsMixin(FlattenClientMixinABC): + + @overload + async def put_flatten_model( + self, input: _models.FlattenModel, *, content_type: str = "application/json", **kwargs: Any + ) -> _models.FlattenModel: + """put_flatten_model. + + :param input: Required. + :type input: ~typetest.model.flatten.models.FlattenModel + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: FlattenModel. The FlattenModel is compatible with MutableMapping + :rtype: ~typetest.model.flatten.models.FlattenModel + :raises ~corehttp.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # JSON input template you can fill out and use as your body input. + input = { + "name": "str", # Required. + "properties": { + "age": 0, # Required. + "description": "str" # Required. + } + } + + # response body for status code(s): 200 + response == { + "name": "str", # Required. + "properties": { + "age": 0, # Required. + "description": "str" # Required. + } + } + """ + + @overload + async def put_flatten_model( + self, input: JSON, *, content_type: str = "application/json", **kwargs: Any + ) -> _models.FlattenModel: + """put_flatten_model. + + :param input: Required. + :type input: JSON + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: FlattenModel. The FlattenModel is compatible with MutableMapping + :rtype: ~typetest.model.flatten.models.FlattenModel + :raises ~corehttp.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # response body for status code(s): 200 + response == { + "name": "str", # Required. + "properties": { + "age": 0, # Required. + "description": "str" # Required. + } + } + """ + + @overload + async def put_flatten_model( + self, input: IO[bytes], *, content_type: str = "application/json", **kwargs: Any + ) -> _models.FlattenModel: + """put_flatten_model. + + :param input: Required. + :type input: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: FlattenModel. The FlattenModel is compatible with MutableMapping + :rtype: ~typetest.model.flatten.models.FlattenModel + :raises ~corehttp.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # response body for status code(s): 200 + response == { + "name": "str", # Required. + "properties": { + "age": 0, # Required. + "description": "str" # Required. + } + } + """ + + async def put_flatten_model( + self, input: Union[_models.FlattenModel, JSON, IO[bytes]], **kwargs: Any + ) -> _models.FlattenModel: + """put_flatten_model. + + :param input: Is one of the following types: FlattenModel, JSON, IO[bytes] Required. + :type input: ~typetest.model.flatten.models.FlattenModel or JSON or IO[bytes] + :return: FlattenModel. The FlattenModel is compatible with MutableMapping + :rtype: ~typetest.model.flatten.models.FlattenModel + :raises ~corehttp.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # JSON input template you can fill out and use as your body input. + input = { + "name": "str", # Required. + "properties": { + "age": 0, # Required. + "description": "str" # Required. + } + } + + # response body for status code(s): 200 + response == { + "name": "str", # Required. + "properties": { + "age": 0, # Required. + "description": "str" # Required. + } + } + """ + error_map: MutableMapping[int, Type[HttpResponseError]] = { + 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[_models.FlattenModel] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(input, (IOBase, bytes)): + _content = input + else: + _content = json.dumps(input, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_flatten_put_flatten_model_request( + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + _request.url = self._client.format_url(_request.url) + + _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: + await response.read() # Load the body in memory and close the socket + 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.FlattenModel, response.json()) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore + + @overload + async def put_nested_flatten_model( + self, input: _models.NestedFlattenModel, *, content_type: str = "application/json", **kwargs: Any + ) -> _models.NestedFlattenModel: + """put_nested_flatten_model. + + :param input: Required. + :type input: ~typetest.model.flatten.models.NestedFlattenModel + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping + :rtype: ~typetest.model.flatten.models.NestedFlattenModel + :raises ~corehttp.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # JSON input template you can fill out and use as your body input. + input = { + "name": "str", # Required. + "properties": { + "properties": { + "age": 0, # Required. + "description": "str" # Required. + }, + "summary": "str" # Required. + } + } + + # response body for status code(s): 200 + response == { + "name": "str", # Required. + "properties": { + "properties": { + "age": 0, # Required. + "description": "str" # Required. + }, + "summary": "str" # Required. + } + } + """ + + @overload + async def put_nested_flatten_model( + self, input: JSON, *, content_type: str = "application/json", **kwargs: Any + ) -> _models.NestedFlattenModel: + """put_nested_flatten_model. + + :param input: Required. + :type input: JSON + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping + :rtype: ~typetest.model.flatten.models.NestedFlattenModel + :raises ~corehttp.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # response body for status code(s): 200 + response == { + "name": "str", # Required. + "properties": { + "properties": { + "age": 0, # Required. + "description": "str" # Required. + }, + "summary": "str" # Required. + } + } + """ + + @overload + async def put_nested_flatten_model( + self, input: IO[bytes], *, content_type: str = "application/json", **kwargs: Any + ) -> _models.NestedFlattenModel: + """put_nested_flatten_model. + + :param input: Required. + :type input: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping + :rtype: ~typetest.model.flatten.models.NestedFlattenModel + :raises ~corehttp.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # response body for status code(s): 200 + response == { + "name": "str", # Required. + "properties": { + "properties": { + "age": 0, # Required. + "description": "str" # Required. + }, + "summary": "str" # Required. + } + } + """ + + async def put_nested_flatten_model( + self, input: Union[_models.NestedFlattenModel, JSON, IO[bytes]], **kwargs: Any + ) -> _models.NestedFlattenModel: + """put_nested_flatten_model. + + :param input: Is one of the following types: NestedFlattenModel, JSON, IO[bytes] Required. + :type input: ~typetest.model.flatten.models.NestedFlattenModel or JSON or IO[bytes] + :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping + :rtype: ~typetest.model.flatten.models.NestedFlattenModel + :raises ~corehttp.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # JSON input template you can fill out and use as your body input. + input = { + "name": "str", # Required. + "properties": { + "properties": { + "age": 0, # Required. + "description": "str" # Required. + }, + "summary": "str" # Required. + } + } + + # response body for status code(s): 200 + response == { + "name": "str", # Required. + "properties": { + "properties": { + "age": 0, # Required. + "description": "str" # Required. + }, + "summary": "str" # Required. + } + } + """ + error_map: MutableMapping[int, Type[HttpResponseError]] = { + 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[_models.NestedFlattenModel] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(input, (IOBase, bytes)): + _content = input + else: + _content = json.dumps(input, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_flatten_put_nested_flatten_model_request( + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + _request.url = self._client.format_url(_request.url) + + _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: + await response.read() # Load the body in memory and close the socket + 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.NestedFlattenModel, response.json()) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_patch.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_patch.py new file mode 100644 index 00000000000..cc9d8be1c50 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_patch.py @@ -0,0 +1,20 @@ +# ------------------------------------ +# Copyright (c) Unbranded Corporation. +# Licensed under the MIT License. +# ------------------------------------ +"""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/typetest-model-flatten/typetest/model/flatten/aio/_patch.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_patch.py new file mode 100644 index 00000000000..cc9d8be1c50 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_patch.py @@ -0,0 +1,20 @@ +# ------------------------------------ +# Copyright (c) Unbranded Corporation. +# Licensed under the MIT License. +# ------------------------------------ +"""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/typetest-model-flatten/typetest/model/flatten/aio/_vendor.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_vendor.py new file mode 100644 index 00000000000..1ab0ca2d718 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_vendor.py @@ -0,0 +1,26 @@ +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Unbranded (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 FlattenClientConfiguration + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from corehttp.runtime import AsyncPipelineClient + + from .._serialization import Deserializer, Serializer + + +class FlattenClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "AsyncPipelineClient" + _config: FlattenClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/models/__init__.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/models/__init__.py new file mode 100644 index 00000000000..f8c9bd0ff00 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/models/__init__.py @@ -0,0 +1,24 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Unbranded (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._models import ChildFlattenModel +from ._models import ChildModel +from ._models import FlattenModel +from ._models import NestedFlattenModel +from ._patch import __all__ as _patch_all +from ._patch import * # pylint: disable=unused-wildcard-import +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "ChildFlattenModel", + "ChildModel", + "FlattenModel", + "NestedFlattenModel", +] +__all__.extend([p for p in _patch_all if p not in __all__]) +_patch_sdk() diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/models/_models.py new file mode 100644 index 00000000000..769988d693f --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/models/_models.py @@ -0,0 +1,197 @@ +# coding=utf-8 +# pylint: disable=too-many-lines +# -------------------------------------------------------------------------- +# Copyright (c) Unbranded Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Unbranded (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Any, Mapping, TYPE_CHECKING, overload + +from .. import _model_base +from .._model_base import rest_field + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from .. import models as _models + + +class ChildFlattenModel(_model_base.Model): + """This is the child model to be flattened. And it has flattened property as well. + + All required parameters must be populated in order to send to server. + + :ivar summary: Required. + :vartype summary: str + :ivar properties: Required. + :vartype properties: ~typetest.model.flatten.models.ChildModel + """ + + summary: str = rest_field() + """Required.""" + properties: "_models.ChildModel" = rest_field() + """Required.""" + + __flattened_items = ["description", "age"] + + @overload + def __init__( + self, + *, + summary: str, + properties: "_models.ChildModel", + ): ... + + @overload + def __init__(self, mapping: Mapping[str, Any]): + """ + :param mapping: raw JSON to initialize the model. + :type mapping: Mapping[str, Any] + """ + + def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + _flattened_input = {k: kwargs.pop(k) for k in kwargs.keys() & self.__flattened_items} + super().__init__(*args, **kwargs) + for k, v in _flattened_input.items(): + setattr(self, k, v) + + def __getattr__(self, name: str) -> Any: + if name in self.__flattened_items: + if self.properties is None: + return None + return getattr(self.properties, name) + raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{name}'") + + def __setattr__(self, key: str, value: Any) -> None: + if key in self.__flattened_items: + if self.properties is None: + self.properties = self._attr_to_rest_field["properties"]._class_type() + setattr(self.properties, key, value) + else: + super().__setattr__(key, value) + + +class ChildModel(_model_base.Model): + """This is the child model to be flattened. + + All required parameters must be populated in order to send to server. + + :ivar description: Required. + :vartype description: str + :ivar age: Required. + :vartype age: int + """ + + description: str = rest_field() + """Required.""" + age: int = rest_field() + """Required.""" + + @overload + def __init__( + self, + *, + description: str, + age: int, + ): ... + + @overload + def __init__(self, mapping: Mapping[str, Any]): + """ + :param mapping: raw JSON to initialize the model. + :type mapping: Mapping[str, Any] + """ + + def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + super().__init__(*args, **kwargs) + + +class FlattenModel(_model_base.Model): + """This is the model with one level of flattening. + + All required parameters must be populated in order to send to server. + + :ivar name: Required. + :vartype name: str + :ivar properties: Required. + :vartype properties: ~typetest.model.flatten.models.ChildModel + """ + + name: str = rest_field() + """Required.""" + properties: "_models.ChildModel" = rest_field() + """Required.""" + + __flattened_items = ["description", "age"] + + @overload + def __init__( + self, + *, + name: str, + properties: "_models.ChildModel", + ): ... + + @overload + def __init__(self, mapping: Mapping[str, Any]): + """ + :param mapping: raw JSON to initialize the model. + :type mapping: Mapping[str, Any] + """ + + def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + _flattened_input = {k: kwargs.pop(k) for k in kwargs.keys() & self.__flattened_items} + super().__init__(*args, **kwargs) + for k, v in _flattened_input.items(): + setattr(self, k, v) + + def __getattr__(self, name: str) -> Any: + if name in self.__flattened_items: + if self.properties is None: + return None + return getattr(self.properties, name) + raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{name}'") + + def __setattr__(self, key: str, value: Any) -> None: + if key in self.__flattened_items: + if self.properties is None: + self.properties = self._attr_to_rest_field["properties"]._class_type() + setattr(self.properties, key, value) + else: + super().__setattr__(key, value) + + +class NestedFlattenModel(_model_base.Model): + """This is the model with two levels of flattening. + + All required parameters must be populated in order to send to server. + + :ivar name: Required. + :vartype name: str + :ivar properties: Required. + :vartype properties: ~typetest.model.flatten.models.ChildFlattenModel + """ + + name: str = rest_field() + """Required.""" + properties: "_models.ChildFlattenModel" = rest_field() + """Required.""" + + @overload + def __init__( + self, + *, + name: str, + properties: "_models.ChildFlattenModel", + ): ... + + @overload + def __init__(self, mapping: Mapping[str, Any]): + """ + :param mapping: raw JSON to initialize the model. + :type mapping: Mapping[str, Any] + """ + + def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + super().__init__(*args, **kwargs) diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/models/_patch.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/models/_patch.py new file mode 100644 index 00000000000..cc9d8be1c50 --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/models/_patch.py @@ -0,0 +1,20 @@ +# ------------------------------------ +# Copyright (c) Unbranded Corporation. +# Licensed under the MIT License. +# ------------------------------------ +"""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/typetest-model-flatten/typetest/model/flatten/py.typed b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/py.typed new file mode 100644 index 00000000000..e5aff4f83af --- /dev/null +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/py.typed @@ -0,0 +1 @@ +# Marker file for PEP 561. \ No newline at end of file diff --git a/packages/typespec-python/test/unbranded/requirements.txt b/packages/typespec-python/test/unbranded/requirements.txt index 31d55d91204..5eb02deff27 100644 --- a/packages/typespec-python/test/unbranded/requirements.txt +++ b/packages/typespec-python/test/unbranded/requirements.txt @@ -27,6 +27,7 @@ corehttp==1.0.0b3 -e ./generated/typetest-enum-extensible -e ./generated/typetest-enum-fixed -e ./generated/typetest-model-enumdiscriminator +-e ./generated/typetest-model-flatten -e ./generated/typetest-model-nesteddiscriminator -e ./generated/typetest-model-notdiscriminated -e ./generated/typetest-model-singlediscriminator diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ff88f96cd40..709d5c995bb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -71,8 +71,8 @@ importers: specifier: ~0.13.3 version: 0.13.3(@typespec/compiler@0.55.0)(@typespec/http@0.55.0)(@typespec/rest@0.55.0)(@typespec/versioning@0.55.0) '@azure-tools/cadl-ranch-specs': - specifier: ~0.32.0 - version: 0.32.0(@azure-tools/cadl-ranch-expect@0.13.3)(@azure-tools/typespec-azure-core@0.41.0)(@typespec/compiler@0.55.0)(@typespec/http@0.55.0)(@typespec/rest@0.55.0)(@typespec/versioning@0.55.0) + specifier: ~0.33.0 + version: 0.33.0(@azure-tools/cadl-ranch-expect@0.13.3)(@azure-tools/typespec-azure-core@0.41.0)(@typespec/compiler@0.55.0)(@typespec/http@0.55.0)(@typespec/rest@0.55.0)(@typespec/versioning@0.55.0) '@azure-tools/typespec-autorest': specifier: ~0.41.0 version: 0.41.0(@azure-tools/typespec-azure-core@0.41.0)(@azure-tools/typespec-client-generator-core@0.41.6)(@typespec/compiler@0.55.0)(@typespec/http@0.55.0)(@typespec/openapi@0.55.0)(@typespec/rest@0.55.0)(@typespec/versioning@0.55.0) @@ -209,8 +209,8 @@ packages: '@typespec/versioning': 0.55.0(@typespec/compiler@0.55.0) dev: true - /@azure-tools/cadl-ranch-specs@0.32.0(@azure-tools/cadl-ranch-expect@0.13.3)(@azure-tools/typespec-azure-core@0.41.0)(@typespec/compiler@0.55.0)(@typespec/http@0.55.0)(@typespec/rest@0.55.0)(@typespec/versioning@0.55.0): - resolution: {integrity: sha512-EogakRY4jY20ZkVffOfNNnzEVytmoGtmGrUJWODxnkVjmAZJw7T7STpNYjlZ8Fj6mr+twtG5eIaO8SLWns16OA==} + /@azure-tools/cadl-ranch-specs@0.33.0(@azure-tools/cadl-ranch-expect@0.13.3)(@azure-tools/typespec-azure-core@0.41.0)(@typespec/compiler@0.55.0)(@typespec/http@0.55.0)(@typespec/rest@0.55.0)(@typespec/versioning@0.55.0): + resolution: {integrity: sha512-xPkhZfh+y608bS2IcpVYTS3h+G8F4Pkit1aHCIeJjYkbY6LScoFdyTpMWn0mmRrbwA2yFFqZxWoIRtoyhk07wQ==} engines: {node: '>=16.0.0'} peerDependencies: '@azure-tools/cadl-ranch-expect': ~0.13.3