diff --git a/.chronus/changes/auto-iscai-msft-python-removeSpecsPrefix-2025-3-15-17-16-23.md b/.chronus/changes/auto-iscai-msft-python-removeSpecsPrefix-2025-3-15-17-16-23.md new file mode 100644 index 00000000000..cbf2c6f4d7d --- /dev/null +++ b/.chronus/changes/auto-iscai-msft-python-removeSpecsPrefix-2025-3-15-17-16-23.md @@ -0,0 +1,7 @@ +--- +changeKind: internal +packages: + - "@azure-tools/typespec-python" +--- + +Remove `specs.` from namespace path \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index c3141cb7c30..10f5881ce08 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,7 +10,7 @@ "cwd": "${workspaceFolder}/packages/typespec-python", "args": [ "compile", - "${workspaceFolder}/packages/typespec-python/node_modules/@azure-tools/cadl-ranch-specs/http/server/versions/not-versioned", + "${workspaceFolder}/packages/typespec-python/node_modules/@azure-tools/azure-http-specs/specs/azure/client-generator-core/access", "--emit", "${workspaceFolder}/packages/typespec-python/dist/src/index.js", "--option=@azure-tools/typespec-python.debug=true" @@ -61,6 +61,7 @@ "args": ["run", "${relativeFile}"], "smartStep": true }, + { "name": "npm: regenerate", "request": "launch", "type": "node", diff --git a/packages/autorest.python/package.json b/packages/autorest.python/package.json index 9a5d3789b0c..d9b342b9af8 100644 --- a/packages/autorest.python/package.json +++ b/packages/autorest.python/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md", "dependencies": { - "@typespec/http-client-python": "~0.9.3-dev.1", + "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNDc2MTY5Ni9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.9.2.tgz", "@autorest/system-requirements": "~1.0.2", "fs-extra": "~11.2.0", "tsx": "~4.19.1" diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json index 459ac5bb419..33d14440917 100644 --- a/packages/typespec-python/package.json +++ b/packages/typespec-python/package.json @@ -64,7 +64,7 @@ "js-yaml": "~4.1.0", "semver": "~7.6.2", "tsx": "~4.19.1", - "@typespec/http-client-python": "~0.9.3-dev.1", + "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNDc2MTY5Ni9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.9.2.tgz", "fs-extra": "~11.2.0" }, "devDependencies": { @@ -82,7 +82,7 @@ "@azure-tools/typespec-azure-rulesets": "~0.54.0", "@azure-tools/typespec-autorest": "~0.54.0", "@azure-tools/typespec-client-generator-core": "~0.54.0", - "@azure-tools/azure-http-specs": "0.1.0-alpha.13", + "@azure-tools/azure-http-specs": "0.1.0-alpha.14-dev.8", "@typespec/http-specs": "0.1.0-alpha.17", "@types/js-yaml": "~4.0.5", "@types/node": "~22.13.14", diff --git a/packages/typespec-python/scripts/eng/regenerate.ts b/packages/typespec-python/scripts/eng/regenerate.ts index 0160372c1d6..220bed74fd8 100644 --- a/packages/typespec-python/scripts/eng/regenerate.ts +++ b/packages/typespec-python/scripts/eng/regenerate.ts @@ -20,54 +20,6 @@ interface TspCommand { } const AZURE_EMITTER_OPTIONS: Record | Record[]> = { - "azure/client-generator-core/access": { - namespace: "specs.azure.clientgenerator.core.access", - }, - "azure/client-generator-core/api-version": { - namespace: "specs.azure.clientgenerator.core.apiversion", - }, - "azure/client-generator-core/client-initialization": { - namespace: "specs.azure.clientgenerator.core.clientinitialization", - }, - "azure/client-generator-core/flatten-property": { - namespace: "specs.azure.clientgenerator.core.flattenproperty", - }, - "azure/client-generator-core/usage": { - namespace: "specs.azure.clientgenerator.core.usage", - }, - "azure/core/basic": { - namespace: "specs.azure.core.basic", - }, - "azure/core/lro/rpc": { - namespace: "specs.azure.core.lro.rpc", - }, - "azure/core/lro/standard": { - namespace: "specs.azure.core.lro.standard", - }, - "azure/core/model": { - namespace: "specs.azure.core.model", - }, - "azure/core/page": { - namespace: "specs.azure.core.page", - }, - "azure/core/scalar": { - namespace: "specs.azure.core.scalar", - }, - "azure/core/traits": { - namespace: "specs.azure.core.traits", - }, - "azure/encode/duration": { - namespace: "specs.azure.encode.duration", - }, - "azure/example/basic": { - namespace: "specs.azure.example.basic", - }, - "azure/payload/pageable": { - namespace: "specs.azure.payload.pageable", - }, - "client/structure/default": { - namespace: "client.structure.service", - }, "client/structure/multi-client": { "package-name": "client-structure-multiclient", "namespace": "client.structure.multiclient", diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/MANIFEST.in index 7c79aa9f273..9255a7d333d 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/MANIFEST.in +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/MANIFEST.in @@ -1,9 +1,8 @@ include *.md include LICENSE -include specs/azure/clientgenerator/core/access/py.typed +include azure/clientgenerator/core/access/py.typed recursive-include tests *.py recursive-include samples *.py *.md -include specs/__init__.py -include specs/azure/__init__.py -include specs/azure/clientgenerator/__init__.py -include specs/azure/clientgenerator/core/__init__.py +include azure/__init__.py +include azure/clientgenerator/__init__.py +include azure/clientgenerator/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/README.md b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/README.md index 8dfe2f8f42c..97d7a668b6a 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/README.md +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/README.md @@ -1,4 +1,4 @@ -# Specs Azure Clientgenerator Core Access client library for Python +# Azure Clientgenerator Core Access client library for Python ## Getting started @@ -6,14 +6,14 @@ ### Install the package ```bash -python -m pip install specs-azure-clientgenerator-core-access +python -m pip install azure-clientgenerator-core-access ``` #### Prequisites - Python 3.9 or later is required to use this package. - You need an [Azure subscription][azure_sub] to use this package. -- An existing Specs Azure Clientgenerator Core Access instance. +- An existing Azure Clientgenerator Core Access instance. ## Contributing diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/apiview-properties.json index 00f5a031481..7da7d25eff0 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/apiview-properties.json @@ -1,12 +1,12 @@ { "CrossLanguagePackageId": "_Specs_.Azure.ClientGenerator.Core.Access", "CrossLanguageDefinitionId": { - "specs.azure.clientgenerator.core.access.models.NoDecoratorModelInPublic": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.NoDecoratorModelInPublic", - "specs.azure.clientgenerator.core.access.models.PublicDecoratorModelInInternal": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.PublicDecoratorModelInInternal", - "specs.azure.clientgenerator.core.access.models.PublicDecoratorModelInPublic": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.PublicDecoratorModelInPublic", - "specs.azure.clientgenerator.core.access.models.SharedModel": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.SharedModel", - "specs.azure.clientgenerator.core.access.AccessClient.public_operation.no_decorator_in_public": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic", - "specs.azure.clientgenerator.core.access.AccessClient.public_operation.public_decorator_in_public": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic", - "specs.azure.clientgenerator.core.access.AccessClient.shared_model_in_operation.public": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public" + "azure.clientgenerator.core.access.models.NoDecoratorModelInPublic": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.NoDecoratorModelInPublic", + "azure.clientgenerator.core.access.models.PublicDecoratorModelInInternal": "_Specs_.Azure.ClientGenerator.Core.Access.InternalOperation.PublicDecoratorModelInInternal", + "azure.clientgenerator.core.access.models.PublicDecoratorModelInPublic": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.PublicDecoratorModelInPublic", + "azure.clientgenerator.core.access.models.SharedModel": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.SharedModel", + "azure.clientgenerator.core.access.AccessClient.public_operation.no_decorator_in_public": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.noDecoratorInPublic", + "azure.clientgenerator.core.access.AccessClient.public_operation.public_decorator_in_public": "_Specs_.Azure.ClientGenerator.Core.Access.PublicOperation.publicDecoratorInPublic", + "azure.clientgenerator.core.access.AccessClient.shared_model_in_operation.public": "_Specs_.Azure.ClientGenerator.Core.Access.SharedModelInOperation.public" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_client.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/_client.py similarity index 93% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_client.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/_client.py index c90e9c86bd3..519a97d6ffa 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_client.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/_client.py @@ -29,16 +29,16 @@ class AccessClient: # pylint: disable=client-accepts-api-version-keyword :ivar public_operation: PublicOperationOperations operations :vartype public_operation: - specs.azure.clientgenerator.core.access.operations.PublicOperationOperations + azure.clientgenerator.core.access.operations.PublicOperationOperations :ivar internal_operation: InternalOperationOperations operations :vartype internal_operation: - specs.azure.clientgenerator.core.access.operations.InternalOperationOperations + azure.clientgenerator.core.access.operations.InternalOperationOperations :ivar shared_model_in_operation: SharedModelInOperationOperations operations :vartype shared_model_in_operation: - specs.azure.clientgenerator.core.access.operations.SharedModelInOperationOperations + azure.clientgenerator.core.access.operations.SharedModelInOperationOperations :ivar relative_model_in_operation: RelativeModelInOperationOperations operations :vartype relative_model_in_operation: - specs.azure.clientgenerator.core.access.operations.RelativeModelInOperationOperations + azure.clientgenerator.core.access.operations.RelativeModelInOperationOperations :keyword endpoint: Service host. Default value is "http://localhost:3000". :paramtype endpoint: str """ diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_configuration.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/_configuration.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/_configuration.py index 17d76593ee8..7a9f69c46b0 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/_configuration.py @@ -26,7 +26,7 @@ class AccessClientConfiguration: # pylint: disable=too-many-instance-attributes def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-access/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "clientgenerator-core-access/{}".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-access/specs/azure/clientgenerator/core/access/_model_base.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_serialization.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/_serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_serialization.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/_serialization.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_version.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_version.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/_version.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/_client.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/_client.py similarity index 93% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/_client.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/_client.py index 9c535497862..b6c5ae41379 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/_client.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/_client.py @@ -29,16 +29,16 @@ class AccessClient: # pylint: disable=client-accepts-api-version-keyword :ivar public_operation: PublicOperationOperations operations :vartype public_operation: - specs.azure.clientgenerator.core.access.aio.operations.PublicOperationOperations + azure.clientgenerator.core.access.aio.operations.PublicOperationOperations :ivar internal_operation: InternalOperationOperations operations :vartype internal_operation: - specs.azure.clientgenerator.core.access.aio.operations.InternalOperationOperations + azure.clientgenerator.core.access.aio.operations.InternalOperationOperations :ivar shared_model_in_operation: SharedModelInOperationOperations operations :vartype shared_model_in_operation: - specs.azure.clientgenerator.core.access.aio.operations.SharedModelInOperationOperations + azure.clientgenerator.core.access.aio.operations.SharedModelInOperationOperations :ivar relative_model_in_operation: RelativeModelInOperationOperations operations :vartype relative_model_in_operation: - specs.azure.clientgenerator.core.access.aio.operations.RelativeModelInOperationOperations + azure.clientgenerator.core.access.aio.operations.RelativeModelInOperationOperations :keyword endpoint: Service host. Default value is "http://localhost:3000". :paramtype endpoint: str """ diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/_configuration.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/_configuration.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/_configuration.py index 52d4bd9c9df..296ed87de92 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/_configuration.py @@ -26,7 +26,7 @@ class AccessClientConfiguration: # pylint: disable=too-many-instance-attributes def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-access/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "clientgenerator-core-access/{}".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-access/specs/azure/clientgenerator/core/access/aio/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/operations/_operations.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/operations/_operations.py index 31c2c108db4..86c6c311255 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/operations/_operations.py @@ -49,7 +49,7 @@ class PublicOperationOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~specs.azure.clientgenerator.core.access.aio.AccessClient`'s + :class:`~azure.clientgenerator.core.access.aio.AccessClient`'s :attr:`public_operation` attribute. """ @@ -68,7 +68,7 @@ async def no_decorator_in_public(self, *, name: str, **kwargs: Any) -> _models.N :paramtype name: str :return: NoDecoratorModelInPublic. The NoDecoratorModelInPublic is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.access.models.NoDecoratorModelInPublic + :rtype: ~azure.clientgenerator.core.access.models.NoDecoratorModelInPublic :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -128,7 +128,7 @@ async def public_decorator_in_public(self, *, name: str, **kwargs: Any) -> _mode :paramtype name: str :return: PublicDecoratorModelInPublic. The PublicDecoratorModelInPublic is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.access.models.PublicDecoratorModelInPublic + :rtype: ~azure.clientgenerator.core.access.models.PublicDecoratorModelInPublic :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -187,7 +187,7 @@ class InternalOperationOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~specs.azure.clientgenerator.core.access.aio.AccessClient`'s + :class:`~azure.clientgenerator.core.access.aio.AccessClient`'s :attr:`internal_operation` attribute. """ @@ -208,7 +208,7 @@ async def _no_decorator_in_internal( :paramtype name: str :return: NoDecoratorModelInInternal. The NoDecoratorModelInInternal is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.access.models._models.NoDecoratorModelInInternal + :rtype: ~azure.clientgenerator.core.access.models._models.NoDecoratorModelInInternal :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -272,8 +272,7 @@ async def _internal_decorator_in_internal( :paramtype name: str :return: InternalDecoratorModelInInternal. The InternalDecoratorModelInInternal is compatible with MutableMapping - :rtype: - ~specs.azure.clientgenerator.core.access.models._models.InternalDecoratorModelInInternal + :rtype: ~azure.clientgenerator.core.access.models._models.InternalDecoratorModelInInternal :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -337,7 +336,7 @@ async def _public_decorator_in_internal( :paramtype name: str :return: PublicDecoratorModelInInternal. The PublicDecoratorModelInInternal is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.access.models.PublicDecoratorModelInInternal + :rtype: ~azure.clientgenerator.core.access.models.PublicDecoratorModelInInternal :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -396,7 +395,7 @@ class SharedModelInOperationOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~specs.azure.clientgenerator.core.access.aio.AccessClient`'s + :class:`~azure.clientgenerator.core.access.aio.AccessClient`'s :attr:`shared_model_in_operation` attribute. """ @@ -414,7 +413,7 @@ async def public(self, *, name: str, **kwargs: Any) -> _models.SharedModel: :keyword name: Required. :paramtype name: str :return: SharedModel. The SharedModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.access.models.SharedModel + :rtype: ~azure.clientgenerator.core.access.models.SharedModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -473,7 +472,7 @@ async def _internal(self, *, name: str, **kwargs: Any) -> _models.SharedModel: :keyword name: Required. :paramtype name: str :return: SharedModel. The SharedModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.access.models.SharedModel + :rtype: ~azure.clientgenerator.core.access.models.SharedModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -532,7 +531,7 @@ class RelativeModelInOperationOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~specs.azure.clientgenerator.core.access.aio.AccessClient`'s + :class:`~azure.clientgenerator.core.access.aio.AccessClient`'s :attr:`relative_model_in_operation` attribute. """ @@ -561,7 +560,7 @@ async def _operation(self, *, name: str, **kwargs: Any) -> _models._models.Outer :keyword name: Required. :paramtype name: str :return: OuterModel. The OuterModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.access.models._models.OuterModel + :rtype: ~azure.clientgenerator.core.access.models._models.OuterModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -628,7 +627,7 @@ async def _discriminator(self, *, kind: str, **kwargs: Any) -> _models._models.A :keyword kind: Required. :paramtype kind: str :return: AbstractModel. The AbstractModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.access.models._models.AbstractModel + :rtype: ~azure.clientgenerator.core.access.models._models.AbstractModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/aio/operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/models/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/models/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/models/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/models/_models.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/models/_models.py similarity index 99% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/models/_models.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/models/_models.py index 73740de086a..132f86630a3 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/models/_models.py @@ -200,7 +200,7 @@ class OuterModel(BaseModel): :ivar name: Required. :vartype name: str :ivar inner: Required. - :vartype inner: ~specs.azure.clientgenerator.core.access.models._models.InnerModel + :vartype inner: ~azure.clientgenerator.core.access.models._models.InnerModel """ inner: "_models._models.InnerModel" = rest_field(visibility=["read", "create", "update", "delete", "query"]) diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/models/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/models/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/models/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/models/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/operations/_operations.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/operations/_operations.py index 91cd735702b..8a602ba95d5 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/operations/_operations.py @@ -222,7 +222,7 @@ class PublicOperationOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~specs.azure.clientgenerator.core.access.AccessClient`'s + :class:`~azure.clientgenerator.core.access.AccessClient`'s :attr:`public_operation` attribute. """ @@ -241,7 +241,7 @@ def no_decorator_in_public(self, *, name: str, **kwargs: Any) -> _models.NoDecor :paramtype name: str :return: NoDecoratorModelInPublic. The NoDecoratorModelInPublic is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.access.models.NoDecoratorModelInPublic + :rtype: ~azure.clientgenerator.core.access.models.NoDecoratorModelInPublic :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -301,7 +301,7 @@ def public_decorator_in_public(self, *, name: str, **kwargs: Any) -> _models.Pub :paramtype name: str :return: PublicDecoratorModelInPublic. The PublicDecoratorModelInPublic is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.access.models.PublicDecoratorModelInPublic + :rtype: ~azure.clientgenerator.core.access.models.PublicDecoratorModelInPublic :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -360,7 +360,7 @@ class InternalOperationOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~specs.azure.clientgenerator.core.access.AccessClient`'s + :class:`~azure.clientgenerator.core.access.AccessClient`'s :attr:`internal_operation` attribute. """ @@ -379,7 +379,7 @@ def _no_decorator_in_internal(self, *, name: str, **kwargs: Any) -> _models._mod :paramtype name: str :return: NoDecoratorModelInInternal. The NoDecoratorModelInInternal is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.access.models._models.NoDecoratorModelInInternal + :rtype: ~azure.clientgenerator.core.access.models._models.NoDecoratorModelInInternal :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -443,8 +443,7 @@ def _internal_decorator_in_internal( :paramtype name: str :return: InternalDecoratorModelInInternal. The InternalDecoratorModelInInternal is compatible with MutableMapping - :rtype: - ~specs.azure.clientgenerator.core.access.models._models.InternalDecoratorModelInInternal + :rtype: ~azure.clientgenerator.core.access.models._models.InternalDecoratorModelInInternal :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -506,7 +505,7 @@ def _public_decorator_in_internal(self, *, name: str, **kwargs: Any) -> _models. :paramtype name: str :return: PublicDecoratorModelInInternal. The PublicDecoratorModelInInternal is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.access.models.PublicDecoratorModelInInternal + :rtype: ~azure.clientgenerator.core.access.models.PublicDecoratorModelInInternal :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -565,7 +564,7 @@ class SharedModelInOperationOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~specs.azure.clientgenerator.core.access.AccessClient`'s + :class:`~azure.clientgenerator.core.access.AccessClient`'s :attr:`shared_model_in_operation` attribute. """ @@ -583,7 +582,7 @@ def public(self, *, name: str, **kwargs: Any) -> _models.SharedModel: :keyword name: Required. :paramtype name: str :return: SharedModel. The SharedModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.access.models.SharedModel + :rtype: ~azure.clientgenerator.core.access.models.SharedModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -642,7 +641,7 @@ def _internal(self, *, name: str, **kwargs: Any) -> _models.SharedModel: :keyword name: Required. :paramtype name: str :return: SharedModel. The SharedModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.access.models.SharedModel + :rtype: ~azure.clientgenerator.core.access.models.SharedModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -701,7 +700,7 @@ class RelativeModelInOperationOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~specs.azure.clientgenerator.core.access.AccessClient`'s + :class:`~azure.clientgenerator.core.access.AccessClient`'s :attr:`relative_model_in_operation` attribute. """ @@ -730,7 +729,7 @@ def _operation(self, *, name: str, **kwargs: Any) -> _models._models.OuterModel: :keyword name: Required. :paramtype name: str :return: OuterModel. The OuterModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.access.models._models.OuterModel + :rtype: ~azure.clientgenerator.core.access.models._models.OuterModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -797,7 +796,7 @@ def _discriminator(self, *, kind: str, **kwargs: Any) -> _models._models.Abstrac :keyword kind: Required. :paramtype kind: str :return: AbstractModel. The AbstractModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.access.models._models.AbstractModel + :rtype: ~azure.clientgenerator.core.access.models._models.AbstractModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/py.typed b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/py.typed rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/azure/clientgenerator/core/access/py.typed diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/generated_tests/testpreparer.py index 7deee53be35..5a0a991551b 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/generated_tests/testpreparer.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/generated_tests/testpreparer.py @@ -5,9 +5,9 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.clientgenerator.core.access import AccessClient from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer import functools -from specs.azure.clientgenerator.core.access import AccessClient class AccessClientTestBase(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/generated_tests/testpreparer_async.py index 7d4e8352e2b..da3c6a17e36 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/generated_tests/testpreparer_async.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/generated_tests/testpreparer_async.py @@ -5,8 +5,8 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.clientgenerator.core.access.aio import AccessClient from devtools_testutils import AzureRecordedTestCase -from specs.azure.clientgenerator.core.access.aio import AccessClient class AccessClientTestBaseAsync(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/setup.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/setup.py index 03586b58070..f81ff817836 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/setup.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/setup.py @@ -12,8 +12,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "specs-azure-clientgenerator-core-access" -PACKAGE_PPRINT_NAME = "Specs Azure Clientgenerator Core Access" +PACKAGE_NAME = "azure-clientgenerator-core-access" +PACKAGE_PPRINT_NAME = "Azure Clientgenerator Core Access" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace("-", "/") @@ -53,15 +53,14 @@ exclude=[ "tests", # Exclude packages that will be covered by PEP420 or nspkg - "specs", - "specs.azure", - "specs.azure.clientgenerator", - "specs.azure.clientgenerator.core", + "azure", + "azure.clientgenerator", + "azure.clientgenerator.core", ] ), include_package_data=True, package_data={ - "specs.azure.clientgenerator.core.access": ["py.typed"], + "azure.clientgenerator.core.access": ["py.typed"], }, install_requires=[ "isodate>=0.6.1", diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/CHANGELOG.md b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/CHANGELOG.md new file mode 100644 index 00000000000..628743d283a --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/CHANGELOG.md @@ -0,0 +1,5 @@ +# Release History + +## 1.0.0b1 (1970-01-01) + +- Initial version diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/LICENSE b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/LICENSE new file mode 100644 index 00000000000..63447fd8bbb --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/LICENSE @@ -0,0 +1,21 @@ +Copyright (c) Microsoft Corporation. + +MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/MANIFEST.in new file mode 100644 index 00000000000..603578bdee5 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/MANIFEST.in @@ -0,0 +1,8 @@ +include *.md +include LICENSE +include azure/clientgenerator/core/clientinitialization/py.typed +recursive-include tests *.py +recursive-include samples *.py *.md +include azure/__init__.py +include azure/clientgenerator/__init__.py +include azure/clientgenerator/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/README.md b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/README.md new file mode 100644 index 00000000000..3cf251c9132 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/README.md @@ -0,0 +1,43 @@ +# Azure Clientgenerator Core Clientinitialization client library for Python + + +## Getting started + +### Install the package + +```bash +python -m pip install azure-clientgenerator-core-clientinitialization +``` + +#### Prequisites + +- Python 3.9 or later is required to use this package. +- You need an [Azure subscription][azure_sub] to use this package. +- An existing Azure Clientgenerator Core Clientinitialization instance. + + +## Contributing + +This project welcomes contributions and suggestions. Most contributions require +you to agree to a Contributor License Agreement (CLA) declaring that you have +the right to, and actually do, grant us the rights to use your contribution. +For details, visit https://cla.microsoft.com. + +When you submit a pull request, a CLA-bot will automatically determine whether +you need to provide a CLA and decorate the PR appropriately (e.g., label, +comment). Simply follow the instructions provided by the bot. You will only +need to do this once across all repos using our CLA. + +This project has adopted the +[Microsoft Open Source Code of Conduct][code_of_conduct]. For more information, +see the Code of Conduct FAQ or contact opencode@microsoft.com with any +additional questions or comments. + + +[code_of_conduct]: https://opensource.microsoft.com/codeofconduct/ +[authenticate_with_token]: https://docs.microsoft.com/azure/cognitive-services/authentication?tabs=powershell#authenticate-with-an-authentication-token +[azure_identity_credentials]: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity#credentials +[azure_identity_pip]: https://pypi.org/project/azure-identity/ +[default_azure_credential]: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity#defaultazurecredential +[pip]: https://pypi.org/project/pip/ +[azure_sub]: https://azure.microsoft.com/free/ diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/apiview-properties.json new file mode 100644 index 00000000000..68ed968befb --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/apiview-properties.json @@ -0,0 +1,19 @@ +{ + "CrossLanguagePackageId": "Service", + "CrossLanguageDefinitionId": { + "azure.clientgenerator.core.clientinitialization.models.BlobProperties": "Service.BlobProperties", + "azure.clientgenerator.core.clientinitialization.models.Input": "Service.Input", + "azure.clientgenerator.core.clientinitialization.models.WithBodyRequest": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.withBody.Request.anonymous", + "azure.clientgenerator.core.clientinitialization.HeaderParamClient.with_query": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.HeaderParam.withQuery", + "azure.clientgenerator.core.clientinitialization.HeaderParamClient.with_body": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.HeaderParam.withBody", + "azure.clientgenerator.core.clientinitialization.MultipleParamsClient.with_query": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.MultipleParams.withQuery", + "azure.clientgenerator.core.clientinitialization.MultipleParamsClient.with_body": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.MultipleParams.withBody", + "azure.clientgenerator.core.clientinitialization.MixedParamsClient.with_query": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.MixedParams.withQuery", + "azure.clientgenerator.core.clientinitialization.MixedParamsClient.with_body": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.MixedParams.withBody", + "azure.clientgenerator.core.clientinitialization.PathParamClient.with_query": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.PathParam.withQuery", + "azure.clientgenerator.core.clientinitialization.PathParamClient.get_standalone": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.PathParam.getStandalone", + "azure.clientgenerator.core.clientinitialization.PathParamClient.delete_standalone": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.PathParam.deleteStandalone", + "azure.clientgenerator.core.clientinitialization.ParamAliasClient.with_aliased_name": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.ParamAlias.withAliasedName", + "azure.clientgenerator.core.clientinitialization.ParamAliasClient.with_original_name": "_Specs_.Azure.ClientGeneratorCore.ClientInitialization.ParamAlias.withOriginalName" + } +} \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/__init__.py new file mode 100644 index 00000000000..8ba41ec230d --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/__init__.py @@ -0,0 +1,40 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._client import HeaderParamClient # type: ignore +from ._client import MultipleParamsClient # type: ignore +from ._client import MixedParamsClient # type: ignore +from ._client import PathParamClient # type: ignore +from ._client import ParamAliasClient # type: ignore +from ._version import VERSION + +__version__ = VERSION + +try: + from ._patch import __all__ as _patch_all + from ._patch import * +except ImportError: + _patch_all = [] +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "HeaderParamClient", + "MultipleParamsClient", + "MixedParamsClient", + "PathParamClient", + "ParamAliasClient", +] +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore + +_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_client.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_client.py new file mode 100644 index 00000000000..7659603f3d2 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_client.py @@ -0,0 +1,408 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from copy import deepcopy +from typing import Any +from typing_extensions import Self + +from azure.core import PipelineClient +from azure.core.pipeline import policies +from azure.core.rest import HttpRequest, HttpResponse + +from ._configuration import ( + HeaderParamClientConfiguration, + MixedParamsClientConfiguration, + MultipleParamsClientConfiguration, + ParamAliasClientConfiguration, + PathParamClientConfiguration, +) +from ._operations import ( + HeaderParamClientOperationsMixin, + MixedParamsClientOperationsMixin, + MultipleParamsClientOperationsMixin, + ParamAliasClientOperationsMixin, + PathParamClientOperationsMixin, +) +from ._serialization import Deserializer, Serializer + + +class HeaderParamClient(HeaderParamClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Client for testing header parameter moved to client level. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, name: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = HeaderParamClientConfiguration(name=name, endpoint=endpoint, **kwargs) + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + policies.RequestIdPolicy(**kwargs), + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + self._config.redirect_policy, + self._config.retry_policy, + self._config.authentication_policy, + self._config.custom_hook_policy, + self._config.logging_policy, + policies.DistributedTracingPolicy(**kwargs), + policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, + self._config.http_logging_policy, + ] + self._client: PipelineClient = PipelineClient(base_url=_endpoint, policies=_policies, **kwargs) + + self._serialize = Serializer() + self._deserialize = Deserializer() + self._serialize.client_side_validation = False + + def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse: + """Runs the network request through the client's chained policies. + + >>> from azure.core.rest import HttpRequest + >>> request = HttpRequest("GET", "https://www.example.org/") + + >>> response = client.send_request(request) + + + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request + + :param request: The network request you want to make. Required. + :type request: ~azure.core.rest.HttpRequest + :keyword bool stream: Whether the response payload will be streamed. Defaults to False. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~azure.core.rest.HttpResponse + """ + + request_copy = deepcopy(request) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + + request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + def close(self) -> None: + self._client.close() + + def __enter__(self) -> Self: + self._client.__enter__() + return self + + def __exit__(self, *exc_details: Any) -> None: + self._client.__exit__(*exc_details) + + +class MultipleParamsClient(MultipleParamsClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """MultipleParamsClient. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :param region: The region to use for all operations. This parameter is used as a query + parameter. Required. + :type region: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, name: str, region: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = MultipleParamsClientConfiguration(name=name, region=region, endpoint=endpoint, **kwargs) + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + policies.RequestIdPolicy(**kwargs), + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + self._config.redirect_policy, + self._config.retry_policy, + self._config.authentication_policy, + self._config.custom_hook_policy, + self._config.logging_policy, + policies.DistributedTracingPolicy(**kwargs), + policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, + self._config.http_logging_policy, + ] + self._client: PipelineClient = PipelineClient(base_url=_endpoint, policies=_policies, **kwargs) + + self._serialize = Serializer() + self._deserialize = Deserializer() + self._serialize.client_side_validation = False + + def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse: + """Runs the network request through the client's chained policies. + + >>> from azure.core.rest import HttpRequest + >>> request = HttpRequest("GET", "https://www.example.org/") + + >>> response = client.send_request(request) + + + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request + + :param request: The network request you want to make. Required. + :type request: ~azure.core.rest.HttpRequest + :keyword bool stream: Whether the response payload will be streamed. Defaults to False. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~azure.core.rest.HttpResponse + """ + + request_copy = deepcopy(request) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + + request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + def close(self) -> None: + self._client.close() + + def __enter__(self) -> Self: + self._client.__enter__() + return self + + def __exit__(self, *exc_details: Any) -> None: + self._client.__exit__(*exc_details) + + +class MixedParamsClient(MixedParamsClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """MixedParamsClient. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, name: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = MixedParamsClientConfiguration(name=name, endpoint=endpoint, **kwargs) + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + policies.RequestIdPolicy(**kwargs), + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + self._config.redirect_policy, + self._config.retry_policy, + self._config.authentication_policy, + self._config.custom_hook_policy, + self._config.logging_policy, + policies.DistributedTracingPolicy(**kwargs), + policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, + self._config.http_logging_policy, + ] + self._client: PipelineClient = PipelineClient(base_url=_endpoint, policies=_policies, **kwargs) + + self._serialize = Serializer() + self._deserialize = Deserializer() + self._serialize.client_side_validation = False + + def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse: + """Runs the network request through the client's chained policies. + + >>> from azure.core.rest import HttpRequest + >>> request = HttpRequest("GET", "https://www.example.org/") + + >>> response = client.send_request(request) + + + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request + + :param request: The network request you want to make. Required. + :type request: ~azure.core.rest.HttpRequest + :keyword bool stream: Whether the response payload will be streamed. Defaults to False. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~azure.core.rest.HttpResponse + """ + + request_copy = deepcopy(request) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + + request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + def close(self) -> None: + self._client.close() + + def __enter__(self) -> Self: + self._client.__enter__() + return self + + def __exit__(self, *exc_details: Any) -> None: + self._client.__exit__(*exc_details) + + +class PathParamClient(PathParamClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """PathParamClient. + + :param blob_name: The name of the blob. This parameter is used as a path parameter in all + operations. Required. + :type blob_name: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, blob_name: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = PathParamClientConfiguration(blob_name=blob_name, endpoint=endpoint, **kwargs) + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + policies.RequestIdPolicy(**kwargs), + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + self._config.redirect_policy, + self._config.retry_policy, + self._config.authentication_policy, + self._config.custom_hook_policy, + self._config.logging_policy, + policies.DistributedTracingPolicy(**kwargs), + policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, + self._config.http_logging_policy, + ] + self._client: PipelineClient = PipelineClient(base_url=_endpoint, policies=_policies, **kwargs) + + self._serialize = Serializer() + self._deserialize = Deserializer() + self._serialize.client_side_validation = False + + def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse: + """Runs the network request through the client's chained policies. + + >>> from azure.core.rest import HttpRequest + >>> request = HttpRequest("GET", "https://www.example.org/") + + >>> response = client.send_request(request) + + + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request + + :param request: The network request you want to make. Required. + :type request: ~azure.core.rest.HttpRequest + :keyword bool stream: Whether the response payload will be streamed. Defaults to False. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~azure.core.rest.HttpResponse + """ + + request_copy = deepcopy(request) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + + request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + def close(self) -> None: + self._client.close() + + def __enter__(self) -> Self: + self._client.__enter__() + return self + + def __exit__(self, *exc_details: Any) -> None: + self._client.__exit__(*exc_details) + + +class ParamAliasClient(ParamAliasClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """ParamAliasClient. + + :param blob_name: Blob name for the client. Required. + :type blob_name: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, blob_name: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = ParamAliasClientConfiguration(blob_name=blob_name, endpoint=endpoint, **kwargs) + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + policies.RequestIdPolicy(**kwargs), + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + self._config.redirect_policy, + self._config.retry_policy, + self._config.authentication_policy, + self._config.custom_hook_policy, + self._config.logging_policy, + policies.DistributedTracingPolicy(**kwargs), + policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, + self._config.http_logging_policy, + ] + self._client: PipelineClient = PipelineClient(base_url=_endpoint, policies=_policies, **kwargs) + + self._serialize = Serializer() + self._deserialize = Deserializer() + self._serialize.client_side_validation = False + + def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse: + """Runs the network request through the client's chained policies. + + >>> from azure.core.rest import HttpRequest + >>> request = HttpRequest("GET", "https://www.example.org/") + + >>> response = client.send_request(request) + + + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request + + :param request: The network request you want to make. Required. + :type request: ~azure.core.rest.HttpRequest + :keyword bool stream: Whether the response payload will be streamed. Defaults to False. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~azure.core.rest.HttpResponse + """ + + request_copy = deepcopy(request) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + + request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + def close(self) -> None: + self._client.close() + + def __enter__(self) -> Self: + self._client.__enter__() + return self + + def __exit__(self, *exc_details: Any) -> None: + self._client.__exit__(*exc_details) diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_configuration.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_configuration.py new file mode 100644 index 00000000000..514caf12115 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_configuration.py @@ -0,0 +1,193 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Any + +from azure.core.pipeline import policies + +from ._version import VERSION + + +class HeaderParamClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for HeaderParamClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, name: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if name is None: + raise ValueError("Parameter 'name' must not be None.") + + self.name = name + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "clientgenerator-core-clientinitialization/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) + self._configure(**kwargs) + + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs) + self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs) + self.authentication_policy = kwargs.get("authentication_policy") + + +class MultipleParamsClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for MultipleParamsClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :param region: The region to use for all operations. This parameter is used as a query + parameter. Required. + :type region: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, name: str, region: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if name is None: + raise ValueError("Parameter 'name' must not be None.") + if region is None: + raise ValueError("Parameter 'region' must not be None.") + + self.name = name + self.region = region + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "clientgenerator-core-clientinitialization/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) + self._configure(**kwargs) + + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs) + self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs) + self.authentication_policy = kwargs.get("authentication_policy") + + +class MixedParamsClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for MixedParamsClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, name: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if name is None: + raise ValueError("Parameter 'name' must not be None.") + + self.name = name + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "clientgenerator-core-clientinitialization/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) + self._configure(**kwargs) + + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs) + self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs) + self.authentication_policy = kwargs.get("authentication_policy") + + +class PathParamClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for PathParamClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param blob_name: The name of the blob. This parameter is used as a path parameter in all + operations. Required. + :type blob_name: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, blob_name: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if blob_name is None: + raise ValueError("Parameter 'blob_name' must not be None.") + + self.blob_name = blob_name + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "clientgenerator-core-clientinitialization/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) + self._configure(**kwargs) + + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs) + self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs) + self.authentication_policy = kwargs.get("authentication_policy") + + +class ParamAliasClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for ParamAliasClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param blob_name: Blob name for the client. Required. + :type blob_name: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, blob_name: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if blob_name is None: + raise ValueError("Parameter 'blob_name' must not be None.") + + self.blob_name = blob_name + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "clientgenerator-core-clientinitialization/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) + self._configure(**kwargs) + + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs) + self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs) + self.authentication_policy = kwargs.get("authentication_policy") diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_model_base.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_operations/__init__.py new file mode 100644 index 00000000000..e5356103522 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_operations/__init__.py @@ -0,0 +1,33 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._operations import HeaderParamClientOperationsMixin # type: ignore +from ._operations import MultipleParamsClientOperationsMixin # type: ignore +from ._operations import MixedParamsClientOperationsMixin # type: ignore +from ._operations import PathParamClientOperationsMixin # type: ignore +from ._operations import ParamAliasClientOperationsMixin # type: ignore + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "HeaderParamClientOperationsMixin", + "MultipleParamsClientOperationsMixin", + "MixedParamsClientOperationsMixin", + "PathParamClientOperationsMixin", + "ParamAliasClientOperationsMixin", +] +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore +_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_operations/_operations.py new file mode 100644 index 00000000000..0c767dd17d6 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_operations/_operations.py @@ -0,0 +1,949 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from collections.abc import MutableMapping +from io import IOBase +import json +from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + StreamClosedError, + StreamConsumedError, + map_error, +) +from azure.core.pipeline import PipelineResponse +from azure.core.rest import HttpRequest, HttpResponse +from azure.core.tracing.decorator import distributed_trace +from azure.core.utils import case_insensitive_dict + +from .. import models as _models +from .._model_base import SdkJSONEncoder, _deserialize +from .._serialization import Serializer +from .._vendor import ( + HeaderParamClientMixinABC, + MixedParamsClientMixinABC, + MultipleParamsClientMixinABC, + ParamAliasClientMixinABC, + PathParamClientMixinABC, +) + +JSON = MutableMapping[str, Any] +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +_SERIALIZER = Serializer() +_SERIALIZER.client_side_validation = False + + +def build_header_param_with_query_request(*, id: str, name: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + # Construct URL + _url = "/azure/client-generator-core/client-initialization/header-param/with-query" + + # Construct parameters + _params["id"] = _SERIALIZER.query("id", id, "str") + + # Construct headers + _headers["name"] = _SERIALIZER.header("name", name, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_header_param_with_body_request(*, name: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + # Construct URL + _url = "/azure/client-generator-core/client-initialization/header-param/with-body" + + # Construct headers + _headers["name"] = _SERIALIZER.header("name", name, "str") + if content_type is not None: + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + + return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) + + +def build_multiple_params_with_query_request(*, id: str, name: str, region: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + # Construct URL + _url = "/azure/client-generator-core/client-initialization/multiple-params/with-query" + + # Construct parameters + _params["region"] = _SERIALIZER.query("region", region, "str") + _params["id"] = _SERIALIZER.query("id", id, "str") + + # Construct headers + _headers["name"] = _SERIALIZER.header("name", name, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_multiple_params_with_body_request(*, name: str, region: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + # Construct URL + _url = "/azure/client-generator-core/client-initialization/multiple-params/with-body" + + # Construct parameters + _params["region"] = _SERIALIZER.query("region", region, "str") + + # Construct headers + _headers["name"] = _SERIALIZER.header("name", name, "str") + if content_type is not None: + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + + return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_mixed_params_with_query_request(*, region: str, id: str, name: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + # Construct URL + _url = "/azure/client-generator-core/client-initialization/mixed-params/with-query" + + # Construct parameters + _params["region"] = _SERIALIZER.query("region", region, "str") + _params["id"] = _SERIALIZER.query("id", id, "str") + + # Construct headers + _headers["name"] = _SERIALIZER.header("name", name, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_mixed_params_with_body_request(*, region: str, name: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + # Construct URL + _url = "/azure/client-generator-core/client-initialization/mixed-params/with-body" + + # Construct parameters + _params["region"] = _SERIALIZER.query("region", region, "str") + + # Construct headers + _headers["name"] = _SERIALIZER.header("name", name, "str") + if content_type is not None: + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + + return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_path_param_with_query_request(blob_name: str, *, format: Optional[str] = None, **kwargs: Any) -> HttpRequest: + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + # Construct URL + _url = "/azure/client-generator-core/client-initialization/path/{blobName}/with-query" + path_format_arguments = { + "blobName": _SERIALIZER.url("blob_name", blob_name, "str"), + } + + _url: str = _url.format(**path_format_arguments) # type: ignore + + # Construct parameters + if format is not None: + _params["format"] = _SERIALIZER.query("format", format, "str") + + return HttpRequest(method="GET", url=_url, params=_params, **kwargs) + + +def build_path_param_get_standalone_request(blob_name: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + + accept = _headers.pop("Accept", "application/json") + + # Construct URL + _url = "/azure/client-generator-core/client-initialization/path/{blobName}/get-standalone" + path_format_arguments = { + "blobName": _SERIALIZER.url("blob_name", blob_name, "str"), + } + + _url: str = _url.format(**path_format_arguments) # type: ignore + + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) + + +def build_path_param_delete_standalone_request( # pylint: disable=name-too-long + blob_name: str, **kwargs: Any +) -> HttpRequest: + # Construct URL + _url = "/azure/client-generator-core/client-initialization/path/{blobName}" + path_format_arguments = { + "blobName": _SERIALIZER.url("blob_name", blob_name, "str"), + } + + _url: str = _url.format(**path_format_arguments) # type: ignore + + return HttpRequest(method="DELETE", url=_url, **kwargs) + + +def build_param_alias_with_aliased_name_request( # pylint: disable=name-too-long + blob: str, **kwargs: Any +) -> HttpRequest: + # Construct URL + _url = "/azure/client-generator-core/client-initialization/param-alias/{blob}/with-aliased-name" + path_format_arguments = { + "blob": _SERIALIZER.url("blob", blob, "str"), + } + + _url: str = _url.format(**path_format_arguments) # type: ignore + + return HttpRequest(method="GET", url=_url, **kwargs) + + +def build_param_alias_with_original_name_request( # pylint: disable=name-too-long + blob_name: str, **kwargs: Any +) -> HttpRequest: + # Construct URL + _url = "/azure/client-generator-core/client-initialization/param-alias/{blobName}/with-original-name" + path_format_arguments = { + "blobName": _SERIALIZER.url("blob_name", blob_name, "str"), + } + + _url: str = _url.format(**path_format_arguments) # type: ignore + + return HttpRequest(method="GET", url=_url, **kwargs) + + +class HeaderParamClientOperationsMixin(HeaderParamClientMixinABC): + + @distributed_trace + def with_query(self, *, id: str, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + """with_query. + + :keyword id: Required. + :paramtype id: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_header_param_with_query_request( + id=id, + name=self._config.name, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + @overload + def with_body(self, body: _models.Input, *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: ~azure.clientgenerator.core.clientinitialization.models.Input + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def with_body(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: JSON + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def with_body(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace + def with_body( # pylint: disable=inconsistent-return-statements + self, body: Union[_models.Input, JSON, IO[bytes]], **kwargs: Any + ) -> None: + """with_body. + + :param body: Is one of the following types: Input, JSON, IO[bytes] Required. + :type body: ~azure.clientgenerator.core.clientinitialization.models.Input or JSON or IO[bytes] + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = kwargs.pop("params", {}) or {} + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[None] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(body, (IOBase, bytes)): + _content = body + else: + _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_header_param_with_body_request( + name=self._config.name, + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + +class MultipleParamsClientOperationsMixin(MultipleParamsClientMixinABC): + + @distributed_trace + def with_query(self, *, id: str, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + """with_query. + + :keyword id: Required. + :paramtype id: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_multiple_params_with_query_request( + id=id, + name=self._config.name, + region=self._config.region, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + @overload + def with_body(self, body: _models.Input, *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: ~azure.clientgenerator.core.clientinitialization.models.Input + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def with_body(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: JSON + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def with_body(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace + def with_body( # pylint: disable=inconsistent-return-statements + self, body: Union[_models.Input, JSON, IO[bytes]], **kwargs: Any + ) -> None: + """with_body. + + :param body: Is one of the following types: Input, JSON, IO[bytes] Required. + :type body: ~azure.clientgenerator.core.clientinitialization.models.Input or JSON or IO[bytes] + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = kwargs.pop("params", {}) or {} + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[None] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(body, (IOBase, bytes)): + _content = body + else: + _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_multiple_params_with_body_request( + name=self._config.name, + region=self._config.region, + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + +class MixedParamsClientOperationsMixin(MixedParamsClientMixinABC): + + @distributed_trace + def with_query( # pylint: disable=inconsistent-return-statements + self, *, region: str, id: str, **kwargs: Any + ) -> None: + """with_query. + + :keyword region: Required. + :paramtype region: str + :keyword id: Required. + :paramtype id: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_mixed_params_with_query_request( + region=region, + id=id, + name=self._config.name, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + @overload + def with_body( + self, body: _models.WithBodyRequest, *, region: str, content_type: str = "application/json", **kwargs: Any + ) -> None: + """with_body. + + :param body: Required. + :type body: ~azure.clientgenerator.core.clientinitialization.models.WithBodyRequest + :keyword region: Required. + :paramtype region: str + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def with_body(self, body: JSON, *, region: str, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: JSON + :keyword region: Required. + :paramtype region: str + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def with_body(self, body: IO[bytes], *, region: str, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: IO[bytes] + :keyword region: Required. + :paramtype region: str + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace + def with_body( # pylint: disable=inconsistent-return-statements + self, body: Union[_models.WithBodyRequest, JSON, IO[bytes]], *, region: str, **kwargs: Any + ) -> None: + """with_body. + + :param body: Is one of the following types: WithBodyRequest, JSON, IO[bytes] Required. + :type body: ~azure.clientgenerator.core.clientinitialization.models.WithBodyRequest or JSON or + IO[bytes] + :keyword region: Required. + :paramtype region: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = kwargs.pop("params", {}) or {} + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[None] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(body, (IOBase, bytes)): + _content = body + else: + _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_mixed_params_with_body_request( + region=region, + name=self._config.name, + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + +class PathParamClientOperationsMixin(PathParamClientMixinABC): + + @distributed_trace + def with_query( # pylint: disable=inconsistent-return-statements + self, *, format: Optional[str] = None, **kwargs: Any + ) -> None: + """with_query. + + :keyword format: Default value is None. + :paramtype format: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_path_param_with_query_request( + blob_name=self._config.blob_name, + format=format, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + @distributed_trace + def get_standalone(self, **kwargs: Any) -> _models.BlobProperties: + """get_standalone. + + :return: BlobProperties. The BlobProperties is compatible with MutableMapping + :rtype: ~azure.clientgenerator.core.clientinitialization.models.BlobProperties + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[_models.BlobProperties] = kwargs.pop("cls", None) + + _request = build_path_param_get_standalone_request( + blob_name=self._config.blob_name, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = kwargs.pop("stream", False) + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + if _stream: + try: + response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if _stream: + deserialized = response.iter_bytes() + else: + deserialized = _deserialize(_models.BlobProperties, response.json()) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore + + @distributed_trace + def delete_standalone(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + """delete_standalone. + + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_path_param_delete_standalone_request( + blob_name=self._config.blob_name, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + +class ParamAliasClientOperationsMixin(ParamAliasClientMixinABC): + + @distributed_trace + def with_aliased_name(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + """with_aliased_name. + + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_param_alias_with_aliased_name_request( + blob=self._config.blob, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + @distributed_trace + def with_original_name(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + """with_original_name. + + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_param_alias_with_original_name_request( + blob_name=self._config.blob_name, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_serialization.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_serialization.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_serialization.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_vendor.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_vendor.py new file mode 100644 index 00000000000..0bf891fe013 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_vendor.py @@ -0,0 +1,67 @@ +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from abc import ABC +from typing import TYPE_CHECKING + +from ._configuration import ( + HeaderParamClientConfiguration, + MixedParamsClientConfiguration, + MultipleParamsClientConfiguration, + ParamAliasClientConfiguration, + PathParamClientConfiguration, +) + +if TYPE_CHECKING: + from azure.core import PipelineClient + + from ._serialization import Deserializer, Serializer + + +class HeaderParamClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "PipelineClient" + _config: HeaderParamClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" + + +class MultipleParamsClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "PipelineClient" + _config: MultipleParamsClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" + + +class MixedParamsClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "PipelineClient" + _config: MixedParamsClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" + + +class PathParamClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "PipelineClient" + _config: PathParamClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" + + +class ParamAliasClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "PipelineClient" + _config: ParamAliasClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_version.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_version.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/_version.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/__init__.py new file mode 100644 index 00000000000..1a48c35e178 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/__init__.py @@ -0,0 +1,37 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._client import HeaderParamClient # type: ignore +from ._client import MultipleParamsClient # type: ignore +from ._client import MixedParamsClient # type: ignore +from ._client import PathParamClient # type: ignore +from ._client import ParamAliasClient # type: ignore + +try: + from ._patch import __all__ as _patch_all + from ._patch import * +except ImportError: + _patch_all = [] +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "HeaderParamClient", + "MultipleParamsClient", + "MixedParamsClient", + "PathParamClient", + "ParamAliasClient", +] +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore + +_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_client.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_client.py new file mode 100644 index 00000000000..4829446b51d --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_client.py @@ -0,0 +1,418 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from copy import deepcopy +from typing import Any, Awaitable +from typing_extensions import Self + +from azure.core import AsyncPipelineClient +from azure.core.pipeline import policies +from azure.core.rest import AsyncHttpResponse, HttpRequest + +from .._serialization import Deserializer, Serializer +from ._configuration import ( + HeaderParamClientConfiguration, + MixedParamsClientConfiguration, + MultipleParamsClientConfiguration, + ParamAliasClientConfiguration, + PathParamClientConfiguration, +) +from ._operations import ( + HeaderParamClientOperationsMixin, + MixedParamsClientOperationsMixin, + MultipleParamsClientOperationsMixin, + ParamAliasClientOperationsMixin, + PathParamClientOperationsMixin, +) + + +class HeaderParamClient(HeaderParamClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """Client for testing header parameter moved to client level. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, name: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = HeaderParamClientConfiguration(name=name, endpoint=endpoint, **kwargs) + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + policies.RequestIdPolicy(**kwargs), + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + self._config.redirect_policy, + self._config.retry_policy, + self._config.authentication_policy, + self._config.custom_hook_policy, + self._config.logging_policy, + policies.DistributedTracingPolicy(**kwargs), + policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, + self._config.http_logging_policy, + ] + self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=_endpoint, policies=_policies, **kwargs) + + self._serialize = Serializer() + self._deserialize = Deserializer() + self._serialize.client_side_validation = False + + def send_request( + self, request: HttpRequest, *, stream: bool = False, **kwargs: Any + ) -> Awaitable[AsyncHttpResponse]: + """Runs the network request through the client's chained policies. + + >>> from azure.core.rest import HttpRequest + >>> request = HttpRequest("GET", "https://www.example.org/") + + >>> response = await client.send_request(request) + + + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request + + :param request: The network request you want to make. Required. + :type request: ~azure.core.rest.HttpRequest + :keyword bool stream: Whether the response payload will be streamed. Defaults to False. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~azure.core.rest.AsyncHttpResponse + """ + + request_copy = deepcopy(request) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + + request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + async def close(self) -> None: + await self._client.close() + + async def __aenter__(self) -> Self: + await self._client.__aenter__() + return self + + async def __aexit__(self, *exc_details: Any) -> None: + await self._client.__aexit__(*exc_details) + + +class MultipleParamsClient(MultipleParamsClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """MultipleParamsClient. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :param region: The region to use for all operations. This parameter is used as a query + parameter. Required. + :type region: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, name: str, region: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = MultipleParamsClientConfiguration(name=name, region=region, endpoint=endpoint, **kwargs) + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + policies.RequestIdPolicy(**kwargs), + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + self._config.redirect_policy, + self._config.retry_policy, + self._config.authentication_policy, + self._config.custom_hook_policy, + self._config.logging_policy, + policies.DistributedTracingPolicy(**kwargs), + policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, + self._config.http_logging_policy, + ] + self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=_endpoint, policies=_policies, **kwargs) + + self._serialize = Serializer() + self._deserialize = Deserializer() + self._serialize.client_side_validation = False + + def send_request( + self, request: HttpRequest, *, stream: bool = False, **kwargs: Any + ) -> Awaitable[AsyncHttpResponse]: + """Runs the network request through the client's chained policies. + + >>> from azure.core.rest import HttpRequest + >>> request = HttpRequest("GET", "https://www.example.org/") + + >>> response = await client.send_request(request) + + + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request + + :param request: The network request you want to make. Required. + :type request: ~azure.core.rest.HttpRequest + :keyword bool stream: Whether the response payload will be streamed. Defaults to False. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~azure.core.rest.AsyncHttpResponse + """ + + request_copy = deepcopy(request) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + + request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + async def close(self) -> None: + await self._client.close() + + async def __aenter__(self) -> Self: + await self._client.__aenter__() + return self + + async def __aexit__(self, *exc_details: Any) -> None: + await self._client.__aexit__(*exc_details) + + +class MixedParamsClient(MixedParamsClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """MixedParamsClient. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, name: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = MixedParamsClientConfiguration(name=name, endpoint=endpoint, **kwargs) + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + policies.RequestIdPolicy(**kwargs), + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + self._config.redirect_policy, + self._config.retry_policy, + self._config.authentication_policy, + self._config.custom_hook_policy, + self._config.logging_policy, + policies.DistributedTracingPolicy(**kwargs), + policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, + self._config.http_logging_policy, + ] + self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=_endpoint, policies=_policies, **kwargs) + + self._serialize = Serializer() + self._deserialize = Deserializer() + self._serialize.client_side_validation = False + + def send_request( + self, request: HttpRequest, *, stream: bool = False, **kwargs: Any + ) -> Awaitable[AsyncHttpResponse]: + """Runs the network request through the client's chained policies. + + >>> from azure.core.rest import HttpRequest + >>> request = HttpRequest("GET", "https://www.example.org/") + + >>> response = await client.send_request(request) + + + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request + + :param request: The network request you want to make. Required. + :type request: ~azure.core.rest.HttpRequest + :keyword bool stream: Whether the response payload will be streamed. Defaults to False. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~azure.core.rest.AsyncHttpResponse + """ + + request_copy = deepcopy(request) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + + request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + async def close(self) -> None: + await self._client.close() + + async def __aenter__(self) -> Self: + await self._client.__aenter__() + return self + + async def __aexit__(self, *exc_details: Any) -> None: + await self._client.__aexit__(*exc_details) + + +class PathParamClient(PathParamClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """PathParamClient. + + :param blob_name: The name of the blob. This parameter is used as a path parameter in all + operations. Required. + :type blob_name: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, blob_name: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = PathParamClientConfiguration(blob_name=blob_name, endpoint=endpoint, **kwargs) + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + policies.RequestIdPolicy(**kwargs), + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + self._config.redirect_policy, + self._config.retry_policy, + self._config.authentication_policy, + self._config.custom_hook_policy, + self._config.logging_policy, + policies.DistributedTracingPolicy(**kwargs), + policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, + self._config.http_logging_policy, + ] + self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=_endpoint, policies=_policies, **kwargs) + + self._serialize = Serializer() + self._deserialize = Deserializer() + self._serialize.client_side_validation = False + + def send_request( + self, request: HttpRequest, *, stream: bool = False, **kwargs: Any + ) -> Awaitable[AsyncHttpResponse]: + """Runs the network request through the client's chained policies. + + >>> from azure.core.rest import HttpRequest + >>> request = HttpRequest("GET", "https://www.example.org/") + + >>> response = await client.send_request(request) + + + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request + + :param request: The network request you want to make. Required. + :type request: ~azure.core.rest.HttpRequest + :keyword bool stream: Whether the response payload will be streamed. Defaults to False. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~azure.core.rest.AsyncHttpResponse + """ + + request_copy = deepcopy(request) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + + request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + async def close(self) -> None: + await self._client.close() + + async def __aenter__(self) -> Self: + await self._client.__aenter__() + return self + + async def __aexit__(self, *exc_details: Any) -> None: + await self._client.__aexit__(*exc_details) + + +class ParamAliasClient(ParamAliasClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword + """ParamAliasClient. + + :param blob_name: Blob name for the client. Required. + :type blob_name: str + :keyword endpoint: Service host. Default value is "http://localhost:3000". + :paramtype endpoint: str + """ + + def __init__( # pylint: disable=missing-client-constructor-parameter-credential + self, blob_name: str, *, endpoint: str = "http://localhost:3000", **kwargs: Any + ) -> None: + _endpoint = "{endpoint}" + self._config = ParamAliasClientConfiguration(blob_name=blob_name, endpoint=endpoint, **kwargs) + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + policies.RequestIdPolicy(**kwargs), + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + self._config.redirect_policy, + self._config.retry_policy, + self._config.authentication_policy, + self._config.custom_hook_policy, + self._config.logging_policy, + policies.DistributedTracingPolicy(**kwargs), + policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, + self._config.http_logging_policy, + ] + self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=_endpoint, policies=_policies, **kwargs) + + self._serialize = Serializer() + self._deserialize = Deserializer() + self._serialize.client_side_validation = False + + def send_request( + self, request: HttpRequest, *, stream: bool = False, **kwargs: Any + ) -> Awaitable[AsyncHttpResponse]: + """Runs the network request through the client's chained policies. + + >>> from azure.core.rest import HttpRequest + >>> request = HttpRequest("GET", "https://www.example.org/") + + >>> response = await client.send_request(request) + + + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request + + :param request: The network request you want to make. Required. + :type request: ~azure.core.rest.HttpRequest + :keyword bool stream: Whether the response payload will be streamed. Defaults to False. + :return: The response of your network call. Does not do error handling on your response. + :rtype: ~azure.core.rest.AsyncHttpResponse + """ + + request_copy = deepcopy(request) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + + request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore + + async def close(self) -> None: + await self._client.close() + + async def __aenter__(self) -> Self: + await self._client.__aenter__() + return self + + async def __aexit__(self, *exc_details: Any) -> None: + await self._client.__aexit__(*exc_details) diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_configuration.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_configuration.py new file mode 100644 index 00000000000..91682cf904d --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_configuration.py @@ -0,0 +1,193 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Any + +from azure.core.pipeline import policies + +from .._version import VERSION + + +class HeaderParamClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for HeaderParamClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, name: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if name is None: + raise ValueError("Parameter 'name' must not be None.") + + self.name = name + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "clientgenerator-core-clientinitialization/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) + self._configure(**kwargs) + + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs) + self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs) + self.authentication_policy = kwargs.get("authentication_policy") + + +class MultipleParamsClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for MultipleParamsClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :param region: The region to use for all operations. This parameter is used as a query + parameter. Required. + :type region: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, name: str, region: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if name is None: + raise ValueError("Parameter 'name' must not be None.") + if region is None: + raise ValueError("Parameter 'region' must not be None.") + + self.name = name + self.region = region + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "clientgenerator-core-clientinitialization/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) + self._configure(**kwargs) + + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs) + self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs) + self.authentication_policy = kwargs.get("authentication_policy") + + +class MixedParamsClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for MixedParamsClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param name: The name of the client. This parameter is used as a header in all operations. + Required. + :type name: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, name: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if name is None: + raise ValueError("Parameter 'name' must not be None.") + + self.name = name + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "clientgenerator-core-clientinitialization/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) + self._configure(**kwargs) + + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs) + self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs) + self.authentication_policy = kwargs.get("authentication_policy") + + +class PathParamClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for PathParamClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param blob_name: The name of the blob. This parameter is used as a path parameter in all + operations. Required. + :type blob_name: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, blob_name: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if blob_name is None: + raise ValueError("Parameter 'blob_name' must not be None.") + + self.blob_name = blob_name + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "clientgenerator-core-clientinitialization/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) + self._configure(**kwargs) + + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs) + self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs) + self.authentication_policy = kwargs.get("authentication_policy") + + +class ParamAliasClientConfiguration: # pylint: disable=too-many-instance-attributes + """Configuration for ParamAliasClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param blob_name: Blob name for the client. Required. + :type blob_name: str + :param endpoint: Service host. Default value is "http://localhost:3000". + :type endpoint: str + """ + + def __init__(self, blob_name: str, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: + if blob_name is None: + raise ValueError("Parameter 'blob_name' must not be None.") + + self.blob_name = blob_name + self.endpoint = endpoint + kwargs.setdefault("sdk_moniker", "clientgenerator-core-clientinitialization/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) + self._configure(**kwargs) + + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs) + self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs) + self.authentication_policy = kwargs.get("authentication_policy") diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_operations/__init__.py new file mode 100644 index 00000000000..e5356103522 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_operations/__init__.py @@ -0,0 +1,33 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._operations import HeaderParamClientOperationsMixin # type: ignore +from ._operations import MultipleParamsClientOperationsMixin # type: ignore +from ._operations import MixedParamsClientOperationsMixin # type: ignore +from ._operations import PathParamClientOperationsMixin # type: ignore +from ._operations import ParamAliasClientOperationsMixin # type: ignore + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "HeaderParamClientOperationsMixin", + "MultipleParamsClientOperationsMixin", + "MixedParamsClientOperationsMixin", + "PathParamClientOperationsMixin", + "ParamAliasClientOperationsMixin", +] +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore +_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_operations/_operations.py new file mode 100644 index 00000000000..f8b5e65c68b --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_operations/_operations.py @@ -0,0 +1,773 @@ +# pylint: disable=line-too-long,useless-suppression +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from collections.abc import MutableMapping +from io import IOBase +import json +from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + StreamClosedError, + StreamConsumedError, + map_error, +) +from azure.core.pipeline import PipelineResponse +from azure.core.rest import AsyncHttpResponse, HttpRequest +from azure.core.tracing.decorator_async import distributed_trace_async +from azure.core.utils import case_insensitive_dict + +from ... import models as _models +from ..._model_base import SdkJSONEncoder, _deserialize +from ..._operations._operations import ( + build_header_param_with_body_request, + build_header_param_with_query_request, + build_mixed_params_with_body_request, + build_mixed_params_with_query_request, + build_multiple_params_with_body_request, + build_multiple_params_with_query_request, + build_param_alias_with_aliased_name_request, + build_param_alias_with_original_name_request, + build_path_param_delete_standalone_request, + build_path_param_get_standalone_request, + build_path_param_with_query_request, +) +from .._vendor import ( + HeaderParamClientMixinABC, + MixedParamsClientMixinABC, + MultipleParamsClientMixinABC, + ParamAliasClientMixinABC, + PathParamClientMixinABC, +) + +JSON = MutableMapping[str, Any] +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + + +class HeaderParamClientOperationsMixin(HeaderParamClientMixinABC): + + @distributed_trace_async + async def with_query(self, *, id: str, **kwargs: Any) -> None: + """with_query. + + :keyword id: Required. + :paramtype id: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_header_param_with_query_request( + id=id, + name=self._config.name, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + @overload + async def with_body(self, body: _models.Input, *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: ~azure.clientgenerator.core.clientinitialization.models.Input + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def with_body(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: JSON + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def with_body(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace_async + async def with_body(self, body: Union[_models.Input, JSON, IO[bytes]], **kwargs: Any) -> None: + """with_body. + + :param body: Is one of the following types: Input, JSON, IO[bytes] Required. + :type body: ~azure.clientgenerator.core.clientinitialization.models.Input or JSON or IO[bytes] + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = kwargs.pop("params", {}) or {} + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[None] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(body, (IOBase, bytes)): + _content = body + else: + _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_header_param_with_body_request( + name=self._config.name, + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + +class MultipleParamsClientOperationsMixin(MultipleParamsClientMixinABC): + + @distributed_trace_async + async def with_query(self, *, id: str, **kwargs: Any) -> None: + """with_query. + + :keyword id: Required. + :paramtype id: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_multiple_params_with_query_request( + id=id, + name=self._config.name, + region=self._config.region, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + @overload + async def with_body(self, body: _models.Input, *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: ~azure.clientgenerator.core.clientinitialization.models.Input + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def with_body(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: JSON + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def with_body(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + """with_body. + + :param body: Required. + :type body: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace_async + async def with_body(self, body: Union[_models.Input, JSON, IO[bytes]], **kwargs: Any) -> None: + """with_body. + + :param body: Is one of the following types: Input, JSON, IO[bytes] Required. + :type body: ~azure.clientgenerator.core.clientinitialization.models.Input or JSON or IO[bytes] + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = kwargs.pop("params", {}) or {} + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[None] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(body, (IOBase, bytes)): + _content = body + else: + _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_multiple_params_with_body_request( + name=self._config.name, + region=self._config.region, + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + +class MixedParamsClientOperationsMixin(MixedParamsClientMixinABC): + + @distributed_trace_async + async def with_query(self, *, region: str, id: str, **kwargs: Any) -> None: + """with_query. + + :keyword region: Required. + :paramtype region: str + :keyword id: Required. + :paramtype id: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_mixed_params_with_query_request( + region=region, + id=id, + name=self._config.name, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + @overload + async def with_body( + self, body: _models.WithBodyRequest, *, region: str, content_type: str = "application/json", **kwargs: Any + ) -> None: + """with_body. + + :param body: Required. + :type body: ~azure.clientgenerator.core.clientinitialization.models.WithBodyRequest + :keyword region: Required. + :paramtype region: str + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def with_body( + self, body: JSON, *, region: str, content_type: str = "application/json", **kwargs: Any + ) -> None: + """with_body. + + :param body: Required. + :type body: JSON + :keyword region: Required. + :paramtype region: str + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def with_body( + self, body: IO[bytes], *, region: str, content_type: str = "application/json", **kwargs: Any + ) -> None: + """with_body. + + :param body: Required. + :type body: IO[bytes] + :keyword region: Required. + :paramtype region: str + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace_async + async def with_body( + self, body: Union[_models.WithBodyRequest, JSON, IO[bytes]], *, region: str, **kwargs: Any + ) -> None: + """with_body. + + :param body: Is one of the following types: WithBodyRequest, JSON, IO[bytes] Required. + :type body: ~azure.clientgenerator.core.clientinitialization.models.WithBodyRequest or JSON or + IO[bytes] + :keyword region: Required. + :paramtype region: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = kwargs.pop("params", {}) or {} + + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[None] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _content = None + if isinstance(body, (IOBase, bytes)): + _content = body + else: + _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore + + _request = build_mixed_params_with_body_request( + region=region, + name=self._config.name, + content_type=content_type, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + +class PathParamClientOperationsMixin(PathParamClientMixinABC): + + @distributed_trace_async + async def with_query(self, *, format: Optional[str] = None, **kwargs: Any) -> None: + """with_query. + + :keyword format: Default value is None. + :paramtype format: str + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_path_param_with_query_request( + blob_name=self._config.blob_name, + format=format, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + @distributed_trace_async + async def get_standalone(self, **kwargs: Any) -> _models.BlobProperties: + """get_standalone. + + :return: BlobProperties. The BlobProperties is compatible with MutableMapping + :rtype: ~azure.clientgenerator.core.clientinitialization.models.BlobProperties + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[_models.BlobProperties] = kwargs.pop("cls", None) + + _request = build_path_param_get_standalone_request( + blob_name=self._config.blob_name, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = kwargs.pop("stream", False) + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + if _stream: + try: + await response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if _stream: + deserialized = response.iter_bytes() + else: + deserialized = _deserialize(_models.BlobProperties, response.json()) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore + + @distributed_trace_async + async def delete_standalone(self, **kwargs: Any) -> None: + """delete_standalone. + + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_path_param_delete_standalone_request( + blob_name=self._config.blob_name, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + +class ParamAliasClientOperationsMixin(ParamAliasClientMixinABC): + + @distributed_trace_async + async def with_aliased_name(self, **kwargs: Any) -> None: + """with_aliased_name. + + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_param_alias_with_aliased_name_request( + blob=self._config.blob, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + @distributed_trace_async + async def with_original_name(self, **kwargs: Any) -> None: + """with_original_name. + + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_param_alias_with_original_name_request( + blob_name=self._config.blob_name, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_vendor.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_vendor.py new file mode 100644 index 00000000000..8eb2c6bd696 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/aio/_vendor.py @@ -0,0 +1,67 @@ +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from abc import ABC +from typing import TYPE_CHECKING + +from ._configuration import ( + HeaderParamClientConfiguration, + MixedParamsClientConfiguration, + MultipleParamsClientConfiguration, + ParamAliasClientConfiguration, + PathParamClientConfiguration, +) + +if TYPE_CHECKING: + from azure.core import AsyncPipelineClient + + from .._serialization import Deserializer, Serializer + + +class HeaderParamClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "AsyncPipelineClient" + _config: HeaderParamClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" + + +class MultipleParamsClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "AsyncPipelineClient" + _config: MultipleParamsClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" + + +class MixedParamsClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "AsyncPipelineClient" + _config: MixedParamsClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" + + +class PathParamClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "AsyncPipelineClient" + _config: PathParamClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" + + +class ParamAliasClientMixinABC(ABC): + """DO NOT use this class. It is for internal typing use only.""" + + _client: "AsyncPipelineClient" + _config: ParamAliasClientConfiguration + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/models/__init__.py new file mode 100644 index 00000000000..08806180ab5 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/models/__init__.py @@ -0,0 +1,31 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + + +from ._models import ( # type: ignore + BlobProperties, + Input, + WithBodyRequest, +) +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "BlobProperties", + "Input", + "WithBodyRequest", +] +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore +_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/models/_models.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/models/_models.py new file mode 100644 index 00000000000..dc2e5935ad1 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/models/_models.py @@ -0,0 +1,115 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +# pylint: disable=useless-super-delegation + +import datetime +from typing import Any, Mapping, overload + +from .. import _model_base +from .._model_base import rest_field + + +class BlobProperties(_model_base.Model): + """Properties of a blob. + + :ivar name: Required. + :vartype name: str + :ivar size: Required. + :vartype size: int + :ivar content_type: Required. + :vartype content_type: str + :ivar created_on: Required. + :vartype created_on: ~datetime.datetime + """ + + name: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) + """Required.""" + size: int = rest_field(visibility=["read", "create", "update", "delete", "query"]) + """Required.""" + content_type: str = rest_field(name="contentType", visibility=["read", "create", "update", "delete", "query"]) + """Required.""" + created_on: datetime.datetime = rest_field( + name="createdOn", visibility=["read", "create", "update", "delete", "query"], format="rfc3339" + ) + """Required.""" + + @overload + def __init__( + self, + *, + name: str, + size: int, + content_type: str, + created_on: datetime.datetime, + ) -> None: ... + + @overload + def __init__(self, mapping: Mapping[str, Any]) -> None: + """ + :param mapping: raw JSON to initialize the model. + :type mapping: Mapping[str, Any] + """ + + def __init__(self, *args: Any, **kwargs: Any) -> None: + super().__init__(*args, **kwargs) + + +class Input(_model_base.Model): + """Input. + + :ivar name: Required. + :vartype name: str + """ + + name: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) + """Required.""" + + @overload + def __init__( + self, + *, + name: str, + ) -> None: ... + + @overload + def __init__(self, mapping: Mapping[str, Any]) -> None: + """ + :param mapping: raw JSON to initialize the model. + :type mapping: Mapping[str, Any] + """ + + def __init__(self, *args: Any, **kwargs: Any) -> None: + super().__init__(*args, **kwargs) + + +class WithBodyRequest(_model_base.Model): + """WithBodyRequest. + + :ivar name: Required. + :vartype name: str + """ + + name: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) + """Required.""" + + @overload + def __init__( + self, + *, + name: str, + ) -> None: ... + + @overload + def __init__(self, mapping: Mapping[str, Any]) -> None: + """ + :param mapping: raw JSON to initialize the model. + :type mapping: Mapping[str, Any] + """ + + def __init__(self, *args: Any, **kwargs: Any) -> None: + super().__init__(*args, **kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/models/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/models/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/models/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/models/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/py.typed b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/py.typed rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/azure/clientgenerator/core/clientinitialization/py.typed diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/dev_requirements.txt b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/dev_requirements.txt new file mode 100644 index 00000000000..10548647144 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/dev_requirements.txt @@ -0,0 +1,3 @@ +-e ../../../tools/azure-sdk-tools +../../core/azure-core +aiohttp \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/conftest.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/conftest.py new file mode 100644 index 00000000000..bc1efd0f372 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/conftest.py @@ -0,0 +1,75 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import os +import pytest +from dotenv import load_dotenv +from devtools_testutils import ( + test_proxy, + add_general_regex_sanitizer, + add_body_key_sanitizer, + add_header_regex_sanitizer, +) + +load_dotenv() + + +# For security, please avoid record sensitive identity information in recordings +@pytest.fixture(scope="session", autouse=True) +def add_sanitizers(test_proxy): + headerparam_subscription_id = os.environ.get("HEADERPARAM_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") + headerparam_tenant_id = os.environ.get("HEADERPARAM_TENANT_ID", "00000000-0000-0000-0000-000000000000") + headerparam_client_id = os.environ.get("HEADERPARAM_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + headerparam_client_secret = os.environ.get("HEADERPARAM_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=headerparam_subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=headerparam_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=headerparam_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=headerparam_client_secret, value="00000000-0000-0000-0000-000000000000") + + multipleparams_subscription_id = os.environ.get( + "MULTIPLEPARAMS_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000" + ) + multipleparams_tenant_id = os.environ.get("MULTIPLEPARAMS_TENANT_ID", "00000000-0000-0000-0000-000000000000") + multipleparams_client_id = os.environ.get("MULTIPLEPARAMS_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + multipleparams_client_secret = os.environ.get( + "MULTIPLEPARAMS_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000" + ) + add_general_regex_sanitizer(regex=multipleparams_subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=multipleparams_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=multipleparams_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=multipleparams_client_secret, value="00000000-0000-0000-0000-000000000000") + + mixedparams_subscription_id = os.environ.get("MIXEDPARAMS_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") + mixedparams_tenant_id = os.environ.get("MIXEDPARAMS_TENANT_ID", "00000000-0000-0000-0000-000000000000") + mixedparams_client_id = os.environ.get("MIXEDPARAMS_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + mixedparams_client_secret = os.environ.get("MIXEDPARAMS_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=mixedparams_subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=mixedparams_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=mixedparams_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=mixedparams_client_secret, value="00000000-0000-0000-0000-000000000000") + + pathparam_subscription_id = os.environ.get("PATHPARAM_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") + pathparam_tenant_id = os.environ.get("PATHPARAM_TENANT_ID", "00000000-0000-0000-0000-000000000000") + pathparam_client_id = os.environ.get("PATHPARAM_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + pathparam_client_secret = os.environ.get("PATHPARAM_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=pathparam_subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=pathparam_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=pathparam_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=pathparam_client_secret, value="00000000-0000-0000-0000-000000000000") + + paramalias_subscription_id = os.environ.get("PARAMALIAS_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") + paramalias_tenant_id = os.environ.get("PARAMALIAS_TENANT_ID", "00000000-0000-0000-0000-000000000000") + paramalias_client_id = os.environ.get("PARAMALIAS_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + paramalias_client_secret = os.environ.get("PARAMALIAS_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=paramalias_subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=paramalias_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=paramalias_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=paramalias_client_secret, value="00000000-0000-0000-0000-000000000000") + + add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]") + add_header_regex_sanitizer(key="Cookie", value="cookie;") + add_body_key_sanitizer(json_path="$..access_token", value="access_token") diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_header_param.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_header_param.py new file mode 100644 index 00000000000..b31ec5cf500 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_header_param.py @@ -0,0 +1,35 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils import recorded_by_proxy +from testpreparer import HeaderParamClientTestBase, HeaderParamPreparer + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestHeaderParam(HeaderParamClientTestBase): + @HeaderParamPreparer() + @recorded_by_proxy + def test_with_query(self, headerparam_endpoint): + client = self.create_client(endpoint=headerparam_endpoint) + response = client.with_query( + id="str", + ) + + # please add some check logic here by yourself + # ... + + @HeaderParamPreparer() + @recorded_by_proxy + def test_with_body(self, headerparam_endpoint): + client = self.create_client(endpoint=headerparam_endpoint) + response = client.with_body( + body={"name": "str"}, + ) + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_header_param_async.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_header_param_async.py new file mode 100644 index 00000000000..787cb30d7bf --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_header_param_async.py @@ -0,0 +1,36 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils.aio import recorded_by_proxy_async +from testpreparer import HeaderParamPreparer +from testpreparer_async import HeaderParamClientTestBaseAsync + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestHeaderParamAsync(HeaderParamClientTestBaseAsync): + @HeaderParamPreparer() + @recorded_by_proxy_async + async def test_with_query(self, headerparam_endpoint): + client = self.create_async_client(endpoint=headerparam_endpoint) + response = await client.with_query( + id="str", + ) + + # please add some check logic here by yourself + # ... + + @HeaderParamPreparer() + @recorded_by_proxy_async + async def test_with_body(self, headerparam_endpoint): + client = self.create_async_client(endpoint=headerparam_endpoint) + response = await client.with_body( + body={"name": "str"}, + ) + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_mixed_params.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_mixed_params.py new file mode 100644 index 00000000000..396cff2001f --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_mixed_params.py @@ -0,0 +1,37 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils import recorded_by_proxy +from testpreparer import MixedParamsClientTestBase, MixedParamsPreparer + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestMixedParams(MixedParamsClientTestBase): + @MixedParamsPreparer() + @recorded_by_proxy + def test_with_query(self, mixedparams_endpoint): + client = self.create_client(endpoint=mixedparams_endpoint) + response = client.with_query( + region="str", + id="str", + ) + + # please add some check logic here by yourself + # ... + + @MixedParamsPreparer() + @recorded_by_proxy + def test_with_body(self, mixedparams_endpoint): + client = self.create_client(endpoint=mixedparams_endpoint) + response = client.with_body( + body={"name": "str"}, + region="str", + ) + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_mixed_params_async.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_mixed_params_async.py new file mode 100644 index 00000000000..9e962339c9e --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_mixed_params_async.py @@ -0,0 +1,38 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils.aio import recorded_by_proxy_async +from testpreparer import MixedParamsPreparer +from testpreparer_async import MixedParamsClientTestBaseAsync + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestMixedParamsAsync(MixedParamsClientTestBaseAsync): + @MixedParamsPreparer() + @recorded_by_proxy_async + async def test_with_query(self, mixedparams_endpoint): + client = self.create_async_client(endpoint=mixedparams_endpoint) + response = await client.with_query( + region="str", + id="str", + ) + + # please add some check logic here by yourself + # ... + + @MixedParamsPreparer() + @recorded_by_proxy_async + async def test_with_body(self, mixedparams_endpoint): + client = self.create_async_client(endpoint=mixedparams_endpoint) + response = await client.with_body( + body={"name": "str"}, + region="str", + ) + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_multiple_params.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_multiple_params.py new file mode 100644 index 00000000000..92b624f15bf --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_multiple_params.py @@ -0,0 +1,35 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils import recorded_by_proxy +from testpreparer import MultipleParamsClientTestBase, MultipleParamsPreparer + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestMultipleParams(MultipleParamsClientTestBase): + @MultipleParamsPreparer() + @recorded_by_proxy + def test_with_query(self, multipleparams_endpoint): + client = self.create_client(endpoint=multipleparams_endpoint) + response = client.with_query( + id="str", + ) + + # please add some check logic here by yourself + # ... + + @MultipleParamsPreparer() + @recorded_by_proxy + def test_with_body(self, multipleparams_endpoint): + client = self.create_client(endpoint=multipleparams_endpoint) + response = client.with_body( + body={"name": "str"}, + ) + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_multiple_params_async.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_multiple_params_async.py new file mode 100644 index 00000000000..14ef35169bc --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_multiple_params_async.py @@ -0,0 +1,36 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils.aio import recorded_by_proxy_async +from testpreparer import MultipleParamsPreparer +from testpreparer_async import MultipleParamsClientTestBaseAsync + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestMultipleParamsAsync(MultipleParamsClientTestBaseAsync): + @MultipleParamsPreparer() + @recorded_by_proxy_async + async def test_with_query(self, multipleparams_endpoint): + client = self.create_async_client(endpoint=multipleparams_endpoint) + response = await client.with_query( + id="str", + ) + + # please add some check logic here by yourself + # ... + + @MultipleParamsPreparer() + @recorded_by_proxy_async + async def test_with_body(self, multipleparams_endpoint): + client = self.create_async_client(endpoint=multipleparams_endpoint) + response = await client.with_body( + body={"name": "str"}, + ) + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_param_alias.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_param_alias.py new file mode 100644 index 00000000000..8680bbb0cd5 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_param_alias.py @@ -0,0 +1,31 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils import recorded_by_proxy +from testpreparer import ParamAliasClientTestBase, ParamAliasPreparer + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestParamAlias(ParamAliasClientTestBase): + @ParamAliasPreparer() + @recorded_by_proxy + def test_with_aliased_name(self, paramalias_endpoint): + client = self.create_client(endpoint=paramalias_endpoint) + response = client.with_aliased_name() + + # please add some check logic here by yourself + # ... + + @ParamAliasPreparer() + @recorded_by_proxy + def test_with_original_name(self, paramalias_endpoint): + client = self.create_client(endpoint=paramalias_endpoint) + response = client.with_original_name() + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_param_alias_async.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_param_alias_async.py new file mode 100644 index 00000000000..a9afaa01686 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_param_alias_async.py @@ -0,0 +1,32 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils.aio import recorded_by_proxy_async +from testpreparer import ParamAliasPreparer +from testpreparer_async import ParamAliasClientTestBaseAsync + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestParamAliasAsync(ParamAliasClientTestBaseAsync): + @ParamAliasPreparer() + @recorded_by_proxy_async + async def test_with_aliased_name(self, paramalias_endpoint): + client = self.create_async_client(endpoint=paramalias_endpoint) + response = await client.with_aliased_name() + + # please add some check logic here by yourself + # ... + + @ParamAliasPreparer() + @recorded_by_proxy_async + async def test_with_original_name(self, paramalias_endpoint): + client = self.create_async_client(endpoint=paramalias_endpoint) + response = await client.with_original_name() + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_path_param.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_path_param.py new file mode 100644 index 00000000000..66aa7f93817 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_path_param.py @@ -0,0 +1,40 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils import recorded_by_proxy +from testpreparer import PathParamClientTestBase, PathParamPreparer + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestPathParam(PathParamClientTestBase): + @PathParamPreparer() + @recorded_by_proxy + def test_with_query(self, pathparam_endpoint): + client = self.create_client(endpoint=pathparam_endpoint) + response = client.with_query() + + # please add some check logic here by yourself + # ... + + @PathParamPreparer() + @recorded_by_proxy + def test_get_standalone(self, pathparam_endpoint): + client = self.create_client(endpoint=pathparam_endpoint) + response = client.get_standalone() + + # please add some check logic here by yourself + # ... + + @PathParamPreparer() + @recorded_by_proxy + def test_delete_standalone(self, pathparam_endpoint): + client = self.create_client(endpoint=pathparam_endpoint) + response = client.delete_standalone() + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_path_param_async.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_path_param_async.py new file mode 100644 index 00000000000..43c3d4ebed8 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/test_path_param_async.py @@ -0,0 +1,41 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from devtools_testutils.aio import recorded_by_proxy_async +from testpreparer import PathParamPreparer +from testpreparer_async import PathParamClientTestBaseAsync + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestPathParamAsync(PathParamClientTestBaseAsync): + @PathParamPreparer() + @recorded_by_proxy_async + async def test_with_query(self, pathparam_endpoint): + client = self.create_async_client(endpoint=pathparam_endpoint) + response = await client.with_query() + + # please add some check logic here by yourself + # ... + + @PathParamPreparer() + @recorded_by_proxy_async + async def test_get_standalone(self, pathparam_endpoint): + client = self.create_async_client(endpoint=pathparam_endpoint) + response = await client.get_standalone() + + # please add some check logic here by yourself + # ... + + @PathParamPreparer() + @recorded_by_proxy_async + async def test_delete_standalone(self, pathparam_endpoint): + client = self.create_async_client(endpoint=pathparam_endpoint) + response = await client.delete_standalone() + + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/testpreparer.py new file mode 100644 index 00000000000..22191359c44 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/testpreparer.py @@ -0,0 +1,96 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from azure.clientgenerator.core.clientinitialization import ( + HeaderParamClient, + MixedParamsClient, + MultipleParamsClient, + ParamAliasClient, + PathParamClient, +) +from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer +import functools + + +class HeaderParamClientTestBase(AzureRecordedTestCase): + + def create_client(self, endpoint): + credential = self.get_credential(HeaderParamClient) + return self.create_client_from_credential( + HeaderParamClient, + credential=credential, + endpoint=endpoint, + ) + + +HeaderParamPreparer = functools.partial( + PowerShellPreparer, "headerparam", headerparam_endpoint="https://fake_headerparam_endpoint.com" +) + + +class MultipleParamsClientTestBase(AzureRecordedTestCase): + + def create_client(self, endpoint): + credential = self.get_credential(MultipleParamsClient) + return self.create_client_from_credential( + MultipleParamsClient, + credential=credential, + endpoint=endpoint, + ) + + +MultipleParamsPreparer = functools.partial( + PowerShellPreparer, "multipleparams", multipleparams_endpoint="https://fake_multipleparams_endpoint.com" +) + + +class MixedParamsClientTestBase(AzureRecordedTestCase): + + def create_client(self, endpoint): + credential = self.get_credential(MixedParamsClient) + return self.create_client_from_credential( + MixedParamsClient, + credential=credential, + endpoint=endpoint, + ) + + +MixedParamsPreparer = functools.partial( + PowerShellPreparer, "mixedparams", mixedparams_endpoint="https://fake_mixedparams_endpoint.com" +) + + +class PathParamClientTestBase(AzureRecordedTestCase): + + def create_client(self, endpoint): + credential = self.get_credential(PathParamClient) + return self.create_client_from_credential( + PathParamClient, + credential=credential, + endpoint=endpoint, + ) + + +PathParamPreparer = functools.partial( + PowerShellPreparer, "pathparam", pathparam_endpoint="https://fake_pathparam_endpoint.com" +) + + +class ParamAliasClientTestBase(AzureRecordedTestCase): + + def create_client(self, endpoint): + credential = self.get_credential(ParamAliasClient) + return self.create_client_from_credential( + ParamAliasClient, + credential=credential, + endpoint=endpoint, + ) + + +ParamAliasPreparer = functools.partial( + PowerShellPreparer, "paramalias", paramalias_endpoint="https://fake_paramalias_endpoint.com" +) diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/testpreparer_async.py new file mode 100644 index 00000000000..c0b33006d36 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/generated_tests/testpreparer_async.py @@ -0,0 +1,70 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from azure.clientgenerator.core.clientinitialization.aio import ( + HeaderParamClient, + MixedParamsClient, + MultipleParamsClient, + ParamAliasClient, + PathParamClient, +) +from devtools_testutils import AzureRecordedTestCase + + +class HeaderParamClientTestBaseAsync(AzureRecordedTestCase): + + def create_async_client(self, endpoint): + credential = self.get_credential(HeaderParamClient, is_async=True) + return self.create_client_from_credential( + HeaderParamClient, + credential=credential, + endpoint=endpoint, + ) + + +class MultipleParamsClientTestBaseAsync(AzureRecordedTestCase): + + def create_async_client(self, endpoint): + credential = self.get_credential(MultipleParamsClient, is_async=True) + return self.create_client_from_credential( + MultipleParamsClient, + credential=credential, + endpoint=endpoint, + ) + + +class MixedParamsClientTestBaseAsync(AzureRecordedTestCase): + + def create_async_client(self, endpoint): + credential = self.get_credential(MixedParamsClient, is_async=True) + return self.create_client_from_credential( + MixedParamsClient, + credential=credential, + endpoint=endpoint, + ) + + +class PathParamClientTestBaseAsync(AzureRecordedTestCase): + + def create_async_client(self, endpoint): + credential = self.get_credential(PathParamClient, is_async=True) + return self.create_client_from_credential( + PathParamClient, + credential=credential, + endpoint=endpoint, + ) + + +class ParamAliasClientTestBaseAsync(AzureRecordedTestCase): + + def create_async_client(self, endpoint): + credential = self.get_credential(ParamAliasClient, is_async=True) + return self.create_client_from_credential( + ParamAliasClient, + credential=credential, + endpoint=endpoint, + ) diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/setup.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/setup.py new file mode 100644 index 00000000000..b33c8683e6d --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-client-initialization/setup.py @@ -0,0 +1,71 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + + +import os +import re +from setuptools import setup, find_packages + + +PACKAGE_NAME = "azure-clientgenerator-core-clientinitialization" +PACKAGE_PPRINT_NAME = "Azure Clientgenerator Core Clientinitialization" + +# a-b-c => a/b/c +package_folder_path = PACKAGE_NAME.replace("-", "/") + +# Version extraction inspired from 'requests' +with open(os.path.join(package_folder_path, "_version.py"), "r") as fd: + version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1) + +if not version: + raise RuntimeError("Cannot find version information") + + +setup( + name=PACKAGE_NAME, + version=version, + description="Microsoft Corporation {} Client Library for Python".format(PACKAGE_PPRINT_NAME), + long_description=open("README.md", "r").read(), + long_description_content_type="text/markdown", + license="MIT License", + author="Microsoft Corporation", + author_email="azpysdkhelp@microsoft.com", + url="https://github.com/Azure/azure-sdk-for-python/tree/main/sdk", + keywords="azure, azure sdk", + classifiers=[ + "Development Status :: 4 - Beta", + "Programming Language :: Python", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "License :: OSI Approved :: MIT License", + ], + zip_safe=False, + packages=find_packages( + exclude=[ + "tests", + # Exclude packages that will be covered by PEP420 or nspkg + "azure", + "azure.clientgenerator", + "azure.clientgenerator.core", + ] + ), + include_package_data=True, + package_data={ + "azure.clientgenerator.core.clientinitialization": ["py.typed"], + }, + install_requires=[ + "isodate>=0.6.1", + "azure-core>=1.30.0", + "typing-extensions>=4.6.0", + ], + python_requires=">=3.9", +) diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/MANIFEST.in index 483cd2ac3e0..3f4e42759d8 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/MANIFEST.in +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/MANIFEST.in @@ -1,9 +1,8 @@ include *.md include LICENSE -include specs/azure/clientgenerator/core/flattenproperty/py.typed +include azure/clientgenerator/core/flattenproperty/py.typed recursive-include tests *.py recursive-include samples *.py *.md -include specs/__init__.py -include specs/azure/__init__.py -include specs/azure/clientgenerator/__init__.py -include specs/azure/clientgenerator/core/__init__.py +include azure/__init__.py +include azure/clientgenerator/__init__.py +include azure/clientgenerator/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/README.md b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/README.md index 869a0bba690..9fb22d74812 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/README.md +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/README.md @@ -1,4 +1,4 @@ -# Specs Azure Clientgenerator Core Flattenproperty client library for Python +# Azure Clientgenerator Core Flattenproperty client library for Python ## Getting started @@ -6,14 +6,14 @@ ### Install the package ```bash -python -m pip install specs-azure-clientgenerator-core-flattenproperty +python -m pip install azure-clientgenerator-core-flattenproperty ``` #### Prequisites - Python 3.9 or later is required to use this package. - You need an [Azure subscription][azure_sub] to use this package. -- An existing Specs Azure Clientgenerator Core Flattenproperty instance. +- An existing Azure Clientgenerator Core Flattenproperty instance. ## Contributing diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/apiview-properties.json index 97da5568b42..f453c09174b 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/apiview-properties.json @@ -1,11 +1,11 @@ { "CrossLanguagePackageId": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty", "CrossLanguageDefinitionId": { - "specs.azure.clientgenerator.core.flattenproperty.models.ChildFlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.ChildFlattenModel", - "specs.azure.clientgenerator.core.flattenproperty.models.ChildModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.ChildModel", - "specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.FlattenModel", - "specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.NestedFlattenModel", - "specs.azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.put_flatten_model": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel", - "specs.azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.put_nested_flatten_model": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel" + "azure.clientgenerator.core.flattenproperty.models.ChildFlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.ChildFlattenModel", + "azure.clientgenerator.core.flattenproperty.models.ChildModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.ChildModel", + "azure.clientgenerator.core.flattenproperty.models.FlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.FlattenModel", + "azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.NestedFlattenModel", + "azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.put_flatten_model": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel", + "azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.put_nested_flatten_model": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_client.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_client.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_configuration.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_configuration.py similarity index 94% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_configuration.py index 8341999c54a..a45558a9660 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_configuration.py @@ -26,7 +26,7 @@ class FlattenPropertyClientConfiguration: # pylint: disable=too-many-instance-a def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-flattenproperty/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "clientgenerator-core-flattenproperty/{}".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-usage/specs/azure/clientgenerator/core/usage/_model_base.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_operations/_operations.py similarity index 91% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_operations/_operations.py index 9c8ec6c5e7f..07fd891bffc 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_operations/_operations.py @@ -83,12 +83,12 @@ def put_flatten_model( """put_flatten_model. :param input: Required. - :type input: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel + :type input: ~azure.clientgenerator.core.flattenproperty.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: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel + :rtype: ~azure.clientgenerator.core.flattenproperty.models.FlattenModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -104,7 +104,7 @@ def put_flatten_model( Default value is "application/json". :paramtype content_type: str :return: FlattenModel. The FlattenModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel + :rtype: ~azure.clientgenerator.core.flattenproperty.models.FlattenModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -120,7 +120,7 @@ def put_flatten_model( Default value is "application/json". :paramtype content_type: str :return: FlattenModel. The FlattenModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel + :rtype: ~azure.clientgenerator.core.flattenproperty.models.FlattenModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -131,10 +131,10 @@ def put_flatten_model( """put_flatten_model. :param input: Is one of the following types: FlattenModel, JSON, IO[bytes] Required. - :type input: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel or JSON or + :type input: ~azure.clientgenerator.core.flattenproperty.models.FlattenModel or JSON or IO[bytes] :return: FlattenModel. The FlattenModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel + :rtype: ~azure.clientgenerator.core.flattenproperty.models.FlattenModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -202,12 +202,12 @@ def put_nested_flatten_model( """put_nested_flatten_model. :param input: Required. - :type input: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel + :type input: ~azure.clientgenerator.core.flattenproperty.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: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel + :rtype: ~azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -223,7 +223,7 @@ def put_nested_flatten_model( Default value is "application/json". :paramtype content_type: str :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel + :rtype: ~azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -239,7 +239,7 @@ def put_nested_flatten_model( Default value is "application/json". :paramtype content_type: str :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel + :rtype: ~azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -250,10 +250,10 @@ def put_nested_flatten_model( """put_nested_flatten_model. :param input: Is one of the following types: NestedFlattenModel, JSON, IO[bytes] Required. - :type input: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel or - JSON or IO[bytes] + :type input: ~azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel or JSON or + IO[bytes] :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel + :rtype: ~azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/_serialization.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/_serialization.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_serialization.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_vendor.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/_version.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/_version.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_version.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/_client.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/_client.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/_configuration.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_configuration.py similarity index 94% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_configuration.py index ac8e8834f92..d45ce79d22e 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_configuration.py @@ -26,7 +26,7 @@ class FlattenPropertyClientConfiguration: # pylint: disable=too-many-instance-a def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-flattenproperty/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "clientgenerator-core-flattenproperty/{}".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-property/specs/azure/clientgenerator/core/flattenproperty/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_operations/_operations.py similarity index 90% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_operations/_operations.py index 22145246654..61be4441ca0 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_operations/_operations.py @@ -48,12 +48,12 @@ async def put_flatten_model( """put_flatten_model. :param input: Required. - :type input: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel + :type input: ~azure.clientgenerator.core.flattenproperty.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: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel + :rtype: ~azure.clientgenerator.core.flattenproperty.models.FlattenModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -69,7 +69,7 @@ async def put_flatten_model( Default value is "application/json". :paramtype content_type: str :return: FlattenModel. The FlattenModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel + :rtype: ~azure.clientgenerator.core.flattenproperty.models.FlattenModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -85,7 +85,7 @@ async def put_flatten_model( Default value is "application/json". :paramtype content_type: str :return: FlattenModel. The FlattenModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel + :rtype: ~azure.clientgenerator.core.flattenproperty.models.FlattenModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -96,10 +96,10 @@ async def put_flatten_model( """put_flatten_model. :param input: Is one of the following types: FlattenModel, JSON, IO[bytes] Required. - :type input: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel or JSON or + :type input: ~azure.clientgenerator.core.flattenproperty.models.FlattenModel or JSON or IO[bytes] :return: FlattenModel. The FlattenModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel + :rtype: ~azure.clientgenerator.core.flattenproperty.models.FlattenModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -167,12 +167,12 @@ async def put_nested_flatten_model( """put_nested_flatten_model. :param input: Required. - :type input: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel + :type input: ~azure.clientgenerator.core.flattenproperty.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: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel + :rtype: ~azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -188,7 +188,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: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel + :rtype: ~azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -204,7 +204,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: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel + :rtype: ~azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -215,10 +215,10 @@ 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: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel or - JSON or IO[bytes] + :type input: ~azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel or JSON or + IO[bytes] :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel + :rtype: ~azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/models/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/models/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/_vendor.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/models/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/models/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/models/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/models/_models.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/models/_models.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/models/_models.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/models/_models.py index c1cd8057f71..363f9177655 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/models/_models.py @@ -22,7 +22,7 @@ class ChildFlattenModel(_model_base.Model): :ivar summary: Required. :vartype summary: str :ivar properties: Required. - :vartype properties: ~specs.azure.clientgenerator.core.flattenproperty.models.ChildModel + :vartype properties: ~azure.clientgenerator.core.flattenproperty.models.ChildModel """ summary: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) @@ -108,7 +108,7 @@ class FlattenModel(_model_base.Model): :ivar name: Required. :vartype name: str :ivar properties: Required. - :vartype properties: ~specs.azure.clientgenerator.core.flattenproperty.models.ChildModel + :vartype properties: ~azure.clientgenerator.core.flattenproperty.models.ChildModel """ name: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) @@ -161,7 +161,7 @@ class NestedFlattenModel(_model_base.Model): :ivar name: Required. :vartype name: str :ivar properties: Required. - :vartype properties: ~specs.azure.clientgenerator.core.flattenproperty.models.ChildFlattenModel + :vartype properties: ~azure.clientgenerator.core.flattenproperty.models.ChildFlattenModel """ name: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/models/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/models/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/py.typed b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/py.typed rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/py.typed diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/generated_tests/testpreparer.py index 739c5ff2de4..76878b59eba 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/generated_tests/testpreparer.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/generated_tests/testpreparer.py @@ -5,9 +5,9 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.clientgenerator.core.flattenproperty import FlattenPropertyClient from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer import functools -from specs.azure.clientgenerator.core.flattenproperty import FlattenPropertyClient class FlattenPropertyClientTestBase(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/generated_tests/testpreparer_async.py index f66cc7610b9..306e9f1726f 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/generated_tests/testpreparer_async.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/generated_tests/testpreparer_async.py @@ -5,8 +5,8 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.clientgenerator.core.flattenproperty.aio import FlattenPropertyClient from devtools_testutils import AzureRecordedTestCase -from specs.azure.clientgenerator.core.flattenproperty.aio import FlattenPropertyClient class FlattenPropertyClientTestBaseAsync(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/setup.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/setup.py index 1864f3b6d82..44eea3142a8 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/setup.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/setup.py @@ -12,8 +12,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "specs-azure-clientgenerator-core-flattenproperty" -PACKAGE_PPRINT_NAME = "Specs Azure Clientgenerator Core Flattenproperty" +PACKAGE_NAME = "azure-clientgenerator-core-flattenproperty" +PACKAGE_PPRINT_NAME = "Azure Clientgenerator Core Flattenproperty" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace("-", "/") @@ -53,15 +53,14 @@ exclude=[ "tests", # Exclude packages that will be covered by PEP420 or nspkg - "specs", - "specs.azure", - "specs.azure.clientgenerator", - "specs.azure.clientgenerator.core", + "azure", + "azure.clientgenerator", + "azure.clientgenerator.core", ] ), include_package_data=True, package_data={ - "specs.azure.clientgenerator.core.flattenproperty": ["py.typed"], + "azure.clientgenerator.core.flattenproperty": ["py.typed"], }, install_requires=[ "isodate>=0.6.1", diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/MANIFEST.in index a9f8e33e3c5..9b145c9c35c 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/MANIFEST.in +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/MANIFEST.in @@ -1,9 +1,8 @@ include *.md include LICENSE -include specs/azure/clientgenerator/core/usage/py.typed +include azure/clientgenerator/core/usage/py.typed recursive-include tests *.py recursive-include samples *.py *.md -include specs/__init__.py -include specs/azure/__init__.py -include specs/azure/clientgenerator/__init__.py -include specs/azure/clientgenerator/core/__init__.py +include azure/__init__.py +include azure/clientgenerator/__init__.py +include azure/clientgenerator/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/README.md b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/README.md index e8bc4e28876..acd3486eb52 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/README.md +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/README.md @@ -1,4 +1,4 @@ -# Specs Azure Clientgenerator Core Usage client library for Python +# Azure Clientgenerator Core Usage client library for Python ## Getting started @@ -6,14 +6,14 @@ ### Install the package ```bash -python -m pip install specs-azure-clientgenerator-core-usage +python -m pip install azure-clientgenerator-core-usage ``` #### Prequisites - Python 3.9 or later is required to use this package. - You need an [Azure subscription][azure_sub] to use this package. -- An existing Specs Azure Clientgenerator Core Usage instance. +- An existing Azure Clientgenerator Core Usage instance. ## Contributing diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/apiview-properties.json index 8b6ce4d479c..2ad403a63f6 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/apiview-properties.json @@ -1,14 +1,14 @@ { "CrossLanguagePackageId": "_Specs_.Azure.ClientGenerator.Core.Usage", "CrossLanguageDefinitionId": { - "specs.azure.clientgenerator.core.usage.models.InputModel": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.InputModel", - "specs.azure.clientgenerator.core.usage.models.OrphanModel": "_Specs_.Azure.ClientGenerator.Core.Usage.OrphanModel", - "specs.azure.clientgenerator.core.usage.models.OutputModel": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.OutputModel", - "specs.azure.clientgenerator.core.usage.models.ResultModel": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.ResultModel", - "specs.azure.clientgenerator.core.usage.models.RoundTripModel": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.RoundTripModel", - "specs.azure.clientgenerator.core.usage.UsageClient.model_in_operation.input_to_input_output": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput", - "specs.azure.clientgenerator.core.usage.UsageClient.model_in_operation.output_to_input_output": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput", - "specs.azure.clientgenerator.core.usage.UsageClient.model_in_operation.model_in_read_only_property": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty", - "specs.azure.clientgenerator.core.usage.UsageClient.model_in_operation.orphan_model_serializable": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.orphanModelSerializable" + "azure.clientgenerator.core.usage.models.InputModel": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.InputModel", + "azure.clientgenerator.core.usage.models.OrphanModel": "_Specs_.Azure.ClientGenerator.Core.Usage.OrphanModel", + "azure.clientgenerator.core.usage.models.OutputModel": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.OutputModel", + "azure.clientgenerator.core.usage.models.ResultModel": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.ResultModel", + "azure.clientgenerator.core.usage.models.RoundTripModel": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.RoundTripModel", + "azure.clientgenerator.core.usage.UsageClient.model_in_operation.input_to_input_output": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.inputToInputOutput", + "azure.clientgenerator.core.usage.UsageClient.model_in_operation.output_to_input_output": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.outputToInputOutput", + "azure.clientgenerator.core.usage.UsageClient.model_in_operation.model_in_read_only_property": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.modelInReadOnlyProperty", + "azure.clientgenerator.core.usage.UsageClient.model_in_operation.orphan_model_serializable": "_Specs_.Azure.ClientGenerator.Core.Usage.ModelInOperation.orphanModelSerializable" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/_client.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/_client.py similarity index 98% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/_client.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/_client.py index b5460b7910d..a325b4792fd 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/_client.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/_client.py @@ -24,7 +24,7 @@ class UsageClient: # pylint: disable=client-accepts-api-version-keyword :ivar model_in_operation: ModelInOperationOperations operations :vartype model_in_operation: - specs.azure.clientgenerator.core.usage.operations.ModelInOperationOperations + azure.clientgenerator.core.usage.operations.ModelInOperationOperations :keyword endpoint: Service host. Default value is "http://localhost:3000". :paramtype endpoint: str """ diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/_configuration.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/_configuration.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/_configuration.py index 71d5800a341..dc6be94575b 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/_configuration.py @@ -26,7 +26,7 @@ class UsageClientConfiguration: # pylint: disable=too-many-instance-attributes def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-usage/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "clientgenerator-core-usage/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_model_base.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_serialization.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/_serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_serialization.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/_serialization.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_version.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_version.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/_version.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/_client.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/_client.py similarity index 98% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/_client.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/_client.py index 6df99c466f6..d982da0b1fc 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/_client.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/_client.py @@ -24,7 +24,7 @@ class UsageClient: # pylint: disable=client-accepts-api-version-keyword :ivar model_in_operation: ModelInOperationOperations operations :vartype model_in_operation: - specs.azure.clientgenerator.core.usage.aio.operations.ModelInOperationOperations + azure.clientgenerator.core.usage.aio.operations.ModelInOperationOperations :keyword endpoint: Service host. Default value is "http://localhost:3000". :paramtype endpoint: str """ diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/_configuration.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/_configuration.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/_configuration.py index 422e162fe7c..7ce4d986ea0 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/_configuration.py @@ -26,7 +26,7 @@ class UsageClientConfiguration: # pylint: disable=too-many-instance-attributes def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-usage/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "clientgenerator-core-usage/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/operations/_operations.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/operations/_operations.py index 0beed326762..053e286b40a 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/operations/_operations.py @@ -48,7 +48,7 @@ class ModelInOperationOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~specs.azure.clientgenerator.core.usage.aio.UsageClient`'s + :class:`~azure.clientgenerator.core.usage.aio.UsageClient`'s :attr:`model_in_operation` attribute. """ @@ -72,7 +72,7 @@ async def input_to_input_output( }. :param body: Required. - :type body: ~specs.azure.clientgenerator.core.usage.models.InputModel + :type body: ~azure.clientgenerator.core.usage.models.InputModel :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str @@ -134,7 +134,7 @@ async def input_to_input_output(self, body: Union[_models.InputModel, JSON, IO[b }. :param body: Is one of the following types: InputModel, JSON, IO[bytes] Required. - :type body: ~specs.azure.clientgenerator.core.usage.models.InputModel or JSON or IO[bytes] + :type body: ~azure.clientgenerator.core.usage.models.InputModel or JSON or IO[bytes] :return: None :rtype: None :raises ~azure.core.exceptions.HttpResponseError: @@ -196,7 +196,7 @@ async def output_to_input_output(self, **kwargs: Any) -> _models.OutputModel: }. :return: OutputModel. The OutputModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.usage.models.OutputModel + :rtype: ~azure.clientgenerator.core.usage.models.OutputModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -271,12 +271,12 @@ async def model_in_read_only_property( }. :param body: Required. - :type body: ~specs.azure.clientgenerator.core.usage.models.RoundTripModel + :type body: ~azure.clientgenerator.core.usage.models.RoundTripModel :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: RoundTripModel. The RoundTripModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.usage.models.RoundTripModel + :rtype: ~azure.clientgenerator.core.usage.models.RoundTripModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -309,7 +309,7 @@ async def model_in_read_only_property( Default value is "application/json". :paramtype content_type: str :return: RoundTripModel. The RoundTripModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.usage.models.RoundTripModel + :rtype: ~azure.clientgenerator.core.usage.models.RoundTripModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -342,7 +342,7 @@ async def model_in_read_only_property( Default value is "application/json". :paramtype content_type: str :return: RoundTripModel. The RoundTripModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.usage.models.RoundTripModel + :rtype: ~azure.clientgenerator.core.usage.models.RoundTripModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -370,9 +370,9 @@ async def model_in_read_only_property( }. :param body: Is one of the following types: RoundTripModel, JSON, IO[bytes] Required. - :type body: ~specs.azure.clientgenerator.core.usage.models.RoundTripModel or JSON or IO[bytes] + :type body: ~azure.clientgenerator.core.usage.models.RoundTripModel or JSON or IO[bytes] :return: RoundTripModel. The RoundTripModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.usage.models.RoundTripModel + :rtype: ~azure.clientgenerator.core.usage.models.RoundTripModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/aio/operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/models/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/models/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/models/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/models/_models.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/models/_models.py similarity index 97% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/models/_models.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/models/_models.py index 9126293a8fc..63aee9d7f77 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/models/_models.py @@ -138,7 +138,7 @@ class RoundTripModel(_model_base.Model): """RoundTripModel. :ivar result: Required. - :vartype result: ~specs.azure.clientgenerator.core.usage.models.ResultModel + :vartype result: ~azure.clientgenerator.core.usage.models.ResultModel """ result: "_models.ResultModel" = rest_field(visibility=["read"]) diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/models/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/models/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/operations/_operations.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/operations/_operations.py index 1b322b231fc..3a808c86c67 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/operations/_operations.py @@ -111,7 +111,7 @@ class ModelInOperationOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~specs.azure.clientgenerator.core.usage.UsageClient`'s + :class:`~azure.clientgenerator.core.usage.UsageClient`'s :attr:`model_in_operation` attribute. """ @@ -135,7 +135,7 @@ def input_to_input_output( }. :param body: Required. - :type body: ~specs.azure.clientgenerator.core.usage.models.InputModel + :type body: ~azure.clientgenerator.core.usage.models.InputModel :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str @@ -197,7 +197,7 @@ def input_to_input_output( # pylint: disable=inconsistent-return-statements }. :param body: Is one of the following types: InputModel, JSON, IO[bytes] Required. - :type body: ~specs.azure.clientgenerator.core.usage.models.InputModel or JSON or IO[bytes] + :type body: ~azure.clientgenerator.core.usage.models.InputModel or JSON or IO[bytes] :return: None :rtype: None :raises ~azure.core.exceptions.HttpResponseError: @@ -259,7 +259,7 @@ def output_to_input_output(self, **kwargs: Any) -> _models.OutputModel: }. :return: OutputModel. The OutputModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.usage.models.OutputModel + :rtype: ~azure.clientgenerator.core.usage.models.OutputModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -334,12 +334,12 @@ def model_in_read_only_property( }. :param body: Required. - :type body: ~specs.azure.clientgenerator.core.usage.models.RoundTripModel + :type body: ~azure.clientgenerator.core.usage.models.RoundTripModel :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: RoundTripModel. The RoundTripModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.usage.models.RoundTripModel + :rtype: ~azure.clientgenerator.core.usage.models.RoundTripModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -372,7 +372,7 @@ def model_in_read_only_property( Default value is "application/json". :paramtype content_type: str :return: RoundTripModel. The RoundTripModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.usage.models.RoundTripModel + :rtype: ~azure.clientgenerator.core.usage.models.RoundTripModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -405,7 +405,7 @@ def model_in_read_only_property( Default value is "application/json". :paramtype content_type: str :return: RoundTripModel. The RoundTripModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.usage.models.RoundTripModel + :rtype: ~azure.clientgenerator.core.usage.models.RoundTripModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -433,9 +433,9 @@ def model_in_read_only_property( }. :param body: Is one of the following types: RoundTripModel, JSON, IO[bytes] Required. - :type body: ~specs.azure.clientgenerator.core.usage.models.RoundTripModel or JSON or IO[bytes] + :type body: ~azure.clientgenerator.core.usage.models.RoundTripModel or JSON or IO[bytes] :return: RoundTripModel. The RoundTripModel is compatible with MutableMapping - :rtype: ~specs.azure.clientgenerator.core.usage.models.RoundTripModel + :rtype: ~azure.clientgenerator.core.usage.models.RoundTripModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/models/_patch.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/models/_patch.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/py.typed b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/py.typed rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/azure/clientgenerator/core/usage/py.typed diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/generated_tests/testpreparer.py index 6d1b1d9481f..76fd5a0b5de 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/generated_tests/testpreparer.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/generated_tests/testpreparer.py @@ -5,9 +5,9 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.clientgenerator.core.usage import UsageClient from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer import functools -from specs.azure.clientgenerator.core.usage import UsageClient class UsageClientTestBase(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/generated_tests/testpreparer_async.py index d27978d8baa..03cbaf3e9a5 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/generated_tests/testpreparer_async.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/generated_tests/testpreparer_async.py @@ -5,8 +5,8 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.clientgenerator.core.usage.aio import UsageClient from devtools_testutils import AzureRecordedTestCase -from specs.azure.clientgenerator.core.usage.aio import UsageClient class UsageClientTestBaseAsync(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/setup.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/setup.py index 14da32b0d5a..aecf7c40644 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/setup.py +++ b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/setup.py @@ -12,8 +12,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "specs-azure-clientgenerator-core-usage" -PACKAGE_PPRINT_NAME = "Specs Azure Clientgenerator Core Usage" +PACKAGE_NAME = "azure-clientgenerator-core-usage" +PACKAGE_PPRINT_NAME = "Azure Clientgenerator Core Usage" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace("-", "/") @@ -53,15 +53,14 @@ exclude=[ "tests", # Exclude packages that will be covered by PEP420 or nspkg - "specs", - "specs.azure", - "specs.azure.clientgenerator", - "specs.azure.clientgenerator.core", + "azure", + "azure.clientgenerator", + "azure.clientgenerator.core", ] ), include_package_data=True, package_data={ - "specs.azure.clientgenerator.core.usage": ["py.typed"], + "azure.clientgenerator.core.usage": ["py.typed"], }, install_requires=[ "isodate>=0.6.1", diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-core-basic/MANIFEST.in index 97c68dbc2c6..34d42923372 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/MANIFEST.in +++ b/packages/typespec-python/test/azure/generated/azure-core-basic/MANIFEST.in @@ -1,8 +1,7 @@ include *.md include LICENSE -include specs/azure/core/basic/py.typed +include azure/core/basic/py.typed recursive-include tests *.py recursive-include samples *.py *.md -include specs/__init__.py -include specs/azure/__init__.py -include specs/azure/core/__init__.py +include azure/__init__.py +include azure/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/README.md b/packages/typespec-python/test/azure/generated/azure-core-basic/README.md index e131db5ab23..39507d0f5b8 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/README.md +++ b/packages/typespec-python/test/azure/generated/azure-core-basic/README.md @@ -1,4 +1,4 @@ -# Specs Azure Core Basic client library for Python +# Azure Core Basic client library for Python ## Getting started @@ -6,14 +6,14 @@ ### Install the package ```bash -python -m pip install specs-azure-core-basic +python -m pip install azure-core-basic ``` #### Prequisites - Python 3.9 or later is required to use this package. - You need an [Azure subscription][azure_sub] to use this package. -- An existing Specs Azure Core Basic instance. +- An existing Azure Core Basic instance. ## Contributing diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-core-basic/apiview-properties.json index 0e1873347ea..5b7306dafd3 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-core-basic/apiview-properties.json @@ -1,15 +1,15 @@ { "CrossLanguagePackageId": "_Specs_.Azure.Core.Basic", "CrossLanguageDefinitionId": { - "specs.azure.core.basic.models.User": "_Specs_.Azure.Core.Basic.User", - "specs.azure.core.basic.models.UserList": "_Specs_.Azure.Core.Basic.UserList", - "specs.azure.core.basic.models.UserOrder": "_Specs_.Azure.Core.Basic.UserOrder", - "specs.azure.core.basic.BasicClient.create_or_update": "_Specs_.Azure.Core.Basic.createOrUpdate", - "specs.azure.core.basic.BasicClient.create_or_replace": "_Specs_.Azure.Core.Basic.createOrReplace", - "specs.azure.core.basic.BasicClient.get": "_Specs_.Azure.Core.Basic.get", - "specs.azure.core.basic.BasicClient.list": "_Specs_.Azure.Core.Basic.list", - "specs.azure.core.basic.BasicClient.delete": "_Specs_.Azure.Core.Basic.delete", - "specs.azure.core.basic.BasicClient.export": "_Specs_.Azure.Core.Basic.export", - "specs.azure.core.basic.BasicClient.export_all_users": "_Specs_.Azure.Core.Basic.exportAllUsers" + "azure.core.basic.models.User": "_Specs_.Azure.Core.Basic.User", + "azure.core.basic.models.UserList": "_Specs_.Azure.Core.Basic.UserList", + "azure.core.basic.models.UserOrder": "_Specs_.Azure.Core.Basic.UserOrder", + "azure.core.basic.BasicClient.create_or_update": "_Specs_.Azure.Core.Basic.createOrUpdate", + "azure.core.basic.BasicClient.create_or_replace": "_Specs_.Azure.Core.Basic.createOrReplace", + "azure.core.basic.BasicClient.get": "_Specs_.Azure.Core.Basic.get", + "azure.core.basic.BasicClient.list": "_Specs_.Azure.Core.Basic.list", + "azure.core.basic.BasicClient.delete": "_Specs_.Azure.Core.Basic.delete", + "azure.core.basic.BasicClient.export": "_Specs_.Azure.Core.Basic.export", + "azure.core.basic.BasicClient.export_all_users": "_Specs_.Azure.Core.Basic.exportAllUsers" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_client.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_client.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_configuration.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_configuration.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_configuration.py index e08e3001fae..c2ad5858951 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_configuration.py @@ -32,7 +32,7 @@ def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> No self.endpoint = endpoint self.api_version = api_version - kwargs.setdefault("sdk_moniker", "specs-azure-core-basic/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "core-basic/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_model_base.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_operations/_operations.py similarity index 97% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_operations/_operations.py index 39e96c46f9c..df9dccfb86d 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_operations/_operations.py @@ -243,12 +243,12 @@ def create_or_update( :param id: The user's id. Required. :type id: int :param resource: The resource instance. Required. - :type resource: ~specs.azure.core.basic.models.User + :type resource: ~azure.core.basic.models.User :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/merge-patch+json". :paramtype content_type: str :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ @@ -268,7 +268,7 @@ def create_or_update( Default value is "application/merge-patch+json". :paramtype content_type: str :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ @@ -288,7 +288,7 @@ def create_or_update( Default value is "application/merge-patch+json". :paramtype content_type: str :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ @@ -302,9 +302,9 @@ def create_or_update(self, id: int, resource: Union[_models.User, JSON, IO[bytes :type id: int :param resource: The resource instance. Is one of the following types: User, JSON, IO[bytes] Required. - :type resource: ~specs.azure.core.basic.models.User or JSON or IO[bytes] + :type resource: ~azure.core.basic.models.User or JSON or IO[bytes] :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -378,12 +378,12 @@ def create_or_replace( :param id: The user's id. Required. :type id: int :param resource: The resource instance. Required. - :type resource: ~specs.azure.core.basic.models.User + :type resource: ~azure.core.basic.models.User :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ @@ -403,7 +403,7 @@ def create_or_replace( Default value is "application/json". :paramtype content_type: str :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ @@ -423,7 +423,7 @@ def create_or_replace( Default value is "application/json". :paramtype content_type: str :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ @@ -437,9 +437,9 @@ def create_or_replace(self, id: int, resource: Union[_models.User, JSON, IO[byte :type id: int :param resource: The resource instance. Is one of the following types: User, JSON, IO[bytes] Required. - :type resource: ~specs.azure.core.basic.models.User or JSON or IO[bytes] + :type resource: ~azure.core.basic.models.User or JSON or IO[bytes] :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -511,7 +511,7 @@ def get(self, id: int, **kwargs: Any) -> _models.User: :param id: The user's id. Required. :type id: int :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -595,7 +595,7 @@ def list( :keyword expand: Expand the indicated resources into the response. Default value is None. :paramtype expand: list[str] :return: An iterator like instance of User - :rtype: ~azure.core.paging.ItemPaged[~specs.azure.core.basic.models.User] + :rtype: ~azure.core.paging.ItemPaged[~azure.core.basic.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -741,7 +741,7 @@ def export(self, id: int, *, format: str, **kwargs: Any) -> _models.User: :keyword format: The format of the data. Required. :paramtype format: str :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -804,7 +804,7 @@ def export_all_users(self, *, format: str, **kwargs: Any) -> _models.UserList: :keyword format: The format of the data. Required. :paramtype format: str :return: UserList. The UserList is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.UserList + :rtype: ~azure.core.basic.models.UserList :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_serialization.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_serialization.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_serialization.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_vendor.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_version.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_version.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/_version.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/_client.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/_client.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/_configuration.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/_configuration.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/_configuration.py index 42b78d53cfd..f3824bd5f5c 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/_configuration.py @@ -32,7 +32,7 @@ def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> No self.endpoint = endpoint self.api_version = api_version - kwargs.setdefault("sdk_moniker", "specs-azure-core-basic/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "core-basic/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/_operations/_operations.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/_operations/_operations.py index 037d6df80f2..06cf7f68579 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/_operations/_operations.py @@ -60,12 +60,12 @@ async def create_or_update( :param id: The user's id. Required. :type id: int :param resource: The resource instance. Required. - :type resource: ~specs.azure.core.basic.models.User + :type resource: ~azure.core.basic.models.User :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/merge-patch+json". :paramtype content_type: str :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ @@ -85,7 +85,7 @@ async def create_or_update( Default value is "application/merge-patch+json". :paramtype content_type: str :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ @@ -105,7 +105,7 @@ async def create_or_update( Default value is "application/merge-patch+json". :paramtype content_type: str :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ @@ -121,9 +121,9 @@ async def create_or_update( :type id: int :param resource: The resource instance. Is one of the following types: User, JSON, IO[bytes] Required. - :type resource: ~specs.azure.core.basic.models.User or JSON or IO[bytes] + :type resource: ~azure.core.basic.models.User or JSON or IO[bytes] :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -197,12 +197,12 @@ async def create_or_replace( :param id: The user's id. Required. :type id: int :param resource: The resource instance. Required. - :type resource: ~specs.azure.core.basic.models.User + :type resource: ~azure.core.basic.models.User :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ @@ -222,7 +222,7 @@ async def create_or_replace( Default value is "application/json". :paramtype content_type: str :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ @@ -242,7 +242,7 @@ async def create_or_replace( Default value is "application/json". :paramtype content_type: str :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ @@ -258,9 +258,9 @@ async def create_or_replace( :type id: int :param resource: The resource instance. Is one of the following types: User, JSON, IO[bytes] Required. - :type resource: ~specs.azure.core.basic.models.User or JSON or IO[bytes] + :type resource: ~azure.core.basic.models.User or JSON or IO[bytes] :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -332,7 +332,7 @@ async def get(self, id: int, **kwargs: Any) -> _models.User: :param id: The user's id. Required. :type id: int :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -416,7 +416,7 @@ def list( :keyword expand: Expand the indicated resources into the response. Default value is None. :paramtype expand: list[str] :return: An iterator like instance of User - :rtype: ~azure.core.async_paging.AsyncItemPaged[~specs.azure.core.basic.models.User] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.core.basic.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -562,7 +562,7 @@ async def export(self, id: int, *, format: str, **kwargs: Any) -> _models.User: :keyword format: The format of the data. Required. :paramtype format: str :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.User + :rtype: ~azure.core.basic.models.User :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -625,7 +625,7 @@ async def export_all_users(self, *, format: str, **kwargs: Any) -> _models.UserL :keyword format: The format of the data. Required. :paramtype format: str :return: UserList. The UserList is compatible with MutableMapping - :rtype: ~specs.azure.core.basic.models.UserList + :rtype: ~azure.core.basic.models.UserList :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/_vendor.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/aio/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/models/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/models/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/models/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/models/_models.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/models/_models.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/models/_models.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/models/_models.py index d0765992b9e..31a23e34771 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/models/_models.py @@ -24,7 +24,7 @@ class User(_model_base.Model): :ivar name: The user's name. Required. :vartype name: str :ivar orders: The user's order list. - :vartype orders: list[~specs.azure.core.basic.models.UserOrder] + :vartype orders: list[~azure.core.basic.models.UserOrder] :ivar etag: The entity tag for this resource. Required. :vartype etag: str """ @@ -61,7 +61,7 @@ class UserList(_model_base.Model): """UserList. :ivar users: Required. - :vartype users: list[~specs.azure.core.basic.models.User] + :vartype users: list[~azure.core.basic.models.User] """ users: List["_models.User"] = rest_field(visibility=["read", "create", "update", "delete", "query"]) diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/models/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/models/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/models/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/models/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/py.typed b/packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/py.typed rename to packages/typespec-python/test/azure/generated/azure-core-basic/azure/core/basic/py.typed diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/azure-core-basic/generated_tests/testpreparer.py index b662845bf16..bf98f0b38b4 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/generated_tests/testpreparer.py +++ b/packages/typespec-python/test/azure/generated/azure-core-basic/generated_tests/testpreparer.py @@ -5,9 +5,9 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.core.basic import BasicClient from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer import functools -from specs.azure.core.basic import BasicClient class BasicClientTestBase(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/azure-core-basic/generated_tests/testpreparer_async.py index 2b63ad3c8f4..fcbe197c1cc 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/generated_tests/testpreparer_async.py +++ b/packages/typespec-python/test/azure/generated/azure-core-basic/generated_tests/testpreparer_async.py @@ -5,8 +5,8 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.core.basic.aio import BasicClient from devtools_testutils import AzureRecordedTestCase -from specs.azure.core.basic.aio import BasicClient class BasicClientTestBaseAsync(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/setup.py b/packages/typespec-python/test/azure/generated/azure-core-basic/setup.py index df84718fc96..047895cd28b 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/setup.py +++ b/packages/typespec-python/test/azure/generated/azure-core-basic/setup.py @@ -12,8 +12,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "specs-azure-core-basic" -PACKAGE_PPRINT_NAME = "Specs Azure Core Basic" +PACKAGE_NAME = "azure-core-basic" +PACKAGE_PPRINT_NAME = "Azure Core Basic" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace("-", "/") @@ -53,14 +53,13 @@ exclude=[ "tests", # Exclude packages that will be covered by PEP420 or nspkg - "specs", - "specs.azure", - "specs.azure.core", + "azure", + "azure.core", ] ), include_package_data=True, package_data={ - "specs.azure.core.basic": ["py.typed"], + "azure.core.basic": ["py.typed"], }, install_requires=[ "isodate>=0.6.1", diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/MANIFEST.in index 63285154616..3054d938fc2 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/MANIFEST.in +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/MANIFEST.in @@ -1,9 +1,8 @@ include *.md include LICENSE -include specs/azure/core/lro/rpc/py.typed +include azure/core/lro/rpc/py.typed recursive-include tests *.py recursive-include samples *.py *.md -include specs/__init__.py -include specs/azure/__init__.py -include specs/azure/core/__init__.py -include specs/azure/core/lro/__init__.py +include azure/__init__.py +include azure/core/__init__.py +include azure/core/lro/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/README.md b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/README.md index e35baa1478a..394e4563405 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/README.md +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/README.md @@ -1,4 +1,4 @@ -# Specs Azure Core Lro Rpc client library for Python +# Azure Core Lro Rpc client library for Python ## Getting started @@ -6,14 +6,14 @@ ### Install the package ```bash -python -m pip install specs-azure-core-lro-rpc +python -m pip install azure-core-lro-rpc ``` #### Prequisites - Python 3.9 or later is required to use this package. - You need an [Azure subscription][azure_sub] to use this package. -- An existing Specs Azure Core Lro Rpc instance. +- An existing Azure Core Lro Rpc instance. ## Contributing diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/apiview-properties.json index b47ef6efd5e..2e9086e1ab3 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/apiview-properties.json @@ -1,8 +1,8 @@ { "CrossLanguagePackageId": "_Specs_.Azure.Core.Lro.Rpc", "CrossLanguageDefinitionId": { - "specs.azure.core.lro.rpc.models.GenerationOptions": "_Specs_.Azure.Core.Lro.Rpc.GenerationOptions", - "specs.azure.core.lro.rpc.models.GenerationResult": "_Specs_.Azure.Core.Lro.Rpc.GenerationResult", - "specs.azure.core.lro.rpc.RpcClient.begin_long_running_rpc": "_Specs_.Azure.Core.Lro.Rpc.longRunningRpc" + "azure.core.lro.rpc.models.GenerationOptions": "_Specs_.Azure.Core.Lro.Rpc.GenerationOptions", + "azure.core.lro.rpc.models.GenerationResult": "_Specs_.Azure.Core.Lro.Rpc.GenerationResult", + "azure.core.lro.rpc.RpcClient.begin_long_running_rpc": "_Specs_.Azure.Core.Lro.Rpc.longRunningRpc" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_client.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_client.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_configuration.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_configuration.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_configuration.py index d5ff502241c..d84048cc620 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_configuration.py @@ -32,7 +32,7 @@ def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> No self.endpoint = endpoint self.api_version = api_version - kwargs.setdefault("sdk_moniker", "specs-azure-core-lro-rpc/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "core-lro-rpc/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_model_base.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_operations/_operations.py similarity index 94% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_operations/_operations.py index 556fc03668a..82664a5301b 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_operations/_operations.py @@ -134,13 +134,13 @@ def begin_long_running_rpc( Generate data. :param body: The body parameter. Required. - :type body: ~specs.azure.core.lro.rpc.models.GenerationOptions + :type body: ~azure.core.lro.rpc.models.GenerationOptions :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: An instance of LROPoller that returns GenerationResult. The GenerationResult is compatible with MutableMapping - :rtype: ~azure.core.polling.LROPoller[~specs.azure.core.lro.rpc.models.GenerationResult] + :rtype: ~azure.core.polling.LROPoller[~azure.core.lro.rpc.models.GenerationResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -159,7 +159,7 @@ def begin_long_running_rpc( :paramtype content_type: str :return: An instance of LROPoller that returns GenerationResult. The GenerationResult is compatible with MutableMapping - :rtype: ~azure.core.polling.LROPoller[~specs.azure.core.lro.rpc.models.GenerationResult] + :rtype: ~azure.core.polling.LROPoller[~azure.core.lro.rpc.models.GenerationResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -178,7 +178,7 @@ def begin_long_running_rpc( :paramtype content_type: str :return: An instance of LROPoller that returns GenerationResult. The GenerationResult is compatible with MutableMapping - :rtype: ~azure.core.polling.LROPoller[~specs.azure.core.lro.rpc.models.GenerationResult] + :rtype: ~azure.core.polling.LROPoller[~azure.core.lro.rpc.models.GenerationResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -192,10 +192,10 @@ def begin_long_running_rpc( :param body: The body parameter. Is one of the following types: GenerationOptions, JSON, IO[bytes] Required. - :type body: ~specs.azure.core.lro.rpc.models.GenerationOptions or JSON or IO[bytes] + :type body: ~azure.core.lro.rpc.models.GenerationOptions or JSON or IO[bytes] :return: An instance of LROPoller that returns GenerationResult. The GenerationResult is compatible with MutableMapping - :rtype: ~azure.core.polling.LROPoller[~specs.azure.core.lro.rpc.models.GenerationResult] + :rtype: ~azure.core.polling.LROPoller[~azure.core.lro.rpc.models.GenerationResult] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_serialization.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_serialization.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_serialization.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_vendor.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_version.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_version.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/_version.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_client.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_client.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_configuration.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/_configuration.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/_configuration.py index 9c42b1e48ff..2ddebff4fa8 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/_configuration.py @@ -32,7 +32,7 @@ def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> No self.endpoint = endpoint self.api_version = api_version - kwargs.setdefault("sdk_moniker", "specs-azure-core-lro-rpc/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "core-lro-rpc/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/_operations/_operations.py similarity index 94% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/_operations/_operations.py index 31b506b6cda..e64cefa6ba2 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/_operations/_operations.py @@ -110,13 +110,13 @@ async def begin_long_running_rpc( Generate data. :param body: The body parameter. Required. - :type body: ~specs.azure.core.lro.rpc.models.GenerationOptions + :type body: ~azure.core.lro.rpc.models.GenerationOptions :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: An instance of AsyncLROPoller that returns GenerationResult. The GenerationResult is compatible with MutableMapping - :rtype: ~azure.core.polling.AsyncLROPoller[~specs.azure.core.lro.rpc.models.GenerationResult] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.core.lro.rpc.models.GenerationResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -135,7 +135,7 @@ async def begin_long_running_rpc( :paramtype content_type: str :return: An instance of AsyncLROPoller that returns GenerationResult. The GenerationResult is compatible with MutableMapping - :rtype: ~azure.core.polling.AsyncLROPoller[~specs.azure.core.lro.rpc.models.GenerationResult] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.core.lro.rpc.models.GenerationResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -154,7 +154,7 @@ async def begin_long_running_rpc( :paramtype content_type: str :return: An instance of AsyncLROPoller that returns GenerationResult. The GenerationResult is compatible with MutableMapping - :rtype: ~azure.core.polling.AsyncLROPoller[~specs.azure.core.lro.rpc.models.GenerationResult] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.core.lro.rpc.models.GenerationResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -168,10 +168,10 @@ async def begin_long_running_rpc( :param body: The body parameter. Is one of the following types: GenerationOptions, JSON, IO[bytes] Required. - :type body: ~specs.azure.core.lro.rpc.models.GenerationOptions or JSON or IO[bytes] + :type body: ~azure.core.lro.rpc.models.GenerationOptions or JSON or IO[bytes] :return: An instance of AsyncLROPoller that returns GenerationResult. The GenerationResult is compatible with MutableMapping - :rtype: ~azure.core.polling.AsyncLROPoller[~specs.azure.core.lro.rpc.models.GenerationResult] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.core.lro.rpc.models.GenerationResult] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_vendor.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/aio/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/models/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/models/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/models/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/models/_models.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/models/_models.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/models/_models.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/models/_models.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/models/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/models/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/models/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/models/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/py.typed b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/py.typed rename to packages/typespec-python/test/azure/generated/azure-core-lro-rpc/azure/core/lro/rpc/py.typed diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/generated_tests/testpreparer.py index 284ccba204e..ddc2ae93cc4 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/generated_tests/testpreparer.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/generated_tests/testpreparer.py @@ -5,9 +5,9 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.core.lro.rpc import RpcClient from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer import functools -from specs.azure.core.lro.rpc import RpcClient class RpcClientTestBase(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/generated_tests/testpreparer_async.py index b004f72dc92..3664771aa20 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/generated_tests/testpreparer_async.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/generated_tests/testpreparer_async.py @@ -5,8 +5,8 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.core.lro.rpc.aio import RpcClient from devtools_testutils import AzureRecordedTestCase -from specs.azure.core.lro.rpc.aio import RpcClient class RpcClientTestBaseAsync(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/setup.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/setup.py index f6031d1d014..eebe18efad6 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/setup.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/setup.py @@ -12,8 +12,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "specs-azure-core-lro-rpc" -PACKAGE_PPRINT_NAME = "Specs Azure Core Lro Rpc" +PACKAGE_NAME = "azure-core-lro-rpc" +PACKAGE_PPRINT_NAME = "Azure Core Lro Rpc" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace("-", "/") @@ -53,15 +53,14 @@ exclude=[ "tests", # Exclude packages that will be covered by PEP420 or nspkg - "specs", - "specs.azure", - "specs.azure.core", - "specs.azure.core.lro", + "azure", + "azure.core", + "azure.core.lro", ] ), include_package_data=True, package_data={ - "specs.azure.core.lro.rpc": ["py.typed"], + "azure.core.lro.rpc": ["py.typed"], }, install_requires=[ "isodate>=0.6.1", diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/MANIFEST.in index c17ad5a4013..eba8b85b8b5 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/MANIFEST.in +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/MANIFEST.in @@ -1,9 +1,8 @@ include *.md include LICENSE -include specs/azure/core/lro/standard/py.typed +include azure/core/lro/standard/py.typed recursive-include tests *.py recursive-include samples *.py *.md -include specs/__init__.py -include specs/azure/__init__.py -include specs/azure/core/__init__.py -include specs/azure/core/lro/__init__.py +include azure/__init__.py +include azure/core/__init__.py +include azure/core/lro/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/README.md b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/README.md index 63089c09b1e..f495a8d887d 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/README.md +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/README.md @@ -1,4 +1,4 @@ -# Specs Azure Core Lro Standard client library for Python +# Azure Core Lro Standard client library for Python ## Getting started @@ -6,14 +6,14 @@ ### Install the package ```bash -python -m pip install specs-azure-core-lro-standard +python -m pip install azure-core-lro-standard ``` #### Prequisites - Python 3.9 or later is required to use this package. - You need an [Azure subscription][azure_sub] to use this package. -- An existing Specs Azure Core Lro Standard instance. +- An existing Azure Core Lro Standard instance. ## Contributing diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/apiview-properties.json index f2e2037a2d8..4e657954c33 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/apiview-properties.json @@ -1,10 +1,10 @@ { "CrossLanguagePackageId": "_Specs_.Azure.Core.Lro.Standard", "CrossLanguageDefinitionId": { - "specs.azure.core.lro.standard.models.ExportedUser": "_Specs_.Azure.Core.Lro.Standard.ExportedUser", - "specs.azure.core.lro.standard.models.User": "_Specs_.Azure.Core.Lro.Standard.User", - "specs.azure.core.lro.standard.StandardClient.begin_create_or_replace": "_Specs_.Azure.Core.Lro.Standard.createOrReplace", - "specs.azure.core.lro.standard.StandardClient.begin_delete": "_Specs_.Azure.Core.Lro.Standard.delete", - "specs.azure.core.lro.standard.StandardClient.begin_export": "_Specs_.Azure.Core.Lro.Standard.export" + "azure.core.lro.standard.models.ExportedUser": "_Specs_.Azure.Core.Lro.Standard.ExportedUser", + "azure.core.lro.standard.models.User": "_Specs_.Azure.Core.Lro.Standard.User", + "azure.core.lro.standard.StandardClient.begin_create_or_replace": "_Specs_.Azure.Core.Lro.Standard.createOrReplace", + "azure.core.lro.standard.StandardClient.begin_delete": "_Specs_.Azure.Core.Lro.Standard.delete", + "azure.core.lro.standard.StandardClient.begin_export": "_Specs_.Azure.Core.Lro.Standard.export" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_client.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_client.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_configuration.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_configuration.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_configuration.py index b80d4326be0..17d38d652fa 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_configuration.py @@ -32,7 +32,7 @@ def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> No self.endpoint = endpoint self.api_version = api_version - kwargs.setdefault("sdk_moniker", "specs-azure-core-lro-standard/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "core-lro-standard/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/_model_base.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_operations/_operations.py similarity index 97% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_operations/_operations.py index 43936f86c48..60caea63547 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_operations/_operations.py @@ -191,12 +191,12 @@ def begin_create_or_replace( :param name: The name of user. Required. :type name: str :param resource: The resource instance. Required. - :type resource: ~specs.azure.core.lro.standard.models.User + :type resource: ~azure.core.lro.standard.models.User :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: An instance of LROPoller that returns User. The User is compatible with MutableMapping - :rtype: ~azure.core.polling.LROPoller[~specs.azure.core.lro.standard.models.User] + :rtype: ~azure.core.polling.LROPoller[~azure.core.lro.standard.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -216,7 +216,7 @@ def begin_create_or_replace( Default value is "application/json". :paramtype content_type: str :return: An instance of LROPoller that returns User. The User is compatible with MutableMapping - :rtype: ~azure.core.polling.LROPoller[~specs.azure.core.lro.standard.models.User] + :rtype: ~azure.core.polling.LROPoller[~azure.core.lro.standard.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -236,7 +236,7 @@ def begin_create_or_replace( Default value is "application/json". :paramtype content_type: str :return: An instance of LROPoller that returns User. The User is compatible with MutableMapping - :rtype: ~azure.core.polling.LROPoller[~specs.azure.core.lro.standard.models.User] + :rtype: ~azure.core.polling.LROPoller[~azure.core.lro.standard.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -252,9 +252,9 @@ def begin_create_or_replace( :type name: str :param resource: The resource instance. Is one of the following types: User, JSON, IO[bytes] Required. - :type resource: ~specs.azure.core.lro.standard.models.User or JSON or IO[bytes] + :type resource: ~azure.core.lro.standard.models.User or JSON or IO[bytes] :return: An instance of LROPoller that returns User. The User is compatible with MutableMapping - :rtype: ~azure.core.polling.LROPoller[~specs.azure.core.lro.standard.models.User] + :rtype: ~azure.core.polling.LROPoller[~azure.core.lro.standard.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -477,7 +477,7 @@ def begin_export(self, name: str, *, format: str, **kwargs: Any) -> LROPoller[_m :paramtype format: str :return: An instance of LROPoller that returns ExportedUser. The ExportedUser is compatible with MutableMapping - :rtype: ~azure.core.polling.LROPoller[~specs.azure.core.lro.standard.models.ExportedUser] + :rtype: ~azure.core.polling.LROPoller[~azure.core.lro.standard.models.ExportedUser] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/_serialization.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/_serialization.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_serialization.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_vendor.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/_version.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/_version.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/_version.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_client.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_client.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_configuration.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/_configuration.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/_configuration.py index d69d143b8f2..f58bd55ee37 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/_configuration.py @@ -32,7 +32,7 @@ def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> No self.endpoint = endpoint self.api_version = api_version - kwargs.setdefault("sdk_moniker", "specs-azure-core-lro-standard/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "core-lro-standard/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/_operations/_operations.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/_operations/_operations.py index 75522377ab7..3977342ff90 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/_operations/_operations.py @@ -117,13 +117,13 @@ async def begin_create_or_replace( :param name: The name of user. Required. :type name: str :param resource: The resource instance. Required. - :type resource: ~specs.azure.core.lro.standard.models.User + :type resource: ~azure.core.lro.standard.models.User :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: An instance of AsyncLROPoller that returns User. The User is compatible with MutableMapping - :rtype: ~azure.core.polling.AsyncLROPoller[~specs.azure.core.lro.standard.models.User] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.core.lro.standard.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -144,7 +144,7 @@ async def begin_create_or_replace( :paramtype content_type: str :return: An instance of AsyncLROPoller that returns User. The User is compatible with MutableMapping - :rtype: ~azure.core.polling.AsyncLROPoller[~specs.azure.core.lro.standard.models.User] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.core.lro.standard.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -165,7 +165,7 @@ async def begin_create_or_replace( :paramtype content_type: str :return: An instance of AsyncLROPoller that returns User. The User is compatible with MutableMapping - :rtype: ~azure.core.polling.AsyncLROPoller[~specs.azure.core.lro.standard.models.User] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.core.lro.standard.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -181,10 +181,10 @@ async def begin_create_or_replace( :type name: str :param resource: The resource instance. Is one of the following types: User, JSON, IO[bytes] Required. - :type resource: ~specs.azure.core.lro.standard.models.User or JSON or IO[bytes] + :type resource: ~azure.core.lro.standard.models.User or JSON or IO[bytes] :return: An instance of AsyncLROPoller that returns User. The User is compatible with MutableMapping - :rtype: ~azure.core.polling.AsyncLROPoller[~specs.azure.core.lro.standard.models.User] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.core.lro.standard.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -409,7 +409,7 @@ async def begin_export(self, name: str, *, format: str, **kwargs: Any) -> AsyncL :paramtype format: str :return: An instance of AsyncLROPoller that returns ExportedUser. The ExportedUser is compatible with MutableMapping - :rtype: ~azure.core.polling.AsyncLROPoller[~specs.azure.core.lro.standard.models.ExportedUser] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.core.lro.standard.models.ExportedUser] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/models/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/models/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_vendor.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/aio/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/models/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/models/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/models/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/models/_models.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/models/_models.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/models/_models.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/models/_models.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/models/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/models/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/py.typed b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/py.typed rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/azure/core/lro/standard/py.typed diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/generated_tests/testpreparer.py index e17f19a3271..344bff8062d 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/generated_tests/testpreparer.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/generated_tests/testpreparer.py @@ -5,9 +5,9 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.core.lro.standard import StandardClient from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer import functools -from specs.azure.core.lro.standard import StandardClient class StandardClientTestBase(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/generated_tests/testpreparer_async.py index 9b1a3cbea5c..18af11a1c44 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/generated_tests/testpreparer_async.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/generated_tests/testpreparer_async.py @@ -5,8 +5,8 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.core.lro.standard.aio import StandardClient from devtools_testutils import AzureRecordedTestCase -from specs.azure.core.lro.standard.aio import StandardClient class StandardClientTestBaseAsync(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/setup.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/setup.py index ec464a180cc..b77937618b6 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/setup.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/setup.py @@ -12,8 +12,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "specs-azure-core-lro-standard" -PACKAGE_PPRINT_NAME = "Specs Azure Core Lro Standard" +PACKAGE_NAME = "azure-core-lro-standard" +PACKAGE_PPRINT_NAME = "Azure Core Lro Standard" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace("-", "/") @@ -53,15 +53,14 @@ exclude=[ "tests", # Exclude packages that will be covered by PEP420 or nspkg - "specs", - "specs.azure", - "specs.azure.core", - "specs.azure.core.lro", + "azure", + "azure.core", + "azure.core.lro", ] ), include_package_data=True, package_data={ - "specs.azure.core.lro.standard": ["py.typed"], + "azure.core.lro.standard": ["py.typed"], }, install_requires=[ "isodate>=0.6.1", diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-core-model/MANIFEST.in index 0020facc5ec..be023ec8d7d 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-model/MANIFEST.in +++ b/packages/typespec-python/test/azure/generated/azure-core-model/MANIFEST.in @@ -1,8 +1,7 @@ include *.md include LICENSE -include specs/azure/core/model/py.typed +include azure/core/model/py.typed recursive-include tests *.py recursive-include samples *.py *.md -include specs/__init__.py -include specs/azure/__init__.py -include specs/azure/core/__init__.py +include azure/__init__.py +include azure/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/README.md b/packages/typespec-python/test/azure/generated/azure-core-model/README.md index 73c06369615..5503485dc9b 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-model/README.md +++ b/packages/typespec-python/test/azure/generated/azure-core-model/README.md @@ -1,4 +1,4 @@ -# Specs Azure Core Model client library for Python +# Azure Core Model client library for Python ## Getting started @@ -6,14 +6,14 @@ ### Install the package ```bash -python -m pip install specs-azure-core-model +python -m pip install azure-core-model ``` #### Prequisites - Python 3.9 or later is required to use this package. - You need an [Azure subscription][azure_sub] to use this package. -- An existing Specs Azure Core Model instance. +- An existing Azure Core Model instance. ## Contributing diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-core-model/apiview-properties.json index 963bee46f04..bd7206619d7 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-model/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-core-model/apiview-properties.json @@ -1,9 +1,9 @@ { "CrossLanguagePackageId": "_Specs_.Azure.Core.Model", "CrossLanguageDefinitionId": { - "specs.azure.core.model.models.AzureEmbeddingModel": "_Specs_.Azure.Core.Model.AzureEmbeddingModel", - "specs.azure.core.model.ModelClient.azure_core_embedding_vector.get": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get", - "specs.azure.core.model.ModelClient.azure_core_embedding_vector.put": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put", - "specs.azure.core.model.ModelClient.azure_core_embedding_vector.post": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post" + "azure.core.model.models.AzureEmbeddingModel": "_Specs_.Azure.Core.Model.AzureEmbeddingModel", + "azure.core.model.ModelClient.azure_core_embedding_vector.get": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.get", + "azure.core.model.ModelClient.azure_core_embedding_vector.put": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.put", + "azure.core.model.ModelClient.azure_core_embedding_vector.post": "_Specs_.Azure.Core.Model.AzureCoreEmbeddingVector.post" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/_client.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/_client.py similarity index 98% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/_client.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/_client.py index df8084e94a9..aac11ad3727 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/_client.py +++ b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/_client.py @@ -24,7 +24,7 @@ class ModelClient: # pylint: disable=client-accepts-api-version-keyword :ivar azure_core_embedding_vector: AzureCoreEmbeddingVectorOperations operations :vartype azure_core_embedding_vector: - specs.azure.core.model.operations.AzureCoreEmbeddingVectorOperations + azure.core.model.operations.AzureCoreEmbeddingVectorOperations :keyword endpoint: Service host. Default value is "http://localhost:3000". :paramtype endpoint: str """ diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/_configuration.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/_configuration.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/_configuration.py index c7318273d02..4ca40104d1f 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/_configuration.py @@ -26,7 +26,7 @@ class ModelClientConfiguration: # pylint: disable=too-many-instance-attributes def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "specs-azure-core-model/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "core-model/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/_model_base.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/_serialization.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/_serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/_serialization.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/_serialization.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/_version.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/_version.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/_version.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/_client.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/_client.py similarity index 98% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/_client.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/_client.py index 02793af67ed..0156a047902 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/_client.py +++ b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/_client.py @@ -24,7 +24,7 @@ class ModelClient: # pylint: disable=client-accepts-api-version-keyword :ivar azure_core_embedding_vector: AzureCoreEmbeddingVectorOperations operations :vartype azure_core_embedding_vector: - specs.azure.core.model.aio.operations.AzureCoreEmbeddingVectorOperations + azure.core.model.aio.operations.AzureCoreEmbeddingVectorOperations :keyword endpoint: Service host. Default value is "http://localhost:3000". :paramtype endpoint: str """ diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/_configuration.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/_configuration.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/_configuration.py index 7bcd8f6fe5e..bde21b6f4cf 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/_configuration.py @@ -26,7 +26,7 @@ class ModelClientConfiguration: # pylint: disable=too-many-instance-attributes def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "specs-azure-core-model/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "core-model/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/operations/_operations.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/operations/_operations.py index 10fe463b06e..8b49200feba 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/operations/_operations.py @@ -47,7 +47,7 @@ class AzureCoreEmbeddingVectorOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~specs.azure.core.model.aio.ModelClient`'s + :class:`~azure.core.model.aio.ModelClient`'s :attr:`azure_core_embedding_vector` attribute. """ @@ -205,12 +205,12 @@ async def post( """post a model which has an embeddingVector property. :param body: _. Required. - :type body: ~specs.azure.core.model.models.AzureEmbeddingModel + :type body: ~azure.core.model.models.AzureEmbeddingModel :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: AzureEmbeddingModel. The AzureEmbeddingModel is compatible with MutableMapping - :rtype: ~specs.azure.core.model.models.AzureEmbeddingModel + :rtype: ~azure.core.model.models.AzureEmbeddingModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -226,7 +226,7 @@ async def post( Default value is "application/json". :paramtype content_type: str :return: AzureEmbeddingModel. The AzureEmbeddingModel is compatible with MutableMapping - :rtype: ~specs.azure.core.model.models.AzureEmbeddingModel + :rtype: ~azure.core.model.models.AzureEmbeddingModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -242,7 +242,7 @@ async def post( Default value is "application/json". :paramtype content_type: str :return: AzureEmbeddingModel. The AzureEmbeddingModel is compatible with MutableMapping - :rtype: ~specs.azure.core.model.models.AzureEmbeddingModel + :rtype: ~azure.core.model.models.AzureEmbeddingModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -253,9 +253,9 @@ async def post( """post a model which has an embeddingVector property. :param body: _. Is one of the following types: AzureEmbeddingModel, JSON, IO[bytes] Required. - :type body: ~specs.azure.core.model.models.AzureEmbeddingModel or JSON or IO[bytes] + :type body: ~azure.core.model.models.AzureEmbeddingModel or JSON or IO[bytes] :return: AzureEmbeddingModel. The AzureEmbeddingModel is compatible with MutableMapping - :rtype: ~specs.azure.core.model.models.AzureEmbeddingModel + :rtype: ~azure.core.model.models.AzureEmbeddingModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/aio/operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/models/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/models/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/models/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/models/_models.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/models/_models.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/models/_models.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/models/_models.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/models/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/models/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/models/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/models/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/operations/_operations.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/operations/_operations.py index 231406ed609..eecfc979f37 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/model/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/operations/_operations.py @@ -90,7 +90,7 @@ class AzureCoreEmbeddingVectorOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~specs.azure.core.model.ModelClient`'s + :class:`~azure.core.model.ModelClient`'s :attr:`azure_core_embedding_vector` attribute. """ @@ -250,12 +250,12 @@ def post( """post a model which has an embeddingVector property. :param body: _. Required. - :type body: ~specs.azure.core.model.models.AzureEmbeddingModel + :type body: ~azure.core.model.models.AzureEmbeddingModel :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: AzureEmbeddingModel. The AzureEmbeddingModel is compatible with MutableMapping - :rtype: ~specs.azure.core.model.models.AzureEmbeddingModel + :rtype: ~azure.core.model.models.AzureEmbeddingModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -269,7 +269,7 @@ def post(self, body: JSON, *, content_type: str = "application/json", **kwargs: Default value is "application/json". :paramtype content_type: str :return: AzureEmbeddingModel. The AzureEmbeddingModel is compatible with MutableMapping - :rtype: ~specs.azure.core.model.models.AzureEmbeddingModel + :rtype: ~azure.core.model.models.AzureEmbeddingModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -285,7 +285,7 @@ def post( Default value is "application/json". :paramtype content_type: str :return: AzureEmbeddingModel. The AzureEmbeddingModel is compatible with MutableMapping - :rtype: ~specs.azure.core.model.models.AzureEmbeddingModel + :rtype: ~azure.core.model.models.AzureEmbeddingModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -296,9 +296,9 @@ def post( """post a model which has an embeddingVector property. :param body: _. Is one of the following types: AzureEmbeddingModel, JSON, IO[bytes] Required. - :type body: ~specs.azure.core.model.models.AzureEmbeddingModel or JSON or IO[bytes] + :type body: ~azure.core.model.models.AzureEmbeddingModel or JSON or IO[bytes] :return: AzureEmbeddingModel. The AzureEmbeddingModel is compatible with MutableMapping - :rtype: ~specs.azure.core.model.models.AzureEmbeddingModel + :rtype: ~azure.core.model.models.AzureEmbeddingModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/py.typed b/packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/py.typed rename to packages/typespec-python/test/azure/generated/azure-core-model/azure/core/model/py.typed diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/azure-core-model/generated_tests/testpreparer.py index e8743f4445d..621ddbcf868 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-model/generated_tests/testpreparer.py +++ b/packages/typespec-python/test/azure/generated/azure-core-model/generated_tests/testpreparer.py @@ -5,9 +5,9 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.core.model import ModelClient from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer import functools -from specs.azure.core.model import ModelClient class ModelClientTestBase(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/azure-core-model/generated_tests/testpreparer_async.py index 6eafdc7e92f..e873baca9e5 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-model/generated_tests/testpreparer_async.py +++ b/packages/typespec-python/test/azure/generated/azure-core-model/generated_tests/testpreparer_async.py @@ -5,8 +5,8 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.core.model.aio import ModelClient from devtools_testutils import AzureRecordedTestCase -from specs.azure.core.model.aio import ModelClient class ModelClientTestBaseAsync(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/setup.py b/packages/typespec-python/test/azure/generated/azure-core-model/setup.py index f930e407f74..1705aca4979 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-model/setup.py +++ b/packages/typespec-python/test/azure/generated/azure-core-model/setup.py @@ -12,8 +12,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "specs-azure-core-model" -PACKAGE_PPRINT_NAME = "Specs Azure Core Model" +PACKAGE_NAME = "azure-core-model" +PACKAGE_PPRINT_NAME = "Azure Core Model" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace("-", "/") @@ -53,14 +53,13 @@ exclude=[ "tests", # Exclude packages that will be covered by PEP420 or nspkg - "specs", - "specs.azure", - "specs.azure.core", + "azure", + "azure.core", ] ), include_package_data=True, package_data={ - "specs.azure.core.model": ["py.typed"], + "azure.core.model": ["py.typed"], }, install_requires=[ "isodate>=0.6.1", diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-core-page/MANIFEST.in index 8e8c1848412..f08ad1dcb7b 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/MANIFEST.in +++ b/packages/typespec-python/test/azure/generated/azure-core-page/MANIFEST.in @@ -1,8 +1,7 @@ include *.md include LICENSE -include specs/azure/core/page/py.typed +include azure/core/page/py.typed recursive-include tests *.py recursive-include samples *.py *.md -include specs/__init__.py -include specs/azure/__init__.py -include specs/azure/core/__init__.py +include azure/__init__.py +include azure/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/README.md b/packages/typespec-python/test/azure/generated/azure-core-page/README.md index 69d1fee789d..0c5f2fcccae 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/README.md +++ b/packages/typespec-python/test/azure/generated/azure-core-page/README.md @@ -1,4 +1,4 @@ -# Specs Azure Core Page client library for Python +# Azure Core Page client library for Python ## Getting started @@ -6,14 +6,14 @@ ### Install the package ```bash -python -m pip install specs-azure-core-page +python -m pip install azure-core-page ``` #### Prequisites - Python 3.9 or later is required to use this package. - You need an [Azure subscription][azure_sub] to use this package. -- An existing Specs Azure Core Page instance. +- An existing Azure Core Page instance. ## Contributing diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-core-page/apiview-properties.json index caf1fe5f707..8464c5b8e80 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-core-page/apiview-properties.json @@ -1,16 +1,17 @@ { "CrossLanguagePackageId": "_Specs_.Azure.Core.Page", "CrossLanguageDefinitionId": { - "specs.azure.core.page.models.FirstItem": "_Specs_.Azure.Core.Page.FirstItem", - "specs.azure.core.page.models.ListItemInputBody": "_Specs_.Azure.Core.Page.ListItemInputBody", - "specs.azure.core.page.models.SecondItem": "_Specs_.Azure.Core.Page.SecondItem", - "specs.azure.core.page.models.User": "_Specs_.Azure.Core.Page.User", - "specs.azure.core.page.models.UserOrder": "_Specs_.Azure.Core.Page.UserOrder", - "specs.azure.core.page.models.ListItemInputExtensibleEnum": "_Specs_.Azure.Core.Page.ListItemInputExtensibleEnum", - "specs.azure.core.page.PageClient.two_models_as_page_item.list_first_item": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listFirstItem", - "specs.azure.core.page.PageClient.two_models_as_page_item.list_second_item": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listSecondItem", - "specs.azure.core.page.PageClient.list_with_page": "_Specs_.Azure.Core.Page.listWithPage", - "specs.azure.core.page.PageClient.list_with_parameters": "_Specs_.Azure.Core.Page.listWithParameters", - "specs.azure.core.page.PageClient.list_with_custom_page_model": "_Specs_.Azure.Core.Page.listWithCustomPageModel" + "azure.core.page.models.FirstItem": "_Specs_.Azure.Core.Page.FirstItem", + "azure.core.page.models.ListItemInputBody": "_Specs_.Azure.Core.Page.ListItemInputBody", + "azure.core.page.models.SecondItem": "_Specs_.Azure.Core.Page.SecondItem", + "azure.core.page.models.User": "_Specs_.Azure.Core.Page.User", + "azure.core.page.models.UserOrder": "_Specs_.Azure.Core.Page.UserOrder", + "azure.core.page.models.ListItemInputExtensibleEnum": "_Specs_.Azure.Core.Page.ListItemInputExtensibleEnum", + "azure.core.page.PageClient.two_models_as_page_item.list_first_item": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listFirstItem", + "azure.core.page.PageClient.two_models_as_page_item.list_second_item": "_Specs_.Azure.Core.Page.TwoModelsAsPageItem.listSecondItem", + "azure.core.page.PageClient.list_with_page": "_Specs_.Azure.Core.Page.listWithPage", + "azure.core.page.PageClient.list_with_parameters": "_Specs_.Azure.Core.Page.listWithParameters", + "azure.core.page.PageClient.list_with_custom_page_model": "_Specs_.Azure.Core.Page.listWithCustomPageModel", + "azure.core.page.PageClient.with_parameterized_next_link": "_Specs_.Azure.Core.Page.withParameterizedNextLink" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/_client.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/_client.py similarity index 97% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/_client.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/_client.py index b0184ed3e51..aeef649160a 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/_client.py +++ b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/_client.py @@ -23,8 +23,7 @@ class PageClient(PageClientOperationsMixin): """Illustrates bodies templated with Azure Core with paging support. :ivar two_models_as_page_item: TwoModelsAsPageItemOperations operations - :vartype two_models_as_page_item: - specs.azure.core.page.operations.TwoModelsAsPageItemOperations + :vartype two_models_as_page_item: azure.core.page.operations.TwoModelsAsPageItemOperations :keyword endpoint: Service host. Default value is "http://localhost:3000". :paramtype endpoint: str :keyword api_version: The API version to use for this operation. Default value is diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/_configuration.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/_configuration.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/_configuration.py index a5fff6bed9e..06159d4b909 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/_configuration.py @@ -32,7 +32,7 @@ def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> No self.endpoint = endpoint self.api_version = api_version - kwargs.setdefault("sdk_moniker", "specs-azure-core-page/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "core-page/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/_model_base.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/_serialization.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/_serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/_serialization.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/_serialization.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/_vendor.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/_version.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/_version.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/_version.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/_client.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/_client.py similarity index 97% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/_client.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/_client.py index 249f5287162..c7a363f1fe0 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/_client.py +++ b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/_client.py @@ -23,8 +23,7 @@ class PageClient(PageClientOperationsMixin): """Illustrates bodies templated with Azure Core with paging support. :ivar two_models_as_page_item: TwoModelsAsPageItemOperations operations - :vartype two_models_as_page_item: - specs.azure.core.page.aio.operations.TwoModelsAsPageItemOperations + :vartype two_models_as_page_item: azure.core.page.aio.operations.TwoModelsAsPageItemOperations :keyword endpoint: Service host. Default value is "http://localhost:3000". :paramtype endpoint: str :keyword api_version: The API version to use for this operation. Default value is diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/_configuration.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/_configuration.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/_configuration.py index 5dbba13ee57..f1c521dd1ad 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/_configuration.py @@ -32,7 +32,7 @@ def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> No self.endpoint = endpoint self.api_version = api_version - kwargs.setdefault("sdk_moniker", "specs-azure-core-page/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "core-page/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/_vendor.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/operations/_operations.py similarity index 82% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/operations/_operations.py index 56b88c9b3be..0aeee5a6d31 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/operations/_operations.py @@ -34,6 +34,7 @@ build_page_list_with_custom_page_model_request, build_page_list_with_page_request, build_page_list_with_parameters_request, + build_page_with_parameterized_next_link_request, build_two_models_as_page_item_list_first_item_request, build_two_models_as_page_item_list_second_item_request, ) @@ -51,7 +52,7 @@ class TwoModelsAsPageItemOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~specs.azure.core.page.aio.PageClient`'s + :class:`~azure.core.page.aio.PageClient`'s :attr:`two_models_as_page_item` attribute. """ @@ -68,7 +69,7 @@ def list_first_item(self, **kwargs: Any) -> AsyncIterable["_models.FirstItem"]: generate model for FirstItem. :return: An iterator like instance of FirstItem - :rtype: ~azure.core.async_paging.AsyncItemPaged[~specs.azure.core.page.models.FirstItem] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.core.page.models.FirstItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -151,7 +152,7 @@ def list_second_item(self, **kwargs: Any) -> AsyncIterable["_models.SecondItem"] generate model for SecondItem. :return: An iterator like instance of SecondItem - :rtype: ~azure.core.async_paging.AsyncItemPaged[~specs.azure.core.page.models.SecondItem] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.core.page.models.SecondItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -236,7 +237,7 @@ def list_with_page(self, **kwargs: Any) -> AsyncIterable["_models.User"]: """List with Azure.Core.Page<>. :return: An iterator like instance of User - :rtype: ~azure.core.async_paging.AsyncItemPaged[~specs.azure.core.page.models.User] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.core.page.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -325,15 +326,15 @@ def list_with_parameters( """List with extensible enum parameter Azure.Core.Page<>. :param body_input: The body of the input. Required. - :type body_input: ~specs.azure.core.page.models.ListItemInputBody + :type body_input: ~azure.core.page.models.ListItemInputBody :keyword another: Another query parameter. Known values are: "First" and "Second". Default value is None. - :paramtype another: str or ~specs.azure.core.page.models.ListItemInputExtensibleEnum + :paramtype another: str or ~azure.core.page.models.ListItemInputExtensibleEnum :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: An iterator like instance of User - :rtype: ~azure.core.async_paging.AsyncItemPaged[~specs.azure.core.page.models.User] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.core.page.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -352,12 +353,12 @@ def list_with_parameters( :type body_input: JSON :keyword another: Another query parameter. Known values are: "First" and "Second". Default value is None. - :paramtype another: str or ~specs.azure.core.page.models.ListItemInputExtensibleEnum + :paramtype another: str or ~azure.core.page.models.ListItemInputExtensibleEnum :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: An iterator like instance of User - :rtype: ~azure.core.async_paging.AsyncItemPaged[~specs.azure.core.page.models.User] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.core.page.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -376,12 +377,12 @@ def list_with_parameters( :type body_input: IO[bytes] :keyword another: Another query parameter. Known values are: "First" and "Second". Default value is None. - :paramtype another: str or ~specs.azure.core.page.models.ListItemInputExtensibleEnum + :paramtype another: str or ~azure.core.page.models.ListItemInputExtensibleEnum :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str :return: An iterator like instance of User - :rtype: ~azure.core.async_paging.AsyncItemPaged[~specs.azure.core.page.models.User] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.core.page.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -397,12 +398,12 @@ def list_with_parameters( :param body_input: The body of the input. Is one of the following types: ListItemInputBody, JSON, IO[bytes] Required. - :type body_input: ~specs.azure.core.page.models.ListItemInputBody or JSON or IO[bytes] + :type body_input: ~azure.core.page.models.ListItemInputBody or JSON or IO[bytes] :keyword another: Another query parameter. Known values are: "First" and "Second". Default value is None. - :paramtype another: str or ~specs.azure.core.page.models.ListItemInputExtensibleEnum + :paramtype another: str or ~azure.core.page.models.ListItemInputExtensibleEnum :return: An iterator like instance of User - :rtype: ~azure.core.async_paging.AsyncItemPaged[~specs.azure.core.page.models.User] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.core.page.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -494,7 +495,7 @@ def list_with_custom_page_model(self, **kwargs: Any) -> AsyncIterable["_models.U """List with custom page model. :return: An iterator like instance of User - :rtype: ~azure.core.async_paging.AsyncItemPaged[~specs.azure.core.page.models.User] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.core.page.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -570,3 +571,92 @@ async def get_next(next_link=None): return pipeline_response return AsyncItemPaged(get_next, extract_data) + + @distributed_trace + def with_parameterized_next_link( + self, *, select: str, include_pending: Optional[bool] = None, **kwargs: Any + ) -> AsyncIterable["_models.User"]: + """List with parameterized next link that re-injects parameters. + + :keyword select: Required. + :paramtype select: str + :keyword include_pending: Default value is None. + :paramtype include_pending: bool + :return: An iterator like instance of User + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.core.page.models.User] + :raises ~azure.core.exceptions.HttpResponseError: + """ + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[List[_models.User]] = kwargs.pop("cls", None) + + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + def prepare_request(next_link=None): + if not next_link: + + _request = build_page_with_parameterized_next_link_request( + select=select, + include_pending=include_pending, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url( + "self._config.endpoint", self._config.endpoint, "str", skip_quote=True + ), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + else: + # make call to next link with the client's api-version + _parsed_next_link = urllib.parse.urlparse(next_link) + _next_request_params = case_insensitive_dict( + { + key: [urllib.parse.quote(v) for v in value] + for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() + } + ) + _next_request_params["api-version"] = self._config.api_version + _request = HttpRequest( + "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params + ) + path_format_arguments = { + "endpoint": self._serialize.url( + "self._config.endpoint", self._config.endpoint, "str", skip_quote=True + ), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + return _request + + async def extract_data(pipeline_response): + deserialized = pipeline_response.http_response.json() + list_of_elem = _deserialize(List[_models.User], deserialized.get("values", [])) + if cls: + list_of_elem = cls(list_of_elem) # type: ignore + return deserialized.get("nextLink") or None, AsyncList(list_of_elem) + + async def get_next(next_link=None): + _request = prepare_request(next_link) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + return pipeline_response + + return AsyncItemPaged(get_next, extract_data) diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/aio/operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/models/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/models/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/models/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/models/_enums.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/models/_enums.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/models/_enums.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/models/_enums.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/models/_models.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/models/_models.py similarity index 98% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/models/_models.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/models/_models.py index ac2679648e5..4a42d247382 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/models/_models.py @@ -74,7 +74,7 @@ class User(_model_base.Model): :ivar name: The user's name. Required. :vartype name: str :ivar orders: The user's order list. - :vartype orders: list[~specs.azure.core.page.models.UserOrder] + :vartype orders: list[~azure.core.page.models.UserOrder] :ivar etag: The entity tag for this resource. Required. :vartype etag: str """ diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/models/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/models/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/models/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/models/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/operations/_operations.py similarity index 82% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/operations/_operations.py index 1021c6f8c61..8d457e3860f 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/page/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/operations/_operations.py @@ -146,13 +146,35 @@ def build_page_list_with_custom_page_model_request(**kwargs: Any) -> HttpRequest return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) +def build_page_with_parameterized_next_link_request( # pylint: disable=name-too-long + *, select: str, include_pending: Optional[bool] = None, **kwargs: Any +) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + accept = _headers.pop("Accept", "application/json") + + # Construct URL + _url = "/azure/core/page/with-parameterized-next-link" + + # Construct parameters + if include_pending is not None: + _params["includePending"] = _SERIALIZER.query("include_pending", include_pending, "bool") + _params["select"] = _SERIALIZER.query("select", select, "str") + + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + class TwoModelsAsPageItemOperations: """ .. warning:: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~specs.azure.core.page.PageClient`'s + :class:`~azure.core.page.PageClient`'s :attr:`two_models_as_page_item` attribute. """ @@ -169,7 +191,7 @@ def list_first_item(self, **kwargs: Any) -> Iterable["_models.FirstItem"]: generate model for FirstItem. :return: An iterator like instance of FirstItem - :rtype: ~azure.core.paging.ItemPaged[~specs.azure.core.page.models.FirstItem] + :rtype: ~azure.core.paging.ItemPaged[~azure.core.page.models.FirstItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -252,7 +274,7 @@ def list_second_item(self, **kwargs: Any) -> Iterable["_models.SecondItem"]: generate model for SecondItem. :return: An iterator like instance of SecondItem - :rtype: ~azure.core.paging.ItemPaged[~specs.azure.core.page.models.SecondItem] + :rtype: ~azure.core.paging.ItemPaged[~azure.core.page.models.SecondItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -337,7 +359,7 @@ def list_with_page(self, **kwargs: Any) -> Iterable["_models.User"]: """List with Azure.Core.Page<>. :return: An iterator like instance of User - :rtype: ~azure.core.paging.ItemPaged[~specs.azure.core.page.models.User] + :rtype: ~azure.core.paging.ItemPaged[~azure.core.page.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -426,15 +448,15 @@ def list_with_parameters( """List with extensible enum parameter Azure.Core.Page<>. :param body_input: The body of the input. Required. - :type body_input: ~specs.azure.core.page.models.ListItemInputBody + :type body_input: ~azure.core.page.models.ListItemInputBody :keyword another: Another query parameter. Known values are: "First" and "Second". Default value is None. - :paramtype another: str or ~specs.azure.core.page.models.ListItemInputExtensibleEnum + :paramtype another: str or ~azure.core.page.models.ListItemInputExtensibleEnum :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: An iterator like instance of User - :rtype: ~azure.core.paging.ItemPaged[~specs.azure.core.page.models.User] + :rtype: ~azure.core.paging.ItemPaged[~azure.core.page.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -453,12 +475,12 @@ def list_with_parameters( :type body_input: JSON :keyword another: Another query parameter. Known values are: "First" and "Second". Default value is None. - :paramtype another: str or ~specs.azure.core.page.models.ListItemInputExtensibleEnum + :paramtype another: str or ~azure.core.page.models.ListItemInputExtensibleEnum :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: An iterator like instance of User - :rtype: ~azure.core.paging.ItemPaged[~specs.azure.core.page.models.User] + :rtype: ~azure.core.paging.ItemPaged[~azure.core.page.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -477,12 +499,12 @@ def list_with_parameters( :type body_input: IO[bytes] :keyword another: Another query parameter. Known values are: "First" and "Second". Default value is None. - :paramtype another: str or ~specs.azure.core.page.models.ListItemInputExtensibleEnum + :paramtype another: str or ~azure.core.page.models.ListItemInputExtensibleEnum :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str :return: An iterator like instance of User - :rtype: ~azure.core.paging.ItemPaged[~specs.azure.core.page.models.User] + :rtype: ~azure.core.paging.ItemPaged[~azure.core.page.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -498,12 +520,12 @@ def list_with_parameters( :param body_input: The body of the input. Is one of the following types: ListItemInputBody, JSON, IO[bytes] Required. - :type body_input: ~specs.azure.core.page.models.ListItemInputBody or JSON or IO[bytes] + :type body_input: ~azure.core.page.models.ListItemInputBody or JSON or IO[bytes] :keyword another: Another query parameter. Known values are: "First" and "Second". Default value is None. - :paramtype another: str or ~specs.azure.core.page.models.ListItemInputExtensibleEnum + :paramtype another: str or ~azure.core.page.models.ListItemInputExtensibleEnum :return: An iterator like instance of User - :rtype: ~azure.core.paging.ItemPaged[~specs.azure.core.page.models.User] + :rtype: ~azure.core.paging.ItemPaged[~azure.core.page.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -595,7 +617,7 @@ def list_with_custom_page_model(self, **kwargs: Any) -> Iterable["_models.User"] """List with custom page model. :return: An iterator like instance of User - :rtype: ~azure.core.paging.ItemPaged[~specs.azure.core.page.models.User] + :rtype: ~azure.core.paging.ItemPaged[~azure.core.page.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -671,3 +693,92 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) + + @distributed_trace + def with_parameterized_next_link( + self, *, select: str, include_pending: Optional[bool] = None, **kwargs: Any + ) -> Iterable["_models.User"]: + """List with parameterized next link that re-injects parameters. + + :keyword select: Required. + :paramtype select: str + :keyword include_pending: Default value is None. + :paramtype include_pending: bool + :return: An iterator like instance of User + :rtype: ~azure.core.paging.ItemPaged[~azure.core.page.models.User] + :raises ~azure.core.exceptions.HttpResponseError: + """ + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[List[_models.User]] = kwargs.pop("cls", None) + + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + def prepare_request(next_link=None): + if not next_link: + + _request = build_page_with_parameterized_next_link_request( + select=select, + include_pending=include_pending, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url( + "self._config.endpoint", self._config.endpoint, "str", skip_quote=True + ), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + else: + # make call to next link with the client's api-version + _parsed_next_link = urllib.parse.urlparse(next_link) + _next_request_params = case_insensitive_dict( + { + key: [urllib.parse.quote(v) for v in value] + for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() + } + ) + _next_request_params["api-version"] = self._config.api_version + _request = HttpRequest( + "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params + ) + path_format_arguments = { + "endpoint": self._serialize.url( + "self._config.endpoint", self._config.endpoint, "str", skip_quote=True + ), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + return _request + + def extract_data(pipeline_response): + deserialized = pipeline_response.http_response.json() + list_of_elem = _deserialize(List[_models.User], deserialized.get("values", [])) + if cls: + list_of_elem = cls(list_of_elem) # type: ignore + return deserialized.get("nextLink") or None, iter(list_of_elem) + + def get_next(next_link=None): + _request = prepare_request(next_link) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + return pipeline_response + + return ItemPaged(get_next, extract_data) diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/py.typed b/packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/py.typed rename to packages/typespec-python/test/azure/generated/azure-core-page/azure/core/page/py.typed diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/test_page.py b/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/test_page.py index 053081e9ec6..d5d0ff8efdf 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/test_page.py +++ b/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/test_page.py @@ -40,3 +40,14 @@ def test_list_with_custom_page_model(self, page_endpoint): result = [r for r in response] # please add some check logic here by yourself # ... + + @PagePreparer() + @recorded_by_proxy + def test_with_parameterized_next_link(self, page_endpoint): + client = self.create_client(endpoint=page_endpoint) + response = client.with_parameterized_next_link( + select="str", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/test_page_async.py b/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/test_page_async.py index 3bfc3a98048..070af410263 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/test_page_async.py +++ b/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/test_page_async.py @@ -41,3 +41,14 @@ async def test_list_with_custom_page_model(self, page_endpoint): result = [r async for r in response] # please add some check logic here by yourself # ... + + @PagePreparer() + @recorded_by_proxy_async + async def test_with_parameterized_next_link(self, page_endpoint): + client = self.create_async_client(endpoint=page_endpoint) + response = client.with_parameterized_next_link( + select="str", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/testpreparer.py index 921bc83a56c..4cff61aa764 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/testpreparer.py +++ b/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/testpreparer.py @@ -5,9 +5,9 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.core.page import PageClient from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer import functools -from specs.azure.core.page import PageClient class PageClientTestBase(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/testpreparer_async.py index fa9ad45c103..bf5ebc1a18d 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/testpreparer_async.py +++ b/packages/typespec-python/test/azure/generated/azure-core-page/generated_tests/testpreparer_async.py @@ -5,8 +5,8 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.core.page.aio import PageClient from devtools_testutils import AzureRecordedTestCase -from specs.azure.core.page.aio import PageClient class PageClientTestBaseAsync(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/setup.py b/packages/typespec-python/test/azure/generated/azure-core-page/setup.py index 8cf45e09e1c..9cb7f38ba31 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-page/setup.py +++ b/packages/typespec-python/test/azure/generated/azure-core-page/setup.py @@ -12,8 +12,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "specs-azure-core-page" -PACKAGE_PPRINT_NAME = "Specs Azure Core Page" +PACKAGE_NAME = "azure-core-page" +PACKAGE_PPRINT_NAME = "Azure Core Page" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace("-", "/") @@ -53,14 +53,13 @@ exclude=[ "tests", # Exclude packages that will be covered by PEP420 or nspkg - "specs", - "specs.azure", - "specs.azure.core", + "azure", + "azure.core", ] ), include_package_data=True, package_data={ - "specs.azure.core.page": ["py.typed"], + "azure.core.page": ["py.typed"], }, install_requires=[ "isodate>=0.6.1", diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-core-scalar/MANIFEST.in index 295f0550778..5c04f445b2c 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-scalar/MANIFEST.in +++ b/packages/typespec-python/test/azure/generated/azure-core-scalar/MANIFEST.in @@ -1,8 +1,7 @@ include *.md include LICENSE -include specs/azure/core/scalar/py.typed +include azure/core/scalar/py.typed recursive-include tests *.py recursive-include samples *.py *.md -include specs/__init__.py -include specs/azure/__init__.py -include specs/azure/core/__init__.py +include azure/__init__.py +include azure/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/README.md b/packages/typespec-python/test/azure/generated/azure-core-scalar/README.md index 36ccfc67ee4..0172ea70d89 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-scalar/README.md +++ b/packages/typespec-python/test/azure/generated/azure-core-scalar/README.md @@ -1,4 +1,4 @@ -# Specs Azure Core Scalar client library for Python +# Azure Core Scalar client library for Python ## Getting started @@ -6,14 +6,14 @@ ### Install the package ```bash -python -m pip install specs-azure-core-scalar +python -m pip install azure-core-scalar ``` #### Prequisites - Python 3.9 or later is required to use this package. - You need an [Azure subscription][azure_sub] to use this package. -- An existing Specs Azure Core Scalar instance. +- An existing Azure Core Scalar instance. ## Contributing diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-core-scalar/apiview-properties.json index 4b24130a217..505c465dab7 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-scalar/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-core-scalar/apiview-properties.json @@ -1,11 +1,11 @@ { "CrossLanguagePackageId": "_Specs_.Azure.Core.Scalar", "CrossLanguageDefinitionId": { - "specs.azure.core.scalar.models.AzureLocationModel": "_Specs_.Azure.Core.Scalar.AzureLocationModel", - "specs.azure.core.scalar.ScalarClient.azure_location_scalar.get": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.get", - "specs.azure.core.scalar.ScalarClient.azure_location_scalar.put": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.put", - "specs.azure.core.scalar.ScalarClient.azure_location_scalar.post": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.post", - "specs.azure.core.scalar.ScalarClient.azure_location_scalar.header": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.header", - "specs.azure.core.scalar.ScalarClient.azure_location_scalar.query": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.query" + "azure.core.scalar.models.AzureLocationModel": "_Specs_.Azure.Core.Scalar.AzureLocationModel", + "azure.core.scalar.ScalarClient.azure_location_scalar.get": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.get", + "azure.core.scalar.ScalarClient.azure_location_scalar.put": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.put", + "azure.core.scalar.ScalarClient.azure_location_scalar.post": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.post", + "azure.core.scalar.ScalarClient.azure_location_scalar.header": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.header", + "azure.core.scalar.ScalarClient.azure_location_scalar.query": "_Specs_.Azure.Core.Scalar.AzureLocationScalar.query" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-model/specs/azure/core/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/_client.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/_client.py similarity index 97% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/_client.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/_client.py index aff4e005627..1615aef778f 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/_client.py +++ b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/_client.py @@ -23,8 +23,7 @@ class ScalarClient: # pylint: disable=client-accepts-api-version-keyword """ScalarClient. :ivar azure_location_scalar: AzureLocationScalarOperations operations - :vartype azure_location_scalar: - specs.azure.core.scalar.operations.AzureLocationScalarOperations + :vartype azure_location_scalar: azure.core.scalar.operations.AzureLocationScalarOperations :keyword endpoint: Service host. Default value is "http://localhost:3000". :paramtype endpoint: str """ diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/_configuration.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/_configuration.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/_configuration.py index d47b86ac812..18ad6af1296 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/_configuration.py @@ -26,7 +26,7 @@ class ScalarClientConfiguration: # pylint: disable=too-many-instance-attributes def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "specs-azure-core-scalar/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "core-scalar/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_model_base.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_serialization.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/_serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_serialization.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/_serialization.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_version.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_version.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/_version.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/_client.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/_client.py similarity index 97% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/_client.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/_client.py index 1cfc559ae82..996b190a166 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/_client.py +++ b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/_client.py @@ -23,8 +23,7 @@ class ScalarClient: # pylint: disable=client-accepts-api-version-keyword """ScalarClient. :ivar azure_location_scalar: AzureLocationScalarOperations operations - :vartype azure_location_scalar: - specs.azure.core.scalar.aio.operations.AzureLocationScalarOperations + :vartype azure_location_scalar: azure.core.scalar.aio.operations.AzureLocationScalarOperations :keyword endpoint: Service host. Default value is "http://localhost:3000". :paramtype endpoint: str """ diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/_configuration.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/_configuration.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/_configuration.py index e917eca89c1..dae387275cd 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/_configuration.py @@ -26,7 +26,7 @@ class ScalarClientConfiguration: # pylint: disable=too-many-instance-attributes def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "specs-azure-core-scalar/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "core-scalar/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/operations/_operations.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/operations/_operations.py index 08a407a9f99..01ee3b92707 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/operations/_operations.py @@ -49,7 +49,7 @@ class AzureLocationScalarOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~specs.azure.core.scalar.aio.ScalarClient`'s + :class:`~azure.core.scalar.aio.ScalarClient`'s :attr:`azure_location_scalar` attribute. """ @@ -177,12 +177,12 @@ async def post( """post a model which has azureLocation property. :param body: _. Required. - :type body: ~specs.azure.core.scalar.models.AzureLocationModel + :type body: ~azure.core.scalar.models.AzureLocationModel :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: AzureLocationModel. The AzureLocationModel is compatible with MutableMapping - :rtype: ~specs.azure.core.scalar.models.AzureLocationModel + :rtype: ~azure.core.scalar.models.AzureLocationModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -198,7 +198,7 @@ async def post( Default value is "application/json". :paramtype content_type: str :return: AzureLocationModel. The AzureLocationModel is compatible with MutableMapping - :rtype: ~specs.azure.core.scalar.models.AzureLocationModel + :rtype: ~azure.core.scalar.models.AzureLocationModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -214,7 +214,7 @@ async def post( Default value is "application/json". :paramtype content_type: str :return: AzureLocationModel. The AzureLocationModel is compatible with MutableMapping - :rtype: ~specs.azure.core.scalar.models.AzureLocationModel + :rtype: ~azure.core.scalar.models.AzureLocationModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -225,9 +225,9 @@ async def post( """post a model which has azureLocation property. :param body: _. Is one of the following types: AzureLocationModel, JSON, IO[bytes] Required. - :type body: ~specs.azure.core.scalar.models.AzureLocationModel or JSON or IO[bytes] + :type body: ~azure.core.scalar.models.AzureLocationModel or JSON or IO[bytes] :return: AzureLocationModel. The AzureLocationModel is compatible with MutableMapping - :rtype: ~specs.azure.core.scalar.models.AzureLocationModel + :rtype: ~azure.core.scalar.models.AzureLocationModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/aio/operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/models/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/models/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/models/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/models/_models.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/models/_models.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/models/_models.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/models/_models.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/models/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/models/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/operations/_operations.py similarity index 97% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/operations/_operations.py index 050316e660b..3ee6cdc24c1 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/operations/_operations.py @@ -117,7 +117,7 @@ class AzureLocationScalarOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~specs.azure.core.scalar.ScalarClient`'s + :class:`~azure.core.scalar.ScalarClient`'s :attr:`azure_location_scalar` attribute. """ @@ -245,12 +245,12 @@ def post( """post a model which has azureLocation property. :param body: _. Required. - :type body: ~specs.azure.core.scalar.models.AzureLocationModel + :type body: ~azure.core.scalar.models.AzureLocationModel :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: AzureLocationModel. The AzureLocationModel is compatible with MutableMapping - :rtype: ~specs.azure.core.scalar.models.AzureLocationModel + :rtype: ~azure.core.scalar.models.AzureLocationModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -264,7 +264,7 @@ def post(self, body: JSON, *, content_type: str = "application/json", **kwargs: Default value is "application/json". :paramtype content_type: str :return: AzureLocationModel. The AzureLocationModel is compatible with MutableMapping - :rtype: ~specs.azure.core.scalar.models.AzureLocationModel + :rtype: ~azure.core.scalar.models.AzureLocationModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -280,7 +280,7 @@ def post( Default value is "application/json". :paramtype content_type: str :return: AzureLocationModel. The AzureLocationModel is compatible with MutableMapping - :rtype: ~specs.azure.core.scalar.models.AzureLocationModel + :rtype: ~azure.core.scalar.models.AzureLocationModel :raises ~azure.core.exceptions.HttpResponseError: """ @@ -291,9 +291,9 @@ def post( """post a model which has azureLocation property. :param body: _. Is one of the following types: AzureLocationModel, JSON, IO[bytes] Required. - :type body: ~specs.azure.core.scalar.models.AzureLocationModel or JSON or IO[bytes] + :type body: ~azure.core.scalar.models.AzureLocationModel or JSON or IO[bytes] :return: AzureLocationModel. The AzureLocationModel is compatible with MutableMapping - :rtype: ~specs.azure.core.scalar.models.AzureLocationModel + :rtype: ~azure.core.scalar.models.AzureLocationModel :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/models/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/models/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/py.typed b/packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/py.typed rename to packages/typespec-python/test/azure/generated/azure-core-scalar/azure/core/scalar/py.typed diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/generated_tests/testpreparer.py index cb3c43946e6..e2950192ea8 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-scalar/generated_tests/testpreparer.py +++ b/packages/typespec-python/test/azure/generated/azure-core-scalar/generated_tests/testpreparer.py @@ -5,9 +5,9 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.core.scalar import ScalarClient from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer import functools -from specs.azure.core.scalar import ScalarClient class ScalarClientTestBase(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/generated_tests/testpreparer_async.py index 5d70e7f1fa2..51364cf28af 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-scalar/generated_tests/testpreparer_async.py +++ b/packages/typespec-python/test/azure/generated/azure-core-scalar/generated_tests/testpreparer_async.py @@ -5,8 +5,8 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.core.scalar.aio import ScalarClient from devtools_testutils import AzureRecordedTestCase -from specs.azure.core.scalar.aio import ScalarClient class ScalarClientTestBaseAsync(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/setup.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/setup.py index 3c47e78642c..eaa98ef0247 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-scalar/setup.py +++ b/packages/typespec-python/test/azure/generated/azure-core-scalar/setup.py @@ -12,8 +12,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "specs-azure-core-scalar" -PACKAGE_PPRINT_NAME = "Specs Azure Core Scalar" +PACKAGE_NAME = "azure-core-scalar" +PACKAGE_PPRINT_NAME = "Azure Core Scalar" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace("-", "/") @@ -53,14 +53,13 @@ exclude=[ "tests", # Exclude packages that will be covered by PEP420 or nspkg - "specs", - "specs.azure", - "specs.azure.core", + "azure", + "azure.core", ] ), include_package_data=True, package_data={ - "specs.azure.core.scalar": ["py.typed"], + "azure.core.scalar": ["py.typed"], }, install_requires=[ "isodate>=0.6.1", diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-core-traits/MANIFEST.in index 52c9896c808..fe20730bd38 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-traits/MANIFEST.in +++ b/packages/typespec-python/test/azure/generated/azure-core-traits/MANIFEST.in @@ -1,8 +1,7 @@ include *.md include LICENSE -include specs/azure/core/traits/py.typed +include azure/core/traits/py.typed recursive-include tests *.py recursive-include samples *.py *.md -include specs/__init__.py -include specs/azure/__init__.py -include specs/azure/core/__init__.py +include azure/__init__.py +include azure/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/README.md b/packages/typespec-python/test/azure/generated/azure-core-traits/README.md index d76f48f5ba9..9b541f1749c 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-traits/README.md +++ b/packages/typespec-python/test/azure/generated/azure-core-traits/README.md @@ -1,4 +1,4 @@ -# Specs Azure Core Traits client library for Python +# Azure Core Traits client library for Python ## Getting started @@ -6,14 +6,14 @@ ### Install the package ```bash -python -m pip install specs-azure-core-traits +python -m pip install azure-core-traits ``` #### Prequisites - Python 3.9 or later is required to use this package. - You need an [Azure subscription][azure_sub] to use this package. -- An existing Specs Azure Core Traits instance. +- An existing Azure Core Traits instance. ## Contributing diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-core-traits/apiview-properties.json index 28fd5efe6dd..3df4c5df9b1 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-traits/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-core-traits/apiview-properties.json @@ -1,11 +1,11 @@ { "CrossLanguagePackageId": "_Specs_.Azure.Core.Traits", "CrossLanguageDefinitionId": { - "specs.azure.core.traits.models.User": "_Specs_.Azure.Core.Traits.User", - "specs.azure.core.traits.models.UserActionParam": "_Specs_.Azure.Core.Traits.UserActionParam", - "specs.azure.core.traits.models.UserActionResponse": "_Specs_.Azure.Core.Traits.UserActionResponse", - "specs.azure.core.traits.models.RepeatabilityResult": "Azure.Core.RepeatabilityResult", - "specs.azure.core.traits.TraitsClient.smoke_test": "_Specs_.Azure.Core.Traits.smokeTest", - "specs.azure.core.traits.TraitsClient.repeatable_action": "_Specs_.Azure.Core.Traits.repeatableAction" + "azure.core.traits.models.User": "_Specs_.Azure.Core.Traits.User", + "azure.core.traits.models.UserActionParam": "_Specs_.Azure.Core.Traits.UserActionParam", + "azure.core.traits.models.UserActionResponse": "_Specs_.Azure.Core.Traits.UserActionResponse", + "azure.core.traits.models.RepeatabilityResult": "Azure.Core.RepeatabilityResult", + "azure.core.traits.TraitsClient.smoke_test": "_Specs_.Azure.Core.Traits.smokeTest", + "azure.core.traits.TraitsClient.repeatable_action": "_Specs_.Azure.Core.Traits.repeatableAction" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_client.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_client.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_configuration.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_configuration.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_configuration.py index a3ff94fcfad..032c3258de3 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_configuration.py @@ -32,7 +32,7 @@ def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> No self.endpoint = endpoint self.api_version = api_version - kwargs.setdefault("sdk_moniker", "specs-azure-core-traits/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "core-traits/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_model_base.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_operations/_operations.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_operations/_operations.py index 80a4a8bbe81..d9f2f18c6cf 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_operations/_operations.py @@ -151,7 +151,7 @@ def smoke_test( :keyword match_condition: The match condition to use upon the etag. Default value is None. :paramtype match_condition: ~azure.core.MatchConditions :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.traits.models.User + :rtype: ~azure.core.traits.models.User :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -231,12 +231,12 @@ def repeatable_action( :param id: The user's id. Required. :type id: int :param body: The body parameter. Required. - :type body: ~specs.azure.core.traits.models.UserActionParam + :type body: ~azure.core.traits.models.UserActionParam :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: UserActionResponse. The UserActionResponse is compatible with MutableMapping - :rtype: ~specs.azure.core.traits.models.UserActionResponse + :rtype: ~azure.core.traits.models.UserActionResponse :raises ~azure.core.exceptions.HttpResponseError: """ @@ -254,7 +254,7 @@ def repeatable_action( Default value is "application/json". :paramtype content_type: str :return: UserActionResponse. The UserActionResponse is compatible with MutableMapping - :rtype: ~specs.azure.core.traits.models.UserActionResponse + :rtype: ~azure.core.traits.models.UserActionResponse :raises ~azure.core.exceptions.HttpResponseError: """ @@ -272,7 +272,7 @@ def repeatable_action( Default value is "application/json". :paramtype content_type: str :return: UserActionResponse. The UserActionResponse is compatible with MutableMapping - :rtype: ~specs.azure.core.traits.models.UserActionResponse + :rtype: ~azure.core.traits.models.UserActionResponse :raises ~azure.core.exceptions.HttpResponseError: """ @@ -286,9 +286,9 @@ def repeatable_action( :type id: int :param body: The body parameter. Is one of the following types: UserActionParam, JSON, IO[bytes] Required. - :type body: ~specs.azure.core.traits.models.UserActionParam or JSON or IO[bytes] + :type body: ~azure.core.traits.models.UserActionParam or JSON or IO[bytes] :return: UserActionResponse. The UserActionResponse is compatible with MutableMapping - :rtype: ~specs.azure.core.traits.models.UserActionResponse + :rtype: ~azure.core.traits.models.UserActionResponse :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_serialization.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_serialization.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_serialization.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_vendor.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_version.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_version.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/_version.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_client.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_client.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_configuration.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/_configuration.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/_configuration.py index d76adae957c..9d64bf25085 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/_configuration.py @@ -32,7 +32,7 @@ def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> No self.endpoint = endpoint self.api_version = api_version - kwargs.setdefault("sdk_moniker", "specs-azure-core-traits/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "core-traits/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/_operations/_operations.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/_operations/_operations.py index b667729bf47..4e7b19df24d 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/_operations/_operations.py @@ -71,7 +71,7 @@ async def smoke_test( :keyword match_condition: The match condition to use upon the etag. Default value is None. :paramtype match_condition: ~azure.core.MatchConditions :return: User. The User is compatible with MutableMapping - :rtype: ~specs.azure.core.traits.models.User + :rtype: ~azure.core.traits.models.User :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { @@ -151,12 +151,12 @@ async def repeatable_action( :param id: The user's id. Required. :type id: int :param body: The body parameter. Required. - :type body: ~specs.azure.core.traits.models.UserActionParam + :type body: ~azure.core.traits.models.UserActionParam :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: UserActionResponse. The UserActionResponse is compatible with MutableMapping - :rtype: ~specs.azure.core.traits.models.UserActionResponse + :rtype: ~azure.core.traits.models.UserActionResponse :raises ~azure.core.exceptions.HttpResponseError: """ @@ -174,7 +174,7 @@ async def repeatable_action( Default value is "application/json". :paramtype content_type: str :return: UserActionResponse. The UserActionResponse is compatible with MutableMapping - :rtype: ~specs.azure.core.traits.models.UserActionResponse + :rtype: ~azure.core.traits.models.UserActionResponse :raises ~azure.core.exceptions.HttpResponseError: """ @@ -192,7 +192,7 @@ async def repeatable_action( Default value is "application/json". :paramtype content_type: str :return: UserActionResponse. The UserActionResponse is compatible with MutableMapping - :rtype: ~specs.azure.core.traits.models.UserActionResponse + :rtype: ~azure.core.traits.models.UserActionResponse :raises ~azure.core.exceptions.HttpResponseError: """ @@ -206,9 +206,9 @@ async def repeatable_action( :type id: int :param body: The body parameter. Is one of the following types: UserActionParam, JSON, IO[bytes] Required. - :type body: ~specs.azure.core.traits.models.UserActionParam or JSON or IO[bytes] + :type body: ~azure.core.traits.models.UserActionParam or JSON or IO[bytes] :return: UserActionResponse. The UserActionResponse is compatible with MutableMapping - :rtype: ~specs.azure.core.traits.models.UserActionResponse + :rtype: ~azure.core.traits.models.UserActionResponse :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_vendor.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/aio/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/models/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/models/__init__.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/models/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/models/_enums.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/models/_enums.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/models/_enums.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/models/_enums.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/models/_models.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/models/_models.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/models/_models.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/models/_models.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/models/_patch.py b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/models/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/models/_patch.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/models/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/py.typed b/packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/py.typed rename to packages/typespec-python/test/azure/generated/azure-core-traits/azure/core/traits/py.typed diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/azure-core-traits/generated_tests/testpreparer.py index 661fdabcd75..b7e82a44b32 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-traits/generated_tests/testpreparer.py +++ b/packages/typespec-python/test/azure/generated/azure-core-traits/generated_tests/testpreparer.py @@ -5,9 +5,9 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.core.traits import TraitsClient from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer import functools -from specs.azure.core.traits import TraitsClient class TraitsClientTestBase(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/azure-core-traits/generated_tests/testpreparer_async.py index ee53fde0dfb..3c278ef5d54 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-traits/generated_tests/testpreparer_async.py +++ b/packages/typespec-python/test/azure/generated/azure-core-traits/generated_tests/testpreparer_async.py @@ -5,8 +5,8 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.core.traits.aio import TraitsClient from devtools_testutils import AzureRecordedTestCase -from specs.azure.core.traits.aio import TraitsClient class TraitsClientTestBaseAsync(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/setup.py b/packages/typespec-python/test/azure/generated/azure-core-traits/setup.py index 7ddf2f23427..48c73096d07 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-traits/setup.py +++ b/packages/typespec-python/test/azure/generated/azure-core-traits/setup.py @@ -12,8 +12,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "specs-azure-core-traits" -PACKAGE_PPRINT_NAME = "Specs Azure Core Traits" +PACKAGE_NAME = "azure-core-traits" +PACKAGE_PPRINT_NAME = "Azure Core Traits" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace("-", "/") @@ -53,14 +53,13 @@ exclude=[ "tests", # Exclude packages that will be covered by PEP420 or nspkg - "specs", - "specs.azure", - "specs.azure.core", + "azure", + "azure.core", ] ), include_package_data=True, package_data={ - "specs.azure.core.traits": ["py.typed"], + "azure.core.traits": ["py.typed"], }, install_requires=[ "isodate>=0.6.1", diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-encode-duration/MANIFEST.in index 863d0757e13..b684bfc3b3e 100644 --- a/packages/typespec-python/test/azure/generated/azure-encode-duration/MANIFEST.in +++ b/packages/typespec-python/test/azure/generated/azure-encode-duration/MANIFEST.in @@ -1,8 +1,7 @@ include *.md include LICENSE -include specs/azure/encode/duration/py.typed +include azure/encode/duration/py.typed recursive-include tests *.py recursive-include samples *.py *.md -include specs/__init__.py -include specs/azure/__init__.py -include specs/azure/encode/__init__.py +include azure/__init__.py +include azure/encode/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/README.md b/packages/typespec-python/test/azure/generated/azure-encode-duration/README.md index e20270b2c42..d9225e6b754 100644 --- a/packages/typespec-python/test/azure/generated/azure-encode-duration/README.md +++ b/packages/typespec-python/test/azure/generated/azure-encode-duration/README.md @@ -1,4 +1,4 @@ -# Specs Azure Encode Duration client library for Python +# Azure Encode Duration client library for Python ## Getting started @@ -6,14 +6,14 @@ ### Install the package ```bash -python -m pip install specs-azure-encode-duration +python -m pip install azure-encode-duration ``` #### Prequisites - Python 3.9 or later is required to use this package. - You need an [Azure subscription][azure_sub] to use this package. -- An existing Specs Azure Encode Duration instance. +- An existing Azure Encode Duration instance. ## Contributing diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-encode-duration/apiview-properties.json index a6e6f7b11e1..a1845dfed9a 100644 --- a/packages/typespec-python/test/azure/generated/azure-encode-duration/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-encode-duration/apiview-properties.json @@ -1,7 +1,7 @@ { "CrossLanguagePackageId": "_Specs_.Azure.Encode.Duration", "CrossLanguageDefinitionId": { - "specs.azure.encode.duration.models.DurationModel": "_Specs_.Azure.Encode.Duration.DurationModel", - "specs.azure.encode.duration.DurationClient.duration_constant": "_Specs_.Azure.Encode.Duration.durationConstant" + "azure.encode.duration.models.DurationModel": "_Specs_.Azure.Encode.Duration.DurationModel", + "azure.encode.duration.DurationClient.duration_constant": "_Specs_.Azure.Encode.Duration.durationConstant" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/__init__.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-page/specs/azure/core/__init__.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/__init__.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/__init__.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/__init__.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/__init__.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_client.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_client.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_configuration.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_configuration.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_configuration.py index 29089b62ca4..c936259f711 100644 --- a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_configuration.py @@ -26,7 +26,7 @@ class DurationClientConfiguration: # pylint: disable=too-many-instance-attribut def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "specs-azure-encode-duration/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "encode-duration/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_model_base.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_operations/_operations.py similarity index 97% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_operations/_operations.py index 903ebaa398c..1ff92392a86 100644 --- a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_operations/_operations.py @@ -59,7 +59,7 @@ def duration_constant( """Test duration with azure specific encoding. :param body: Required. - :type body: ~specs.azure.encode.duration.models.DurationModel + :type body: ~azure.encode.duration.models.DurationModel :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str @@ -103,7 +103,7 @@ def duration_constant( # pylint: disable=inconsistent-return-statements """Test duration with azure specific encoding. :param body: Is one of the following types: DurationModel, JSON, IO[bytes] Required. - :type body: ~specs.azure.encode.duration.models.DurationModel or JSON or IO[bytes] + :type body: ~azure.encode.duration.models.DurationModel or JSON or IO[bytes] :return: None :rtype: None :raises ~azure.core.exceptions.HttpResponseError: diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_patch.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_patch.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_serialization.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_serialization.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_serialization.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_vendor.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_version.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_version.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/_version.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/__init__.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/__init__.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/_client.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/_client.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/_configuration.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/_configuration.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/_configuration.py index 8c21dd16977..aed7771970f 100644 --- a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/_configuration.py @@ -26,7 +26,7 @@ class DurationClientConfiguration: # pylint: disable=too-many-instance-attribut def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "specs-azure-encode-duration/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "encode-duration/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/_operations/_operations.py similarity index 97% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/_operations/_operations.py index 884659100b2..dcb22b676cc 100644 --- a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/_operations/_operations.py @@ -43,7 +43,7 @@ async def duration_constant( """Test duration with azure specific encoding. :param body: Required. - :type body: ~specs.azure.encode.duration.models.DurationModel + :type body: ~azure.encode.duration.models.DurationModel :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str @@ -87,7 +87,7 @@ async def duration_constant(self, body: Union[_models.DurationModel, JSON, IO[by """Test duration with azure specific encoding. :param body: Is one of the following types: DurationModel, JSON, IO[bytes] Required. - :type body: ~specs.azure.encode.duration.models.DurationModel or JSON or IO[bytes] + :type body: ~azure.encode.duration.models.DurationModel or JSON or IO[bytes] :return: None :rtype: None :raises ~azure.core.exceptions.HttpResponseError: diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/_patch.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/_patch.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/_vendor.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/aio/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/aio/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/models/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/models/__init__.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/models/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/models/_models.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/models/_models.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/duration/models/_models.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/models/_models.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/models/_patch.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/models/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/models/_patch.py rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/models/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/py.typed b/packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/py.typed rename to packages/typespec-python/test/azure/generated/azure-encode-duration/azure/encode/duration/py.typed diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/generated_tests/testpreparer.py index 5182f3adebc..428595a8079 100644 --- a/packages/typespec-python/test/azure/generated/azure-encode-duration/generated_tests/testpreparer.py +++ b/packages/typespec-python/test/azure/generated/azure-encode-duration/generated_tests/testpreparer.py @@ -5,9 +5,9 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.encode.duration import DurationClient from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer import functools -from specs.azure.encode.duration import DurationClient class DurationClientTestBase(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/generated_tests/testpreparer_async.py index 8d38c5e2b40..c6253522ecd 100644 --- a/packages/typespec-python/test/azure/generated/azure-encode-duration/generated_tests/testpreparer_async.py +++ b/packages/typespec-python/test/azure/generated/azure-encode-duration/generated_tests/testpreparer_async.py @@ -5,8 +5,8 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.encode.duration.aio import DurationClient from devtools_testutils import AzureRecordedTestCase -from specs.azure.encode.duration.aio import DurationClient class DurationClientTestBaseAsync(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/setup.py b/packages/typespec-python/test/azure/generated/azure-encode-duration/setup.py index ce9e98b1c8a..f141d1f497b 100644 --- a/packages/typespec-python/test/azure/generated/azure-encode-duration/setup.py +++ b/packages/typespec-python/test/azure/generated/azure-encode-duration/setup.py @@ -12,8 +12,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "specs-azure-encode-duration" -PACKAGE_PPRINT_NAME = "Specs Azure Encode Duration" +PACKAGE_NAME = "azure-encode-duration" +PACKAGE_PPRINT_NAME = "Azure Encode Duration" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace("-", "/") @@ -53,14 +53,13 @@ exclude=[ "tests", # Exclude packages that will be covered by PEP420 or nspkg - "specs", - "specs.azure", - "specs.azure.encode", + "azure", + "azure.encode", ] ), include_package_data=True, package_data={ - "specs.azure.encode.duration": ["py.typed"], + "azure.encode.duration": ["py.typed"], }, install_requires=[ "isodate>=0.6.1", diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-example-basic/MANIFEST.in index e0a4f8f51dd..8fd28629208 100644 --- a/packages/typespec-python/test/azure/generated/azure-example-basic/MANIFEST.in +++ b/packages/typespec-python/test/azure/generated/azure-example-basic/MANIFEST.in @@ -1,8 +1,7 @@ include *.md include LICENSE -include specs/azure/example/basic/py.typed +include azure/example/basic/py.typed recursive-include tests *.py recursive-include samples *.py *.md -include specs/__init__.py -include specs/azure/__init__.py -include specs/azure/example/__init__.py +include azure/__init__.py +include azure/example/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/README.md b/packages/typespec-python/test/azure/generated/azure-example-basic/README.md index e652987f30e..4b7bb1e38f7 100644 --- a/packages/typespec-python/test/azure/generated/azure-example-basic/README.md +++ b/packages/typespec-python/test/azure/generated/azure-example-basic/README.md @@ -1,4 +1,4 @@ -# Specs Azure Example Basic client library for Python +# Azure Example Basic client library for Python ## Getting started @@ -6,14 +6,14 @@ ### Install the package ```bash -python -m pip install specs-azure-example-basic +python -m pip install azure-example-basic ``` #### Prequisites - Python 3.9 or later is required to use this package. - You need an [Azure subscription][azure_sub] to use this package. -- An existing Specs Azure Example Basic instance. +- An existing Azure Example Basic instance. ## Contributing diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-example-basic/apiview-properties.json index c2aa7467184..2024f60fc7c 100644 --- a/packages/typespec-python/test/azure/generated/azure-example-basic/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-example-basic/apiview-properties.json @@ -1,10 +1,10 @@ { "CrossLanguagePackageId": "_Specs_.Azure.Example.Basic", "CrossLanguageDefinitionId": { - "specs.azure.example.basic.models.ActionRequest": "_Specs_.Azure.Example.Basic.ActionRequest", - "specs.azure.example.basic.models.ActionResponse": "_Specs_.Azure.Example.Basic.ActionResponse", - "specs.azure.example.basic.models.Model": "_Specs_.Azure.Example.Basic.Model", - "specs.azure.example.basic.models.EnumEnum": "_Specs_.Azure.Example.Basic.Enum", - "specs.azure.example.basic.AzureExampleClient.basic_action": "AzureExampleBasicClient.AzureExampleClient.basicAction" + "azure.example.basic.models.ActionRequest": "_Specs_.Azure.Example.Basic.ActionRequest", + "azure.example.basic.models.ActionResponse": "_Specs_.Azure.Example.Basic.ActionResponse", + "azure.example.basic.models.Model": "_Specs_.Azure.Example.Basic.Model", + "azure.example.basic.models.EnumEnum": "_Specs_.Azure.Example.Basic.Enum", + "azure.example.basic.AzureExampleClient.basic_action": "AzureExampleBasicClient.AzureExampleClient.basicAction" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/__init__.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/__init__.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/__init__.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/__init__.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/__init__.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/__init__.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_client.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_client.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_configuration.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_configuration.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_configuration.py index 14df3fdec52..8b7ac5a9139 100644 --- a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_configuration.py @@ -32,7 +32,7 @@ def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> No self.endpoint = endpoint self.api_version = api_version - kwargs.setdefault("sdk_moniker", "specs-azure-example-basic/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "example-basic/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_model_base.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_operations/_operations.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_operations/_operations.py index 0ed1589df28..ec46d7380ba 100644 --- a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_operations/_operations.py @@ -77,7 +77,7 @@ def basic_action( """basic_action. :param body: Required. - :type body: ~specs.azure.example.basic.models.ActionRequest + :type body: ~azure.example.basic.models.ActionRequest :keyword query_param: Required. :paramtype query_param: str :keyword header_param: Required. @@ -86,7 +86,7 @@ def basic_action( Default value is "application/json". :paramtype content_type: str :return: ActionResponse. The ActionResponse is compatible with MutableMapping - :rtype: ~specs.azure.example.basic.models.ActionResponse + :rtype: ~azure.example.basic.models.ActionResponse :raises ~azure.core.exceptions.HttpResponseError: """ @@ -106,7 +106,7 @@ def basic_action( Default value is "application/json". :paramtype content_type: str :return: ActionResponse. The ActionResponse is compatible with MutableMapping - :rtype: ~specs.azure.example.basic.models.ActionResponse + :rtype: ~azure.example.basic.models.ActionResponse :raises ~azure.core.exceptions.HttpResponseError: """ @@ -132,7 +132,7 @@ def basic_action( Default value is "application/json". :paramtype content_type: str :return: ActionResponse. The ActionResponse is compatible with MutableMapping - :rtype: ~specs.azure.example.basic.models.ActionResponse + :rtype: ~azure.example.basic.models.ActionResponse :raises ~azure.core.exceptions.HttpResponseError: """ @@ -143,13 +143,13 @@ def basic_action( """basic_action. :param body: Is one of the following types: ActionRequest, JSON, IO[bytes] Required. - :type body: ~specs.azure.example.basic.models.ActionRequest or JSON or IO[bytes] + :type body: ~azure.example.basic.models.ActionRequest or JSON or IO[bytes] :keyword query_param: Required. :paramtype query_param: str :keyword header_param: Required. :paramtype header_param: str :return: ActionResponse. The ActionResponse is compatible with MutableMapping - :rtype: ~specs.azure.example.basic.models.ActionResponse + :rtype: ~azure.example.basic.models.ActionResponse :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_patch.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_patch.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_serialization.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_serialization.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_serialization.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_serialization.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_vendor.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_version.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_version.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_version.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/_version.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/__init__.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/__init__.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/_client.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/_client.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/_configuration.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/_configuration.py similarity index 96% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/_configuration.py index b851be5e7f1..d9095ae45e8 100644 --- a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/_configuration.py @@ -32,7 +32,7 @@ def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> No self.endpoint = endpoint self.api_version = api_version - kwargs.setdefault("sdk_moniker", "specs-azure-example-basic/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "example-basic/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/_operations/_operations.py similarity index 94% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/_operations/_operations.py index 7bc0884cec8..7e65550409d 100644 --- a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/_operations/_operations.py @@ -51,7 +51,7 @@ async def basic_action( """basic_action. :param body: Required. - :type body: ~specs.azure.example.basic.models.ActionRequest + :type body: ~azure.example.basic.models.ActionRequest :keyword query_param: Required. :paramtype query_param: str :keyword header_param: Required. @@ -60,7 +60,7 @@ async def basic_action( Default value is "application/json". :paramtype content_type: str :return: ActionResponse. The ActionResponse is compatible with MutableMapping - :rtype: ~specs.azure.example.basic.models.ActionResponse + :rtype: ~azure.example.basic.models.ActionResponse :raises ~azure.core.exceptions.HttpResponseError: """ @@ -80,7 +80,7 @@ async def basic_action( Default value is "application/json". :paramtype content_type: str :return: ActionResponse. The ActionResponse is compatible with MutableMapping - :rtype: ~specs.azure.example.basic.models.ActionResponse + :rtype: ~azure.example.basic.models.ActionResponse :raises ~azure.core.exceptions.HttpResponseError: """ @@ -106,7 +106,7 @@ async def basic_action( Default value is "application/json". :paramtype content_type: str :return: ActionResponse. The ActionResponse is compatible with MutableMapping - :rtype: ~specs.azure.example.basic.models.ActionResponse + :rtype: ~azure.example.basic.models.ActionResponse :raises ~azure.core.exceptions.HttpResponseError: """ @@ -117,13 +117,13 @@ async def basic_action( """basic_action. :param body: Is one of the following types: ActionRequest, JSON, IO[bytes] Required. - :type body: ~specs.azure.example.basic.models.ActionRequest or JSON or IO[bytes] + :type body: ~azure.example.basic.models.ActionRequest or JSON or IO[bytes] :keyword query_param: Required. :paramtype query_param: str :keyword header_param: Required. :paramtype header_param: str :return: ActionResponse. The ActionResponse is compatible with MutableMapping - :rtype: ~specs.azure.example.basic.models.ActionResponse + :rtype: ~azure.example.basic.models.ActionResponse :raises ~azure.core.exceptions.HttpResponseError: """ error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/_operations/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/_operations/_patch.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/_operations/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/_patch.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/_patch.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/_vendor.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/aio/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/aio/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/models/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/models/__init__.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/models/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/models/_enums.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/models/_enums.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/models/_enums.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/models/_enums.py diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/models/_models.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/models/_models.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/models/_models.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/models/_models.py index 37203ba9955..90db7b59fc6 100644 --- a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/basic/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/models/_models.py @@ -22,7 +22,7 @@ class ActionRequest(_model_base.Model): :ivar string_property: Required. :vartype string_property: str :ivar model_property: - :vartype model_property: ~specs.azure.example.basic.models.Model + :vartype model_property: ~azure.example.basic.models.Model :ivar array_property: :vartype array_property: list[str] :ivar record_property: @@ -68,7 +68,7 @@ class ActionResponse(_model_base.Model): :ivar string_property: Required. :vartype string_property: str :ivar model_property: - :vartype model_property: ~specs.azure.example.basic.models.Model + :vartype model_property: ~azure.example.basic.models.Model :ivar array_property: :vartype array_property: list[str] :ivar record_property: @@ -116,7 +116,7 @@ class Model(_model_base.Model): :ivar float32_property: :vartype float32_property: float :ivar enum_property: "EnumValue1" - :vartype enum_property: str or ~specs.azure.example.basic.models.EnumEnum + :vartype enum_property: str or ~azure.example.basic.models.EnumEnum """ int32_property: Optional[int] = rest_field( diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/models/_patch.py b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/models/_patch.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/models/_patch.py rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/models/_patch.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/py.typed b/packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/py.typed similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/py.typed rename to packages/typespec-python/test/azure/generated/azure-example-basic/azure/example/basic/py.typed diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/generated_samples/basic.py b/packages/typespec-python/test/azure/generated/azure-example-basic/generated_samples/basic.py index 8fc73742343..84849f0dee2 100644 --- a/packages/typespec-python/test/azure/generated/azure-example-basic/generated_samples/basic.py +++ b/packages/typespec-python/test/azure/generated/azure-example-basic/generated_samples/basic.py @@ -6,11 +6,11 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from specs.azure.example.basic import AzureExampleClient +from azure.example.basic import AzureExampleClient """ # PREREQUISITES - pip install specs-azure-example-basic + pip install azure-example-basic # USAGE python basic.py """ diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/azure-example-basic/generated_tests/testpreparer.py index 6039e937d65..2aad82cf867 100644 --- a/packages/typespec-python/test/azure/generated/azure-example-basic/generated_tests/testpreparer.py +++ b/packages/typespec-python/test/azure/generated/azure-example-basic/generated_tests/testpreparer.py @@ -5,9 +5,9 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.example.basic import AzureExampleClient from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer import functools -from specs.azure.example.basic import AzureExampleClient class AzureExampleClientTestBase(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/azure-example-basic/generated_tests/testpreparer_async.py index 64243921636..dff38a32972 100644 --- a/packages/typespec-python/test/azure/generated/azure-example-basic/generated_tests/testpreparer_async.py +++ b/packages/typespec-python/test/azure/generated/azure-example-basic/generated_tests/testpreparer_async.py @@ -5,8 +5,8 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.example.basic.aio import AzureExampleClient from devtools_testutils import AzureRecordedTestCase -from specs.azure.example.basic.aio import AzureExampleClient class AzureExampleClientTestBaseAsync(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/setup.py b/packages/typespec-python/test/azure/generated/azure-example-basic/setup.py index 5a372bde4b0..43ed7873a3e 100644 --- a/packages/typespec-python/test/azure/generated/azure-example-basic/setup.py +++ b/packages/typespec-python/test/azure/generated/azure-example-basic/setup.py @@ -12,8 +12,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "specs-azure-example-basic" -PACKAGE_PPRINT_NAME = "Specs Azure Example Basic" +PACKAGE_NAME = "azure-example-basic" +PACKAGE_PPRINT_NAME = "Azure Example Basic" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace("-", "/") @@ -53,14 +53,13 @@ exclude=[ "tests", # Exclude packages that will be covered by PEP420 or nspkg - "specs", - "specs.azure", - "specs.azure.example", + "azure", + "azure.example", ] ), include_package_data=True, package_data={ - "specs.azure.example.basic": ["py.typed"], + "azure.example.basic": ["py.typed"], }, install_requires=[ "isodate>=0.6.1", diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/__init__.py b/packages/typespec-python/test/azure/generated/azure-example-basic/specs/__init__.py deleted file mode 100644 index d55ccad1f57..00000000000 --- a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/__init__.py b/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/__init__.py deleted file mode 100644 index d55ccad1f57..00000000000 --- a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/__init__.py b/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/__init__.py deleted file mode 100644 index d55ccad1f57..00000000000 --- a/packages/typespec-python/test/azure/generated/azure-example-basic/specs/azure/example/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/MANIFEST.in b/packages/typespec-python/test/azure/generated/azure-payload-pageable/MANIFEST.in index fd0f30e0133..f1220e674ba 100644 --- a/packages/typespec-python/test/azure/generated/azure-payload-pageable/MANIFEST.in +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/MANIFEST.in @@ -1,8 +1,7 @@ include *.md include LICENSE -include specs/azure/payload/pageable/py.typed +include azure/payload/pageable/py.typed recursive-include tests *.py recursive-include samples *.py *.md -include specs/__init__.py -include specs/azure/__init__.py -include specs/azure/payload/__init__.py +include azure/__init__.py +include azure/payload/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/README.md b/packages/typespec-python/test/azure/generated/azure-payload-pageable/README.md index a7a754d8fb8..07666fc5ca6 100644 --- a/packages/typespec-python/test/azure/generated/azure-payload-pageable/README.md +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/README.md @@ -1,4 +1,4 @@ -# Specs Azure Payload Pageable client library for Python +# Azure Payload Pageable client library for Python ## Getting started @@ -6,14 +6,14 @@ ### Install the package ```bash -python -m pip install specs-azure-payload-pageable +python -m pip install azure-payload-pageable ``` #### Prequisites - Python 3.9 or later is required to use this package. - You need an [Azure subscription][azure_sub] to use this package. -- An existing Specs Azure Payload Pageable instance. +- An existing Azure Payload Pageable instance. ## Contributing diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-payload-pageable/apiview-properties.json index 7ac797d227a..83d36475574 100644 --- a/packages/typespec-python/test/azure/generated/azure-payload-pageable/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/apiview-properties.json @@ -1,7 +1,7 @@ { "CrossLanguagePackageId": "_Specs_.Azure.Payload.Pageable", "CrossLanguageDefinitionId": { - "specs.azure.payload.pageable.models.User": "_Specs_.Azure.Payload.Pageable.User", - "specs.azure.payload.pageable.PageableClient.list": "_Specs_.Azure.Payload.Pageable.list" + "azure.payload.pageable.models.User": "_Specs_.Azure.Payload.Pageable.User", + "azure.payload.pageable.PageableClient.list": "_Specs_.Azure.Payload.Pageable.list" } } \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/__init__.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/__init__.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/__init__.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/__init__.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/__init__.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/__init__.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_client.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_client.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_configuration.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_configuration.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_configuration.py index 294df64cf30..fcbba4cf876 100644 --- a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_configuration.py @@ -26,7 +26,7 @@ class PageableClientConfiguration: # pylint: disable=too-many-instance-attribut def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "specs-azure-payload-pageable/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "payload-pageable/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_model_base.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_model_base.py new file mode 100644 index 00000000000..49d5c725938 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_model_base.py @@ -0,0 +1,1232 @@ +# pylint: disable=too-many-lines +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +# pylint: disable=protected-access, broad-except + +import copy +import calendar +import decimal +import functools +import sys +import logging +import base64 +import re +import typing +import enum +import email.utils +from datetime import datetime, date, time, timedelta, timezone +from json import JSONEncoder +import xml.etree.ElementTree as ET +from collections.abc import MutableMapping +from typing_extensions import Self +import isodate +from azure.core.exceptions import DeserializationError +from azure.core import CaseInsensitiveEnumMeta +from azure.core.pipeline import PipelineResponse +from azure.core.serialization import _Null + +_LOGGER = logging.getLogger(__name__) + +__all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"] + +TZ_UTC = timezone.utc +_T = typing.TypeVar("_T") + + +def _timedelta_as_isostr(td: timedelta) -> str: + """Converts a datetime.timedelta object into an ISO 8601 formatted string, e.g. 'P4DT12H30M05S' + + Function adapted from the Tin Can Python project: https://github.com/RusticiSoftware/TinCanPython + + :param timedelta td: The timedelta to convert + :rtype: str + :return: ISO8601 version of this timedelta + """ + + # Split seconds to larger units + seconds = td.total_seconds() + minutes, seconds = divmod(seconds, 60) + hours, minutes = divmod(minutes, 60) + days, hours = divmod(hours, 24) + + days, hours, minutes = list(map(int, (days, hours, minutes))) + seconds = round(seconds, 6) + + # Build date + date_str = "" + if days: + date_str = "%sD" % days + + if hours or minutes or seconds: + # Build time + time_str = "T" + + # Hours + bigger_exists = date_str or hours + if bigger_exists: + time_str += "{:02}H".format(hours) + + # Minutes + bigger_exists = bigger_exists or minutes + if bigger_exists: + time_str += "{:02}M".format(minutes) + + # Seconds + try: + if seconds.is_integer(): + seconds_string = "{:02}".format(int(seconds)) + else: + # 9 chars long w/ leading 0, 6 digits after decimal + seconds_string = "%09.6f" % seconds + # Remove trailing zeros + seconds_string = seconds_string.rstrip("0") + except AttributeError: # int.is_integer() raises + seconds_string = "{:02}".format(seconds) + + time_str += "{}S".format(seconds_string) + else: + time_str = "" + + return "P" + date_str + time_str + + +def _serialize_bytes(o, format: typing.Optional[str] = None) -> str: + encoded = base64.b64encode(o).decode() + if format == "base64url": + return encoded.strip("=").replace("+", "-").replace("/", "_") + return encoded + + +def _serialize_datetime(o, format: typing.Optional[str] = None): + if hasattr(o, "year") and hasattr(o, "hour"): + if format == "rfc7231": + return email.utils.format_datetime(o, usegmt=True) + if format == "unix-timestamp": + return int(calendar.timegm(o.utctimetuple())) + + # astimezone() fails for naive times in Python 2.7, so make make sure o is aware (tzinfo is set) + if not o.tzinfo: + iso_formatted = o.replace(tzinfo=TZ_UTC).isoformat() + else: + iso_formatted = o.astimezone(TZ_UTC).isoformat() + # Replace the trailing "+00:00" UTC offset with "Z" (RFC 3339: https://www.ietf.org/rfc/rfc3339.txt) + return iso_formatted.replace("+00:00", "Z") + # Next try datetime.date or datetime.time + return o.isoformat() + + +def _is_readonly(p): + try: + return p._visibility == ["read"] + except AttributeError: + return False + + +class SdkJSONEncoder(JSONEncoder): + """A JSON encoder that's capable of serializing datetime objects and bytes.""" + + def __init__(self, *args, exclude_readonly: bool = False, format: typing.Optional[str] = None, **kwargs): + super().__init__(*args, **kwargs) + self.exclude_readonly = exclude_readonly + self.format = format + + def default(self, o): # pylint: disable=too-many-return-statements + if _is_model(o): + if self.exclude_readonly: + readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)] + return {k: v for k, v in o.items() if k not in readonly_props} + return dict(o.items()) + try: + return super(SdkJSONEncoder, self).default(o) + except TypeError: + if isinstance(o, _Null): + return None + if isinstance(o, decimal.Decimal): + return float(o) + if isinstance(o, (bytes, bytearray)): + return _serialize_bytes(o, self.format) + try: + # First try datetime.datetime + return _serialize_datetime(o, self.format) + except AttributeError: + pass + # Last, try datetime.timedelta + try: + return _timedelta_as_isostr(o) + except AttributeError: + # This will be raised when it hits value.total_seconds in the method above + pass + return super(SdkJSONEncoder, self).default(o) + + +_VALID_DATE = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" + r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") +_VALID_RFC7231 = re.compile( + r"(Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s\d{2}\s" + r"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d{4}\s\d{2}:\d{2}:\d{2}\sGMT" +) + + +def _deserialize_datetime(attr: typing.Union[str, datetime]) -> datetime: + """Deserialize ISO-8601 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :rtype: ~datetime.datetime + :returns: The datetime object from that input + """ + if isinstance(attr, datetime): + # i'm already deserialized + return attr + attr = attr.upper() + match = _VALID_DATE.match(attr) + if not match: + raise ValueError("Invalid datetime string: " + attr) + + check_decimal = attr.split(".") + if len(check_decimal) > 1: + decimal_str = "" + for digit in check_decimal[1]: + if digit.isdigit(): + decimal_str += digit + else: + break + if len(decimal_str) > 6: + attr = attr.replace(decimal_str, decimal_str[0:6]) + + date_obj = isodate.parse_datetime(attr) + test_utc = date_obj.utctimetuple() + if test_utc.tm_year > 9999 or test_utc.tm_year < 1: + raise OverflowError("Hit max or min date") + return date_obj + + +def _deserialize_datetime_rfc7231(attr: typing.Union[str, datetime]) -> datetime: + """Deserialize RFC7231 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :rtype: ~datetime.datetime + :returns: The datetime object from that input + """ + if isinstance(attr, datetime): + # i'm already deserialized + return attr + match = _VALID_RFC7231.match(attr) + if not match: + raise ValueError("Invalid datetime string: " + attr) + + return email.utils.parsedate_to_datetime(attr) + + +def _deserialize_datetime_unix_timestamp(attr: typing.Union[float, datetime]) -> datetime: + """Deserialize unix timestamp into Datetime object. + + :param str attr: response string to be deserialized. + :rtype: ~datetime.datetime + :returns: The datetime object from that input + """ + if isinstance(attr, datetime): + # i'm already deserialized + return attr + return datetime.fromtimestamp(attr, TZ_UTC) + + +def _deserialize_date(attr: typing.Union[str, date]) -> date: + """Deserialize ISO-8601 formatted string into Date object. + :param str attr: response string to be deserialized. + :rtype: date + :returns: The date object from that input + """ + # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. + if isinstance(attr, date): + return attr + return isodate.parse_date(attr, defaultmonth=None, defaultday=None) # type: ignore + + +def _deserialize_time(attr: typing.Union[str, time]) -> time: + """Deserialize ISO-8601 formatted string into time object. + + :param str attr: response string to be deserialized. + :rtype: datetime.time + :returns: The time object from that input + """ + if isinstance(attr, time): + return attr + return isodate.parse_time(attr) + + +def _deserialize_bytes(attr): + if isinstance(attr, (bytes, bytearray)): + return attr + return bytes(base64.b64decode(attr)) + + +def _deserialize_bytes_base64(attr): + if isinstance(attr, (bytes, bytearray)): + return attr + padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore + attr = attr + padding # type: ignore + encoded = attr.replace("-", "+").replace("_", "/") + return bytes(base64.b64decode(encoded)) + + +def _deserialize_duration(attr): + if isinstance(attr, timedelta): + return attr + return isodate.parse_duration(attr) + + +def _deserialize_decimal(attr): + if isinstance(attr, decimal.Decimal): + return attr + return decimal.Decimal(str(attr)) + + +def _deserialize_int_as_str(attr): + if isinstance(attr, int): + return attr + return int(attr) + + +_DESERIALIZE_MAPPING = { + datetime: _deserialize_datetime, + date: _deserialize_date, + time: _deserialize_time, + bytes: _deserialize_bytes, + bytearray: _deserialize_bytes, + timedelta: _deserialize_duration, + typing.Any: lambda x: x, + decimal.Decimal: _deserialize_decimal, +} + +_DESERIALIZE_MAPPING_WITHFORMAT = { + "rfc3339": _deserialize_datetime, + "rfc7231": _deserialize_datetime_rfc7231, + "unix-timestamp": _deserialize_datetime_unix_timestamp, + "base64": _deserialize_bytes, + "base64url": _deserialize_bytes_base64, +} + + +def get_deserializer(annotation: typing.Any, rf: typing.Optional["_RestField"] = None): + if annotation is int and rf and rf._format == "str": + return _deserialize_int_as_str + if rf and rf._format: + return _DESERIALIZE_MAPPING_WITHFORMAT.get(rf._format) + return _DESERIALIZE_MAPPING.get(annotation) # pyright: ignore + + +def _get_type_alias_type(module_name: str, alias_name: str): + types = { + k: v + for k, v in sys.modules[module_name].__dict__.items() + if isinstance(v, typing._GenericAlias) # type: ignore + } + if alias_name not in types: + return alias_name + return types[alias_name] + + +def _get_model(module_name: str, model_name: str): + models = {k: v for k, v in sys.modules[module_name].__dict__.items() if isinstance(v, type)} + module_end = module_name.rsplit(".", 1)[0] + models.update({k: v for k, v in sys.modules[module_end].__dict__.items() if isinstance(v, type)}) + if isinstance(model_name, str): + model_name = model_name.split(".")[-1] + if model_name not in models: + return model_name + return models[model_name] + + +_UNSET = object() + + +class _MyMutableMapping(MutableMapping[str, typing.Any]): + def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + self._data = data + + def __contains__(self, key: typing.Any) -> bool: + return key in self._data + + def __getitem__(self, key: str) -> typing.Any: + return self._data.__getitem__(key) + + def __setitem__(self, key: str, value: typing.Any) -> None: + self._data.__setitem__(key, value) + + def __delitem__(self, key: str) -> None: + self._data.__delitem__(key) + + def __iter__(self) -> typing.Iterator[typing.Any]: + return self._data.__iter__() + + def __len__(self) -> int: + return self._data.__len__() + + def __ne__(self, other: typing.Any) -> bool: + return not self.__eq__(other) + + def keys(self) -> typing.KeysView[str]: + """ + :returns: a set-like object providing a view on D's keys + :rtype: ~typing.KeysView + """ + return self._data.keys() + + def values(self) -> typing.ValuesView[typing.Any]: + """ + :returns: an object providing a view on D's values + :rtype: ~typing.ValuesView + """ + return self._data.values() + + def items(self) -> typing.ItemsView[str, typing.Any]: + """ + :returns: set-like object providing a view on D's items + :rtype: ~typing.ItemsView + """ + return self._data.items() + + def get(self, key: str, default: typing.Any = None) -> typing.Any: + """ + Get the value for key if key is in the dictionary, else default. + :param str key: The key to look up. + :param any default: The value to return if key is not in the dictionary. Defaults to None + :returns: D[k] if k in D, else d. + :rtype: any + """ + try: + return self[key] + except KeyError: + return default + + @typing.overload + def pop(self, key: str) -> typing.Any: ... # pylint: disable=arguments-differ + + @typing.overload + def pop(self, key: str, default: _T) -> _T: ... # pylint: disable=signature-differs + + @typing.overload + def pop(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs + + def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: + """ + Removes specified key and return the corresponding value. + :param str key: The key to pop. + :param any default: The value to return if key is not in the dictionary + :returns: The value corresponding to the key. + :rtype: any + :raises KeyError: If key is not found and default is not given. + """ + if default is _UNSET: + return self._data.pop(key) + return self._data.pop(key, default) + + def popitem(self) -> typing.Tuple[str, typing.Any]: + """ + Removes and returns some (key, value) pair + :returns: The (key, value) pair. + :rtype: tuple + :raises KeyError: if D is empty. + """ + return self._data.popitem() + + def clear(self) -> None: + """ + Remove all items from D. + """ + self._data.clear() + + def update(self, *args: typing.Any, **kwargs: typing.Any) -> None: # pylint: disable=arguments-differ + """ + Updates D from mapping/iterable E and F. + :param any args: Either a mapping object or an iterable of key-value pairs. + """ + self._data.update(*args, **kwargs) + + @typing.overload + def setdefault(self, key: str, default: None = None) -> None: ... + + @typing.overload + def setdefault(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs + + def setdefault(self, key: str, default: typing.Any = _UNSET) -> typing.Any: + """ + Same as calling D.get(k, d), and setting D[k]=d if k not found + :param str key: The key to look up. + :param any default: The value to set if key is not in the dictionary + :returns: D[k] if k in D, else d. + :rtype: any + """ + if default is _UNSET: + return self._data.setdefault(key) + return self._data.setdefault(key, default) + + def __eq__(self, other: typing.Any) -> bool: + try: + other_model = self.__class__(other) + except Exception: + return False + return self._data == other_model._data + + def __repr__(self) -> str: + return str(self._data) + + +def _is_model(obj: typing.Any) -> bool: + return getattr(obj, "_is_model", False) + + +def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-many-return-statements + if isinstance(o, list): + return [_serialize(x, format) for x in o] + if isinstance(o, dict): + return {k: _serialize(v, format) for k, v in o.items()} + if isinstance(o, set): + return {_serialize(x, format) for x in o} + if isinstance(o, tuple): + return tuple(_serialize(x, format) for x in o) + if isinstance(o, (bytes, bytearray)): + return _serialize_bytes(o, format) + if isinstance(o, decimal.Decimal): + return float(o) + if isinstance(o, enum.Enum): + return o.value + if isinstance(o, int): + if format == "str": + return str(o) + return o + try: + # First try datetime.datetime + return _serialize_datetime(o, format) + except AttributeError: + pass + # Last, try datetime.timedelta + try: + return _timedelta_as_isostr(o) + except AttributeError: + # This will be raised when it hits value.total_seconds in the method above + pass + return o + + +def _get_rest_field( + attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str +) -> typing.Optional["_RestField"]: + try: + return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) + except StopIteration: + return None + + +def _create_value(rf: typing.Optional["_RestField"], value: typing.Any) -> typing.Any: + if not rf: + return _serialize(value, None) + if rf._is_multipart_file_input: + return value + if rf._is_model: + return _deserialize(rf._type, value) + if isinstance(value, ET.Element): + value = _deserialize(rf._type, value) + return _serialize(value, rf._format) + + +class Model(_MyMutableMapping): + _is_model = True + # label whether current class's _attr_to_rest_field has been calculated + # could not see _attr_to_rest_field directly because subclass inherits it from parent class + _calculated: typing.Set[str] = set() + + def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: + class_name = self.__class__.__name__ + if len(args) > 1: + raise TypeError(f"{class_name}.__init__() takes 2 positional arguments but {len(args) + 1} were given") + dict_to_pass = { + rest_field._rest_name: rest_field._default + for rest_field in self._attr_to_rest_field.values() + if rest_field._default is not _UNSET + } + if args: # pylint: disable=too-many-nested-blocks + if isinstance(args[0], ET.Element): + existed_attr_keys = [] + model_meta = getattr(self, "_xml", {}) + + for rf in self._attr_to_rest_field.values(): + prop_meta = getattr(rf, "_xml", {}) + xml_name = prop_meta.get("name", rf._rest_name) + xml_ns = prop_meta.get("ns", model_meta.get("ns", None)) + if xml_ns: + xml_name = "{" + xml_ns + "}" + xml_name + + # attribute + if prop_meta.get("attribute", False) and args[0].get(xml_name) is not None: + existed_attr_keys.append(xml_name) + dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].get(xml_name)) + continue + + # unwrapped element is array + if prop_meta.get("unwrapped", False): + # unwrapped array could either use prop items meta/prop meta + if prop_meta.get("itemsName"): + xml_name = prop_meta.get("itemsName") + xml_ns = prop_meta.get("itemNs") + if xml_ns: + xml_name = "{" + xml_ns + "}" + xml_name + items = args[0].findall(xml_name) # pyright: ignore + if len(items) > 0: + existed_attr_keys.append(xml_name) + dict_to_pass[rf._rest_name] = _deserialize(rf._type, items) + continue + + # text element is primitive type + if prop_meta.get("text", False): + if args[0].text is not None: + dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].text) + continue + + # wrapped element could be normal property or array, it should only have one element + item = args[0].find(xml_name) + if item is not None: + existed_attr_keys.append(xml_name) + dict_to_pass[rf._rest_name] = _deserialize(rf._type, item) + + # rest thing is additional properties + for e in args[0]: + if e.tag not in existed_attr_keys: + dict_to_pass[e.tag] = _convert_element(e) + else: + dict_to_pass.update( + {k: _create_value(_get_rest_field(self._attr_to_rest_field, k), v) for k, v in args[0].items()} + ) + else: + non_attr_kwargs = [k for k in kwargs if k not in self._attr_to_rest_field] + if non_attr_kwargs: + # actual type errors only throw the first wrong keyword arg they see, so following that. + raise TypeError(f"{class_name}.__init__() got an unexpected keyword argument '{non_attr_kwargs[0]}'") + dict_to_pass.update( + { + self._attr_to_rest_field[k]._rest_name: _create_value(self._attr_to_rest_field[k], v) + for k, v in kwargs.items() + if v is not None + } + ) + super().__init__(dict_to_pass) + + def copy(self) -> "Model": + return Model(self.__dict__) + + def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: + if f"{cls.__module__}.{cls.__qualname__}" not in cls._calculated: + # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', + # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' + mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order + attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") + } + annotations = { + k: v + for mro_class in mros + if hasattr(mro_class, "__annotations__") + for k, v in mro_class.__annotations__.items() + } + for attr, rf in attr_to_rest_field.items(): + rf._module = cls.__module__ + if not rf._type: + rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) + if not rf._rest_name_input: + rf._rest_name_input = attr + cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") + + return super().__new__(cls) + + def __init_subclass__(cls, discriminator: typing.Optional[str] = None) -> None: + for base in cls.__bases__: + if hasattr(base, "__mapping__"): + base.__mapping__[discriminator or cls.__name__] = cls # type: ignore + + @classmethod + def _get_discriminator(cls, exist_discriminators) -> typing.Optional["_RestField"]: + for v in cls.__dict__.values(): + if isinstance(v, _RestField) and v._is_discriminator and v._rest_name not in exist_discriminators: + return v + return None + + @classmethod + def _deserialize(cls, data, exist_discriminators): + if not hasattr(cls, "__mapping__"): + return cls(data) + discriminator = cls._get_discriminator(exist_discriminators) + if discriminator is None: + return cls(data) + exist_discriminators.append(discriminator._rest_name) + if isinstance(data, ET.Element): + model_meta = getattr(cls, "_xml", {}) + prop_meta = getattr(discriminator, "_xml", {}) + xml_name = prop_meta.get("name", discriminator._rest_name) + xml_ns = prop_meta.get("ns", model_meta.get("ns", None)) + if xml_ns: + xml_name = "{" + xml_ns + "}" + xml_name + + if data.get(xml_name) is not None: + discriminator_value = data.get(xml_name) + else: + discriminator_value = data.find(xml_name).text # pyright: ignore + else: + discriminator_value = data.get(discriminator._rest_name) + mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member + return mapped_cls._deserialize(data, exist_discriminators) + + def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + """Return a dict that can be turned into json using json.dump. + + :keyword bool exclude_readonly: Whether to remove the readonly properties. + :returns: A dict JSON compatible object + :rtype: dict + """ + + result = {} + readonly_props = [] + if exclude_readonly: + readonly_props = [p._rest_name for p in self._attr_to_rest_field.values() if _is_readonly(p)] + for k, v in self.items(): + if exclude_readonly and k in readonly_props: # pyright: ignore + continue + is_multipart_file_input = False + try: + is_multipart_file_input = next( + rf for rf in self._attr_to_rest_field.values() if rf._rest_name == k + )._is_multipart_file_input + except StopIteration: + pass + result[k] = v if is_multipart_file_input else Model._as_dict_value(v, exclude_readonly=exclude_readonly) + return result + + @staticmethod + def _as_dict_value(v: typing.Any, exclude_readonly: bool = False) -> typing.Any: + if v is None or isinstance(v, _Null): + return None + if isinstance(v, (list, tuple, set)): + return type(v)(Model._as_dict_value(x, exclude_readonly=exclude_readonly) for x in v) + if isinstance(v, dict): + return {dk: Model._as_dict_value(dv, exclude_readonly=exclude_readonly) for dk, dv in v.items()} + return v.as_dict(exclude_readonly=exclude_readonly) if hasattr(v, "as_dict") else v + + +def _deserialize_model(model_deserializer: typing.Optional[typing.Callable], obj): + if _is_model(obj): + return obj + return _deserialize(model_deserializer, obj) + + +def _deserialize_with_optional(if_obj_deserializer: typing.Optional[typing.Callable], obj): + if obj is None: + return obj + return _deserialize_with_callable(if_obj_deserializer, obj) + + +def _deserialize_with_union(deserializers, obj): + for deserializer in deserializers: + try: + return _deserialize(deserializer, obj) + except DeserializationError: + pass + raise DeserializationError() + + +def _deserialize_dict( + value_deserializer: typing.Optional[typing.Callable], + module: typing.Optional[str], + obj: typing.Dict[typing.Any, typing.Any], +): + if obj is None: + return obj + if isinstance(obj, ET.Element): + obj = {child.tag: child for child in obj} + return {k: _deserialize(value_deserializer, v, module) for k, v in obj.items()} + + +def _deserialize_multiple_sequence( + entry_deserializers: typing.List[typing.Optional[typing.Callable]], + module: typing.Optional[str], + obj, +): + if obj is None: + return obj + return type(obj)(_deserialize(deserializer, entry, module) for entry, deserializer in zip(obj, entry_deserializers)) + + +def _deserialize_sequence( + deserializer: typing.Optional[typing.Callable], + module: typing.Optional[str], + obj, +): + if obj is None: + return obj + if isinstance(obj, ET.Element): + obj = list(obj) + return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) + + +def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: + return sorted( + types, + key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), + ) + + +def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-return-statements, too-many-branches + annotation: typing.Any, + module: typing.Optional[str], + rf: typing.Optional["_RestField"] = None, +) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]: + if not annotation: + return None + + # is it a type alias? + if isinstance(annotation, str): + if module is not None: + annotation = _get_type_alias_type(module, annotation) + + # is it a forward ref / in quotes? + if isinstance(annotation, (str, typing.ForwardRef)): + try: + model_name = annotation.__forward_arg__ # type: ignore + except AttributeError: + model_name = annotation + if module is not None: + annotation = _get_model(module, model_name) # type: ignore + + try: + if module and _is_model(annotation): + if rf: + rf._is_model = True + + return functools.partial(_deserialize_model, annotation) # pyright: ignore + except Exception: + pass + + # is it a literal? + try: + if annotation.__origin__ is typing.Literal: # pyright: ignore + return None + except AttributeError: + pass + + # is it optional? + try: + if any(a for a in annotation.__args__ if a == type(None)): # pyright: ignore + if len(annotation.__args__) <= 2: # pyright: ignore + if_obj_deserializer = _get_deserialize_callable_from_annotation( + next(a for a in annotation.__args__ if a != type(None)), module, rf # pyright: ignore + ) + + return functools.partial(_deserialize_with_optional, if_obj_deserializer) + # the type is Optional[Union[...]], we need to remove the None type from the Union + annotation_copy = copy.copy(annotation) + annotation_copy.__args__ = [a for a in annotation_copy.__args__ if a != type(None)] # pyright: ignore + return _get_deserialize_callable_from_annotation(annotation_copy, module, rf) + except AttributeError: + pass + + # is it union? + if getattr(annotation, "__origin__", None) is typing.Union: + # initial ordering is we make `string` the last deserialization option, because it is often them most generic + deserializers = [ + _get_deserialize_callable_from_annotation(arg, module, rf) + for arg in _sorted_annotations(annotation.__args__) # pyright: ignore + ] + + return functools.partial(_deserialize_with_union, deserializers) + + try: + if annotation._name == "Dict": # pyright: ignore + value_deserializer = _get_deserialize_callable_from_annotation( + annotation.__args__[1], module, rf # pyright: ignore + ) + + return functools.partial( + _deserialize_dict, + value_deserializer, + module, + ) + except (AttributeError, IndexError): + pass + try: + if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if len(annotation.__args__) > 1: # pyright: ignore + entry_deserializers = [ + _get_deserialize_callable_from_annotation(dt, module, rf) + for dt in annotation.__args__ # pyright: ignore + ] + return functools.partial(_deserialize_multiple_sequence, entry_deserializers, module) + deserializer = _get_deserialize_callable_from_annotation( + annotation.__args__[0], module, rf # pyright: ignore + ) + + return functools.partial(_deserialize_sequence, deserializer, module) + except (TypeError, IndexError, AttributeError, SyntaxError): + pass + + def _deserialize_default( + deserializer, + obj, + ): + if obj is None: + return obj + try: + return _deserialize_with_callable(deserializer, obj) + except Exception: + pass + return obj + + if get_deserializer(annotation, rf): + return functools.partial(_deserialize_default, get_deserializer(annotation, rf)) + + return functools.partial(_deserialize_default, annotation) + + +def _deserialize_with_callable( + deserializer: typing.Optional[typing.Callable[[typing.Any], typing.Any]], + value: typing.Any, +): # pylint: disable=too-many-return-statements + try: + if value is None or isinstance(value, _Null): + return None + if isinstance(value, ET.Element): + if deserializer is str: + return value.text or "" + if deserializer is int: + return int(value.text) if value.text else None + if deserializer is float: + return float(value.text) if value.text else None + if deserializer is bool: + return value.text == "true" if value.text else None + if deserializer is None: + return value + if deserializer in [int, float, bool]: + return deserializer(value) + if isinstance(deserializer, CaseInsensitiveEnumMeta): + try: + return deserializer(value) + except ValueError: + # for unknown value, return raw value + return value + if isinstance(deserializer, type) and issubclass(deserializer, Model): + return deserializer._deserialize(value, []) + return typing.cast(typing.Callable[[typing.Any], typing.Any], deserializer)(value) + except Exception as e: + raise DeserializationError() from e + + +def _deserialize( + deserializer: typing.Any, + value: typing.Any, + module: typing.Optional[str] = None, + rf: typing.Optional["_RestField"] = None, + format: typing.Optional[str] = None, +) -> typing.Any: + if isinstance(value, PipelineResponse): + value = value.http_response.json() + if rf is None and format: + rf = _RestField(format=format) + if not isinstance(deserializer, functools.partial): + deserializer = _get_deserialize_callable_from_annotation(deserializer, module, rf) + return _deserialize_with_callable(deserializer, value) + + +def _failsafe_deserialize( + deserializer: typing.Any, + value: typing.Any, + module: typing.Optional[str] = None, + rf: typing.Optional["_RestField"] = None, + format: typing.Optional[str] = None, +) -> typing.Any: + try: + return _deserialize(deserializer, value, module, rf, format) + except DeserializationError: + _LOGGER.warning( + "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True + ) + return None + + +def _failsafe_deserialize_xml( + deserializer: typing.Any, + value: typing.Any, +) -> typing.Any: + try: + return _deserialize_xml(deserializer, value) + except DeserializationError: + _LOGGER.warning( + "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True + ) + return None + + +class _RestField: + def __init__( + self, + *, + name: typing.Optional[str] = None, + type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin + is_discriminator: bool = False, + visibility: typing.Optional[typing.List[str]] = None, + default: typing.Any = _UNSET, + format: typing.Optional[str] = None, + is_multipart_file_input: bool = False, + xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + ): + self._type = type + self._rest_name_input = name + self._module: typing.Optional[str] = None + self._is_discriminator = is_discriminator + self._visibility = visibility + self._is_model = False + self._default = default + self._format = format + self._is_multipart_file_input = is_multipart_file_input + self._xml = xml if xml is not None else {} + + @property + def _class_type(self) -> typing.Any: + return getattr(self._type, "args", [None])[0] + + @property + def _rest_name(self) -> str: + if self._rest_name_input is None: + raise ValueError("Rest name was never set") + return self._rest_name_input + + def __get__(self, obj: Model, type=None): # pylint: disable=redefined-builtin + # by this point, type and rest_name will have a value bc we default + # them in __new__ of the Model class + item = obj.get(self._rest_name) + if item is None: + return item + if self._is_model: + return item + return _deserialize(self._type, _serialize(item, self._format), rf=self) + + def __set__(self, obj: Model, value) -> None: + if value is None: + # we want to wipe out entries if users set attr to None + try: + obj.__delitem__(self._rest_name) + except KeyError: + pass + return + if self._is_model: + if not _is_model(value): + value = _deserialize(self._type, value) + obj.__setitem__(self._rest_name, value) + return + obj.__setitem__(self._rest_name, _serialize(value, self._format)) + + def _get_deserialize_callable_from_annotation( + self, annotation: typing.Any + ) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]: + return _get_deserialize_callable_from_annotation(annotation, self._module, self) + + +def rest_field( + *, + name: typing.Optional[str] = None, + type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin + visibility: typing.Optional[typing.List[str]] = None, + default: typing.Any = _UNSET, + format: typing.Optional[str] = None, + is_multipart_file_input: bool = False, + xml: typing.Optional[typing.Dict[str, typing.Any]] = None, +) -> typing.Any: + return _RestField( + name=name, + type=type, + visibility=visibility, + default=default, + format=format, + is_multipart_file_input=is_multipart_file_input, + xml=xml, + ) + + +def rest_discriminator( + *, + name: typing.Optional[str] = None, + type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin + visibility: typing.Optional[typing.List[str]] = None, + xml: typing.Optional[typing.Dict[str, typing.Any]] = None, +) -> typing.Any: + return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) + + +def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: + """Serialize a model to XML. + + :param Model model: The model to serialize. + :param bool exclude_readonly: Whether to exclude readonly properties. + :returns: The XML representation of the model. + :rtype: str + """ + return ET.tostring(_get_element(model, exclude_readonly), encoding="unicode") # type: ignore + + +def _get_element( + o: typing.Any, + exclude_readonly: bool = False, + parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + wrapped_element: typing.Optional[ET.Element] = None, +) -> typing.Union[ET.Element, typing.List[ET.Element]]: + if _is_model(o): + model_meta = getattr(o, "_xml", {}) + + # if prop is a model, then use the prop element directly, else generate a wrapper of model + if wrapped_element is None: + wrapped_element = _create_xml_element( + model_meta.get("name", o.__class__.__name__), + model_meta.get("prefix"), + model_meta.get("ns"), + ) + + readonly_props = [] + if exclude_readonly: + readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)] + + for k, v in o.items(): + # do not serialize readonly properties + if exclude_readonly and k in readonly_props: + continue + + prop_rest_field = _get_rest_field(o._attr_to_rest_field, k) + if prop_rest_field: + prop_meta = getattr(prop_rest_field, "_xml").copy() + # use the wire name as xml name if no specific name is set + if prop_meta.get("name") is None: + prop_meta["name"] = k + else: + # additional properties will not have rest field, use the wire name as xml name + prop_meta = {"name": k} + + # if no ns for prop, use model's + if prop_meta.get("ns") is None and model_meta.get("ns"): + prop_meta["ns"] = model_meta.get("ns") + prop_meta["prefix"] = model_meta.get("prefix") + + if prop_meta.get("unwrapped", False): + # unwrapped could only set on array + wrapped_element.extend(_get_element(v, exclude_readonly, prop_meta)) + elif prop_meta.get("text", False): + # text could only set on primitive type + wrapped_element.text = _get_primitive_type_value(v) + elif prop_meta.get("attribute", False): + xml_name = prop_meta.get("name", k) + if prop_meta.get("ns"): + ET.register_namespace(prop_meta.get("prefix"), prop_meta.get("ns")) # pyright: ignore + xml_name = "{" + prop_meta.get("ns") + "}" + xml_name # pyright: ignore + # attribute should be primitive type + wrapped_element.set(xml_name, _get_primitive_type_value(v)) + else: + # other wrapped prop element + wrapped_element.append(_get_wrapped_element(v, exclude_readonly, prop_meta)) + return wrapped_element + if isinstance(o, list): + return [_get_element(x, exclude_readonly, parent_meta) for x in o] # type: ignore + if isinstance(o, dict): + result = [] + for k, v in o.items(): + result.append( + _get_wrapped_element( + v, + exclude_readonly, + { + "name": k, + "ns": parent_meta.get("ns") if parent_meta else None, + "prefix": parent_meta.get("prefix") if parent_meta else None, + }, + ) + ) + return result + + # primitive case need to create element based on parent_meta + if parent_meta: + return _get_wrapped_element( + o, + exclude_readonly, + { + "name": parent_meta.get("itemsName", parent_meta.get("name")), + "prefix": parent_meta.get("itemsPrefix", parent_meta.get("prefix")), + "ns": parent_meta.get("itemsNs", parent_meta.get("ns")), + }, + ) + + raise ValueError("Could not serialize value into xml: " + o) + + +def _get_wrapped_element( + v: typing.Any, + exclude_readonly: bool, + meta: typing.Optional[typing.Dict[str, typing.Any]], +) -> ET.Element: + wrapped_element = _create_xml_element( + meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None + ) + if isinstance(v, (dict, list)): + wrapped_element.extend(_get_element(v, exclude_readonly, meta)) + elif _is_model(v): + _get_element(v, exclude_readonly, meta, wrapped_element) + else: + wrapped_element.text = _get_primitive_type_value(v) + return wrapped_element + + +def _get_primitive_type_value(v) -> str: + if v is True: + return "true" + if v is False: + return "false" + if isinstance(v, _Null): + return "" + return str(v) + + +def _create_xml_element(tag, prefix=None, ns=None): + if prefix and ns: + ET.register_namespace(prefix, ns) + if ns: + return ET.Element("{" + ns + "}" + tag) + return ET.Element(tag) + + +def _deserialize_xml( + deserializer: typing.Any, + value: str, +) -> typing.Any: + element = ET.fromstring(value) # nosec + return _deserialize(deserializer, element) + + +def _convert_element(e: ET.Element): + # dict case + if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: + dict_result: typing.Dict[str, typing.Any] = {} + for child in e: + if dict_result.get(child.tag) is not None: + if isinstance(dict_result[child.tag], list): + dict_result[child.tag].append(_convert_element(child)) + else: + dict_result[child.tag] = [dict_result[child.tag], _convert_element(child)] + else: + dict_result[child.tag] = _convert_element(child) + dict_result.update(e.attrib) + return dict_result + # array case + if len(e) > 0: + array_result: typing.List[typing.Any] = [] + for child in e: + array_result.append(_convert_element(child)) + return array_result + # primitive case + return e.text diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_operations/_operations.py similarity index 98% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_operations/_operations.py index 3669f1c8d25..a2d1637c663 100644 --- a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_operations/_operations.py @@ -64,7 +64,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.User"]: """List users. :return: An iterator like instance of User - :rtype: ~azure.core.paging.ItemPaged[~specs.azure.payload.pageable.models.User] + :rtype: ~azure.core.paging.ItemPaged[~azure.payload.pageable.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_operations/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_operations/_patch.py @@ -0,0 +1,21 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_patch.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_patch.py @@ -0,0 +1,21 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_serialization.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_serialization.py new file mode 100644 index 00000000000..eb86ea23c96 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_serialization.py @@ -0,0 +1,2032 @@ +# pylint: disable=line-too-long,useless-suppression,too-many-lines +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +# pyright: reportUnnecessaryTypeIgnoreComment=false + +from base64 import b64decode, b64encode +import calendar +import datetime +import decimal +import email +from enum import Enum +import json +import logging +import re +import sys +import codecs +from typing import ( + Dict, + Any, + cast, + Optional, + Union, + AnyStr, + IO, + Mapping, + Callable, + MutableMapping, + List, +) + +try: + from urllib import quote # type: ignore +except ImportError: + from urllib.parse import quote +import xml.etree.ElementTree as ET + +import isodate # type: ignore +from typing_extensions import Self + +from azure.core.exceptions import DeserializationError, SerializationError +from azure.core.serialization import NULL as CoreNull + +_BOM = codecs.BOM_UTF8.decode(encoding="utf-8") + +JSON = MutableMapping[str, Any] + + +class RawDeserializer: + + # Accept "text" because we're open minded people... + JSON_REGEXP = re.compile(r"^(application|text)/([a-z+.]+\+)?json$") + + # Name used in context + CONTEXT_NAME = "deserialized_data" + + @classmethod + def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type: Optional[str] = None) -> Any: + """Decode data according to content-type. + + Accept a stream of data as well, but will be load at once in memory for now. + + If no content-type, will return the string version (not bytes, not stream) + + :param data: Input, could be bytes or stream (will be decoded with UTF8) or text + :type data: str or bytes or IO + :param str content_type: The content type. + :return: The deserialized data. + :rtype: object + """ + if hasattr(data, "read"): + # Assume a stream + data = cast(IO, data).read() + + if isinstance(data, bytes): + data_as_str = data.decode(encoding="utf-8-sig") + else: + # Explain to mypy the correct type. + data_as_str = cast(str, data) + + # Remove Byte Order Mark if present in string + data_as_str = data_as_str.lstrip(_BOM) + + if content_type is None: + return data + + if cls.JSON_REGEXP.match(content_type): + try: + return json.loads(data_as_str) + except ValueError as err: + raise DeserializationError("JSON is invalid: {}".format(err), err) from err + elif "xml" in (content_type or []): + try: + + try: + if isinstance(data, unicode): # type: ignore + # If I'm Python 2.7 and unicode XML will scream if I try a "fromstring" on unicode string + data_as_str = data_as_str.encode(encoding="utf-8") # type: ignore + except NameError: + pass + + return ET.fromstring(data_as_str) # nosec + except ET.ParseError as err: + # It might be because the server has an issue, and returned JSON with + # content-type XML.... + # So let's try a JSON load, and if it's still broken + # let's flow the initial exception + def _json_attemp(data): + try: + return True, json.loads(data) + except ValueError: + return False, None # Don't care about this one + + success, json_result = _json_attemp(data) + if success: + return json_result + # If i'm here, it's not JSON, it's not XML, let's scream + # and raise the last context in this block (the XML exception) + # The function hack is because Py2.7 messes up with exception + # context otherwise. + _LOGGER.critical("Wasn't XML not JSON, failing") + raise DeserializationError("XML is invalid") from err + elif content_type.startswith("text/"): + return data_as_str + raise DeserializationError("Cannot deserialize content-type: {}".format(content_type)) + + @classmethod + def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], headers: Mapping) -> Any: + """Deserialize from HTTP response. + + Use bytes and headers to NOT use any requests/aiohttp or whatever + specific implementation. + Headers will tested for "content-type" + + :param bytes body_bytes: The body of the response. + :param dict headers: The headers of the response. + :returns: The deserialized data. + :rtype: object + """ + # Try to use content-type from headers if available + content_type = None + if "content-type" in headers: + content_type = headers["content-type"].split(";")[0].strip().lower() + # Ouch, this server did not declare what it sent... + # Let's guess it's JSON... + # Also, since Autorest was considering that an empty body was a valid JSON, + # need that test as well.... + else: + content_type = "application/json" + + if body_bytes: + return cls.deserialize_from_text(body_bytes, content_type) + return None + + +_LOGGER = logging.getLogger(__name__) + +try: + _long_type = long # type: ignore +except NameError: + _long_type = int + +TZ_UTC = datetime.timezone.utc + +_FLATTEN = re.compile(r"(? None: + self.additional_properties: Optional[Dict[str, Any]] = {} + for k in kwargs: # pylint: disable=consider-using-dict-items + if k not in self._attribute_map: + _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) + elif k in self._validation and self._validation[k].get("readonly", False): + _LOGGER.warning("Readonly attribute %s will be ignored in class %s", k, self.__class__) + else: + setattr(self, k, kwargs[k]) + + def __eq__(self, other: Any) -> bool: + """Compare objects by comparing all attributes. + + :param object other: The object to compare + :returns: True if objects are equal + :rtype: bool + """ + if isinstance(other, self.__class__): + return self.__dict__ == other.__dict__ + return False + + def __ne__(self, other: Any) -> bool: + """Compare objects by comparing all attributes. + + :param object other: The object to compare + :returns: True if objects are not equal + :rtype: bool + """ + return not self.__eq__(other) + + def __str__(self) -> str: + return str(self.__dict__) + + @classmethod + def enable_additional_properties_sending(cls) -> None: + cls._attribute_map["additional_properties"] = {"key": "", "type": "{object}"} + + @classmethod + def is_xml_model(cls) -> bool: + try: + cls._xml_map # type: ignore + except AttributeError: + return False + return True + + @classmethod + def _create_xml_node(cls): + """Create XML node. + + :returns: The XML node + :rtype: xml.etree.ElementTree.Element + """ + try: + xml_map = cls._xml_map # type: ignore + except AttributeError: + xml_map = {} + + return _create_xml_node(xml_map.get("name", cls.__name__), xml_map.get("prefix", None), xml_map.get("ns", None)) + + def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: + """Return the JSON that would be sent to server from this model. + + This is an alias to `as_dict(full_restapi_key_transformer, keep_readonly=False)`. + + If you want XML serialization, you can pass the kwargs is_xml=True. + + :param bool keep_readonly: If you want to serialize the readonly attributes + :returns: A dict JSON compatible object + :rtype: dict + """ + serializer = Serializer(self._infer_class_models()) + return serializer._serialize( # type: ignore # pylint: disable=protected-access + self, keep_readonly=keep_readonly, **kwargs + ) + + def as_dict( + self, + keep_readonly: bool = True, + key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + **kwargs: Any + ) -> JSON: + """Return a dict that can be serialized using json.dump. + + Advanced usage might optionally use a callback as parameter: + + .. code::python + + def my_key_transformer(key, attr_desc, value): + return key + + Key is the attribute name used in Python. Attr_desc + is a dict of metadata. Currently contains 'type' with the + msrest type and 'key' with the RestAPI encoded key. + Value is the current value in this object. + + The string returned will be used to serialize the key. + If the return type is a list, this is considered hierarchical + result dict. + + See the three examples in this file: + + - attribute_transformer + - full_restapi_key_transformer + - last_restapi_key_transformer + + If you want XML serialization, you can pass the kwargs is_xml=True. + + :param bool keep_readonly: If you want to serialize the readonly attributes + :param function key_transformer: A key transformer function. + :returns: A dict JSON compatible object + :rtype: dict + """ + serializer = Serializer(self._infer_class_models()) + return serializer._serialize( # type: ignore # pylint: disable=protected-access + self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs + ) + + @classmethod + def _infer_class_models(cls): + try: + str_models = cls.__module__.rsplit(".", 1)[0] + models = sys.modules[str_models] + client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} + if cls.__name__ not in client_models: + raise ValueError("Not Autorest generated code") + except Exception: # pylint: disable=broad-exception-caught + # Assume it's not Autorest generated (tests?). Add ourselves as dependencies. + client_models = {cls.__name__: cls} + return client_models + + @classmethod + def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: + """Parse a str using the RestAPI syntax and return a model. + + :param str data: A str using RestAPI structure. JSON by default. + :param str content_type: JSON by default, set application/xml if XML. + :returns: An instance of this model + :raises DeserializationError: if something went wrong + :rtype: Self + """ + deserializer = Deserializer(cls._infer_class_models()) + return deserializer(cls.__name__, data, content_type=content_type) # type: ignore + + @classmethod + def from_dict( + cls, + data: Any, + key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + content_type: Optional[str] = None, + ) -> Self: + """Parse a dict using given key extractor return a model. + + By default consider key + extractors (rest_key_case_insensitive_extractor, attribute_key_case_insensitive_extractor + and last_rest_key_case_insensitive_extractor) + + :param dict data: A dict using RestAPI structure + :param function key_extractors: A key extractor function. + :param str content_type: JSON by default, set application/xml if XML. + :returns: An instance of this model + :raises DeserializationError: if something went wrong + :rtype: Self + """ + deserializer = Deserializer(cls._infer_class_models()) + deserializer.key_extractors = ( # type: ignore + [ # type: ignore + attribute_key_case_insensitive_extractor, + rest_key_case_insensitive_extractor, + last_rest_key_case_insensitive_extractor, + ] + if key_extractors is None + else key_extractors + ) + return deserializer(cls.__name__, data, content_type=content_type) # type: ignore + + @classmethod + def _flatten_subtype(cls, key, objects): + if "_subtype_map" not in cls.__dict__: + return {} + result = dict(cls._subtype_map[key]) + for valuetype in cls._subtype_map[key].values(): + result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + return result + + @classmethod + def _classify(cls, response, objects): + """Check the class _subtype_map for any child classes. + We want to ignore any inherited _subtype_maps. + + :param dict response: The initial data + :param dict objects: The class objects + :returns: The class to be used + :rtype: class + """ + for subtype_key in cls.__dict__.get("_subtype_map", {}).keys(): + subtype_value = None + + if not isinstance(response, ET.Element): + rest_api_response_key = cls._get_rest_key_parts(subtype_key)[-1] + subtype_value = response.get(rest_api_response_key, None) or response.get(subtype_key, None) + else: + subtype_value = xml_key_extractor(subtype_key, cls._attribute_map[subtype_key], response) + if subtype_value: + # Try to match base class. Can be class name only + # (bug to fix in Autorest to support x-ms-discriminator-name) + if cls.__name__ == subtype_value: + return cls + flatten_mapping_type = cls._flatten_subtype(subtype_key, objects) + try: + return objects[flatten_mapping_type[subtype_value]] # type: ignore + except KeyError: + _LOGGER.warning( + "Subtype value %s has no mapping, use base class %s.", + subtype_value, + cls.__name__, + ) + break + else: + _LOGGER.warning("Discriminator %s is absent or null, use base class %s.", subtype_key, cls.__name__) + break + return cls + + @classmethod + def _get_rest_key_parts(cls, attr_key): + """Get the RestAPI key of this attr, split it and decode part + :param str attr_key: Attribute key must be in attribute_map. + :returns: A list of RestAPI part + :rtype: list + """ + rest_split_key = _FLATTEN.split(cls._attribute_map[attr_key]["key"]) + return [_decode_attribute_map_key(key_part) for key_part in rest_split_key] + + +def _decode_attribute_map_key(key): + """This decode a key in an _attribute_map to the actual key we want to look at + inside the received data. + + :param str key: A key string from the generated code + :returns: The decoded key + :rtype: str + """ + return key.replace("\\.", ".") + + +class Serializer: # pylint: disable=too-many-public-methods + """Request object model serializer.""" + + basic_types = {str: "str", int: "int", bool: "bool", float: "float"} + + _xml_basic_types_serializers = {"bool": lambda x: str(x).lower()} + days = {0: "Mon", 1: "Tue", 2: "Wed", 3: "Thu", 4: "Fri", 5: "Sat", 6: "Sun"} + months = { + 1: "Jan", + 2: "Feb", + 3: "Mar", + 4: "Apr", + 5: "May", + 6: "Jun", + 7: "Jul", + 8: "Aug", + 9: "Sep", + 10: "Oct", + 11: "Nov", + 12: "Dec", + } + validation = { + "min_length": lambda x, y: len(x) < y, + "max_length": lambda x, y: len(x) > y, + "minimum": lambda x, y: x < y, + "maximum": lambda x, y: x > y, + "minimum_ex": lambda x, y: x <= y, + "maximum_ex": lambda x, y: x >= y, + "min_items": lambda x, y: len(x) < y, + "max_items": lambda x, y: len(x) > y, + "pattern": lambda x, y: not re.match(y, x, re.UNICODE), + "unique": lambda x, y: len(x) != len(set(x)), + "multiple": lambda x, y: x % y != 0, + } + + def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: + self.serialize_type = { + "iso-8601": Serializer.serialize_iso, + "rfc-1123": Serializer.serialize_rfc, + "unix-time": Serializer.serialize_unix, + "duration": Serializer.serialize_duration, + "date": Serializer.serialize_date, + "time": Serializer.serialize_time, + "decimal": Serializer.serialize_decimal, + "long": Serializer.serialize_long, + "bytearray": Serializer.serialize_bytearray, + "base64": Serializer.serialize_base64, + "object": self.serialize_object, + "[]": self.serialize_iter, + "{}": self.serialize_dict, + } + self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.key_transformer = full_restapi_key_transformer + self.client_side_validation = True + + def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, too-many-statements, too-many-locals + self, target_obj, data_type=None, **kwargs + ): + """Serialize data into a string according to type. + + :param object target_obj: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str, dict + :raises SerializationError: if serialization fails. + :returns: The serialized data. + """ + key_transformer = kwargs.get("key_transformer", self.key_transformer) + keep_readonly = kwargs.get("keep_readonly", False) + if target_obj is None: + return None + + attr_name = None + class_name = target_obj.__class__.__name__ + + if data_type: + return self.serialize_data(target_obj, data_type, **kwargs) + + if not hasattr(target_obj, "_attribute_map"): + data_type = type(target_obj).__name__ + if data_type in self.basic_types.values(): + return self.serialize_data(target_obj, data_type, **kwargs) + + # Force "is_xml" kwargs if we detect a XML model + try: + is_xml_model_serialization = kwargs["is_xml"] + except KeyError: + is_xml_model_serialization = kwargs.setdefault("is_xml", target_obj.is_xml_model()) + + serialized = {} + if is_xml_model_serialization: + serialized = target_obj._create_xml_node() # pylint: disable=protected-access + try: + attributes = target_obj._attribute_map # pylint: disable=protected-access + for attr, attr_desc in attributes.items(): + attr_name = attr + if not keep_readonly and target_obj._validation.get( # pylint: disable=protected-access + attr_name, {} + ).get("readonly", False): + continue + + if attr_name == "additional_properties" and attr_desc["key"] == "": + if target_obj.additional_properties is not None: + serialized.update(target_obj.additional_properties) + continue + try: + + orig_attr = getattr(target_obj, attr) + if is_xml_model_serialization: + pass # Don't provide "transformer" for XML for now. Keep "orig_attr" + else: # JSON + keys, orig_attr = key_transformer(attr, attr_desc.copy(), orig_attr) + keys = keys if isinstance(keys, list) else [keys] + + kwargs["serialization_ctxt"] = attr_desc + new_attr = self.serialize_data(orig_attr, attr_desc["type"], **kwargs) + + if is_xml_model_serialization: + xml_desc = attr_desc.get("xml", {}) + xml_name = xml_desc.get("name", attr_desc["key"]) + xml_prefix = xml_desc.get("prefix", None) + xml_ns = xml_desc.get("ns", None) + if xml_desc.get("attr", False): + if xml_ns: + ET.register_namespace(xml_prefix, xml_ns) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) + serialized.set(xml_name, new_attr) # type: ignore + continue + if xml_desc.get("text", False): + serialized.text = new_attr # type: ignore + continue + if isinstance(new_attr, list): + serialized.extend(new_attr) # type: ignore + elif isinstance(new_attr, ET.Element): + # If the down XML has no XML/Name, + # we MUST replace the tag with the local tag. But keeping the namespaces. + if "name" not in getattr(orig_attr, "_xml_map", {}): + splitted_tag = new_attr.tag.split("}") + if len(splitted_tag) == 2: # Namespace + new_attr.tag = "}".join([splitted_tag[0], xml_name]) + else: + new_attr.tag = xml_name + serialized.append(new_attr) # type: ignore + else: # That's a basic type + # Integrate namespace if necessary + local_node = _create_xml_node(xml_name, xml_prefix, xml_ns) + local_node.text = str(new_attr) + serialized.append(local_node) # type: ignore + else: # JSON + for k in reversed(keys): # type: ignore + new_attr = {k: new_attr} + + _new_attr = new_attr + _serialized = serialized + for k in keys: # type: ignore + if k not in _serialized: + _serialized.update(_new_attr) # type: ignore + _new_attr = _new_attr[k] # type: ignore + _serialized = _serialized[k] + except ValueError as err: + if isinstance(err, SerializationError): + raise + + except (AttributeError, KeyError, TypeError) as err: + msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj)) + raise SerializationError(msg) from err + return serialized + + def body(self, data, data_type, **kwargs): + """Serialize data intended for a request body. + + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: dict + :raises SerializationError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized request body + """ + + # Just in case this is a dict + internal_data_type_str = data_type.strip("[]{}") + internal_data_type = self.dependencies.get(internal_data_type_str, None) + try: + is_xml_model_serialization = kwargs["is_xml"] + except KeyError: + if internal_data_type and issubclass(internal_data_type, Model): + is_xml_model_serialization = kwargs.setdefault("is_xml", internal_data_type.is_xml_model()) + else: + is_xml_model_serialization = False + if internal_data_type and not isinstance(internal_data_type, Enum): + try: + deserializer = Deserializer(self.dependencies) + # Since it's on serialization, it's almost sure that format is not JSON REST + # We're not able to deal with additional properties for now. + deserializer.additional_properties_detection = False + if is_xml_model_serialization: + deserializer.key_extractors = [ # type: ignore + attribute_key_case_insensitive_extractor, + ] + else: + deserializer.key_extractors = [ + rest_key_case_insensitive_extractor, + attribute_key_case_insensitive_extractor, + last_rest_key_case_insensitive_extractor, + ] + data = deserializer._deserialize(data_type, data) # pylint: disable=protected-access + except DeserializationError as err: + raise SerializationError("Unable to build a model: " + str(err)) from err + + return self._serialize(data, data_type, **kwargs) + + def url(self, name, data, data_type, **kwargs): + """Serialize data intended for a URL path. + + :param str name: The name of the URL path parameter. + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str + :returns: The serialized URL path + :raises TypeError: if serialization fails. + :raises ValueError: if data is None + """ + try: + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + + if kwargs.get("skip_quote") is True: + output = str(output) + output = output.replace("{", quote("{")).replace("}", quote("}")) + else: + output = quote(str(output), safe="") + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return output + + def query(self, name, data, data_type, **kwargs): + """Serialize data intended for a URL query. + + :param str name: The name of the query parameter. + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str, list + :raises TypeError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized query parameter + """ + try: + # Treat the list aside, since we don't want to encode the div separator + if data_type.startswith("["): + internal_data_type = data_type[1:-1] + do_quote = not kwargs.get("skip_quote", False) + return self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs) + + # Not a list, regular serialization + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + if kwargs.get("skip_quote") is True: + output = str(output) + else: + output = quote(str(output), safe="") + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return str(output) + + def header(self, name, data, data_type, **kwargs): + """Serialize data intended for a request header. + + :param str name: The name of the header. + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str + :raises TypeError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized header + """ + try: + if data_type in ["[str]"]: + data = ["" if d is None else d for d in data] + + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return str(output) + + def serialize_data(self, data, data_type, **kwargs): + """Serialize generic data according to supplied data type. + + :param object data: The data to be serialized. + :param str data_type: The type to be serialized from. + :raises AttributeError: if required data is None. + :raises ValueError: if data is None + :raises SerializationError: if serialization fails. + :returns: The serialized data. + :rtype: str, int, float, bool, dict, list + """ + if data is None: + raise ValueError("No value for given attribute") + + try: + if data is CoreNull: + return None + if data_type in self.basic_types.values(): + return self.serialize_basic(data, data_type, **kwargs) + + if data_type in self.serialize_type: + return self.serialize_type[data_type](data, **kwargs) + + # If dependencies is empty, try with current data class + # It has to be a subclass of Enum anyway + enum_type = self.dependencies.get(data_type, data.__class__) + if issubclass(enum_type, Enum): + return Serializer.serialize_enum(data, enum_obj=enum_type) + + iter_type = data_type[0] + data_type[-1] + if iter_type in self.serialize_type: + return self.serialize_type[iter_type](data, data_type[1:-1], **kwargs) + + except (ValueError, TypeError) as err: + msg = "Unable to serialize value: {!r} as type: {!r}." + raise SerializationError(msg.format(data, data_type)) from err + return self._serialize(data, **kwargs) + + @classmethod + def _get_custom_serializers(cls, data_type, **kwargs): # pylint: disable=inconsistent-return-statements + custom_serializer = kwargs.get("basic_types_serializers", {}).get(data_type) + if custom_serializer: + return custom_serializer + if kwargs.get("is_xml", False): + return cls._xml_basic_types_serializers.get(data_type) + + @classmethod + def serialize_basic(cls, data, data_type, **kwargs): + """Serialize basic builting data type. + Serializes objects to str, int, float or bool. + + Possible kwargs: + - basic_types_serializers dict[str, callable] : If set, use the callable as serializer + - is_xml bool : If set, use xml_basic_types_serializers + + :param obj data: Object to be serialized. + :param str data_type: Type of object in the iterable. + :rtype: str, int, float, bool + :return: serialized object + """ + custom_serializer = cls._get_custom_serializers(data_type, **kwargs) + if custom_serializer: + return custom_serializer(data) + if data_type == "str": + return cls.serialize_unicode(data) + return eval(data_type)(data) # nosec # pylint: disable=eval-used + + @classmethod + def serialize_unicode(cls, data): + """Special handling for serializing unicode strings in Py2. + Encode to UTF-8 if unicode, otherwise handle as a str. + + :param str data: Object to be serialized. + :rtype: str + :return: serialized object + """ + try: # If I received an enum, return its value + return data.value + except AttributeError: + pass + + try: + if isinstance(data, unicode): # type: ignore + # Don't change it, JSON and XML ElementTree are totally able + # to serialize correctly u'' strings + return data + except NameError: + return str(data) + return str(data) + + def serialize_iter(self, data, iter_type, div=None, **kwargs): + """Serialize iterable. + + Supported kwargs: + - serialization_ctxt dict : The current entry of _attribute_map, or same format. + serialization_ctxt['type'] should be same as data_type. + - is_xml bool : If set, serialize as XML + + :param list data: Object to be serialized. + :param str iter_type: Type of object in the iterable. + :param str div: If set, this str will be used to combine the elements + in the iterable into a combined string. Default is 'None'. + Defaults to False. + :rtype: list, str + :return: serialized iterable + """ + if isinstance(data, str): + raise SerializationError("Refuse str type as a valid iter type.") + + serialization_ctxt = kwargs.get("serialization_ctxt", {}) + is_xml = kwargs.get("is_xml", False) + + serialized = [] + for d in data: + try: + serialized.append(self.serialize_data(d, iter_type, **kwargs)) + except ValueError as err: + if isinstance(err, SerializationError): + raise + serialized.append(None) + + if kwargs.get("do_quote", False): + serialized = ["" if s is None else quote(str(s), safe="") for s in serialized] + + if div: + serialized = ["" if s is None else str(s) for s in serialized] + serialized = div.join(serialized) + + if "xml" in serialization_ctxt or is_xml: + # XML serialization is more complicated + xml_desc = serialization_ctxt.get("xml", {}) + xml_name = xml_desc.get("name") + if not xml_name: + xml_name = serialization_ctxt["key"] + + # Create a wrap node if necessary (use the fact that Element and list have "append") + is_wrapped = xml_desc.get("wrapped", False) + node_name = xml_desc.get("itemsName", xml_name) + if is_wrapped: + final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + else: + final_result = [] + # All list elements to "local_node" + for el in serialized: + if isinstance(el, ET.Element): + el_node = el + else: + el_node = _create_xml_node(node_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + if el is not None: # Otherwise it writes "None" :-p + el_node.text = str(el) + final_result.append(el_node) + return final_result + return serialized + + def serialize_dict(self, attr, dict_type, **kwargs): + """Serialize a dictionary of objects. + + :param dict attr: Object to be serialized. + :param str dict_type: Type of object in the dictionary. + :rtype: dict + :return: serialized dictionary + """ + serialization_ctxt = kwargs.get("serialization_ctxt", {}) + serialized = {} + for key, value in attr.items(): + try: + serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs) + except ValueError as err: + if isinstance(err, SerializationError): + raise + serialized[self.serialize_unicode(key)] = None + + if "xml" in serialization_ctxt: + # XML serialization is more complicated + xml_desc = serialization_ctxt["xml"] + xml_name = xml_desc["name"] + + final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + for key, value in serialized.items(): + ET.SubElement(final_result, key).text = value + return final_result + + return serialized + + def serialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements + """Serialize a generic object. + This will be handled as a dictionary. If object passed in is not + a basic type (str, int, float, dict, list) it will simply be + cast to str. + + :param dict attr: Object to be serialized. + :rtype: dict or str + :return: serialized object + """ + if attr is None: + return None + if isinstance(attr, ET.Element): + return attr + obj_type = type(attr) + if obj_type in self.basic_types: + return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs) + if obj_type is _long_type: + return self.serialize_long(attr) + if obj_type is str: + return self.serialize_unicode(attr) + if obj_type is datetime.datetime: + return self.serialize_iso(attr) + if obj_type is datetime.date: + return self.serialize_date(attr) + if obj_type is datetime.time: + return self.serialize_time(attr) + if obj_type is datetime.timedelta: + return self.serialize_duration(attr) + if obj_type is decimal.Decimal: + return self.serialize_decimal(attr) + + # If it's a model or I know this dependency, serialize as a Model + if obj_type in self.dependencies.values() or isinstance(attr, Model): + return self._serialize(attr) + + if obj_type == dict: + serialized = {} + for key, value in attr.items(): + try: + serialized[self.serialize_unicode(key)] = self.serialize_object(value, **kwargs) + except ValueError: + serialized[self.serialize_unicode(key)] = None + return serialized + + if obj_type == list: + serialized = [] + for obj in attr: + try: + serialized.append(self.serialize_object(obj, **kwargs)) + except ValueError: + pass + return serialized + return str(attr) + + @staticmethod + def serialize_enum(attr, enum_obj=None): + try: + result = attr.value + except AttributeError: + result = attr + try: + enum_obj(result) # type: ignore + return result + except ValueError as exc: + for enum_value in enum_obj: # type: ignore + if enum_value.value.lower() == str(attr).lower(): + return enum_value.value + error = "{!r} is not valid value for enum {!r}" + raise SerializationError(error.format(attr, enum_obj)) from exc + + @staticmethod + def serialize_bytearray(attr, **kwargs): # pylint: disable=unused-argument + """Serialize bytearray into base-64 string. + + :param str attr: Object to be serialized. + :rtype: str + :return: serialized base64 + """ + return b64encode(attr).decode() + + @staticmethod + def serialize_base64(attr, **kwargs): # pylint: disable=unused-argument + """Serialize str into base-64 string. + + :param str attr: Object to be serialized. + :rtype: str + :return: serialized base64 + """ + encoded = b64encode(attr).decode("ascii") + return encoded.strip("=").replace("+", "-").replace("/", "_") + + @staticmethod + def serialize_decimal(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Decimal object to float. + + :param decimal attr: Object to be serialized. + :rtype: float + :return: serialized decimal + """ + return float(attr) + + @staticmethod + def serialize_long(attr, **kwargs): # pylint: disable=unused-argument + """Serialize long (Py2) or int (Py3). + + :param int attr: Object to be serialized. + :rtype: int/long + :return: serialized long + """ + return _long_type(attr) + + @staticmethod + def serialize_date(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Date object into ISO-8601 formatted string. + + :param Date attr: Object to be serialized. + :rtype: str + :return: serialized date + """ + if isinstance(attr, str): + attr = isodate.parse_date(attr) + t = "{:04}-{:02}-{:02}".format(attr.year, attr.month, attr.day) + return t + + @staticmethod + def serialize_time(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Time object into ISO-8601 formatted string. + + :param datetime.time attr: Object to be serialized. + :rtype: str + :return: serialized time + """ + if isinstance(attr, str): + attr = isodate.parse_time(attr) + t = "{:02}:{:02}:{:02}".format(attr.hour, attr.minute, attr.second) + if attr.microsecond: + t += ".{:02}".format(attr.microsecond) + return t + + @staticmethod + def serialize_duration(attr, **kwargs): # pylint: disable=unused-argument + """Serialize TimeDelta object into ISO-8601 formatted string. + + :param TimeDelta attr: Object to be serialized. + :rtype: str + :return: serialized duration + """ + if isinstance(attr, str): + attr = isodate.parse_duration(attr) + return isodate.duration_isoformat(attr) + + @staticmethod + def serialize_rfc(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Datetime object into RFC-1123 formatted string. + + :param Datetime attr: Object to be serialized. + :rtype: str + :raises TypeError: if format invalid. + :return: serialized rfc + """ + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + utc = attr.utctimetuple() + except AttributeError as exc: + raise TypeError("RFC1123 object must be valid Datetime object.") from exc + + return "{}, {:02} {} {:04} {:02}:{:02}:{:02} GMT".format( + Serializer.days[utc.tm_wday], + utc.tm_mday, + Serializer.months[utc.tm_mon], + utc.tm_year, + utc.tm_hour, + utc.tm_min, + utc.tm_sec, + ) + + @staticmethod + def serialize_iso(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Datetime object into ISO-8601 formatted string. + + :param Datetime attr: Object to be serialized. + :rtype: str + :raises SerializationError: if format invalid. + :return: serialized iso + """ + if isinstance(attr, str): + attr = isodate.parse_datetime(attr) + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + utc = attr.utctimetuple() + if utc.tm_year > 9999 or utc.tm_year < 1: + raise OverflowError("Hit max or min date") + + microseconds = str(attr.microsecond).rjust(6, "0").rstrip("0").ljust(3, "0") + if microseconds: + microseconds = "." + microseconds + date = "{:04}-{:02}-{:02}T{:02}:{:02}:{:02}".format( + utc.tm_year, utc.tm_mon, utc.tm_mday, utc.tm_hour, utc.tm_min, utc.tm_sec + ) + return date + microseconds + "Z" + except (ValueError, OverflowError) as err: + msg = "Unable to serialize datetime object." + raise SerializationError(msg) from err + except AttributeError as err: + msg = "ISO-8601 object must be valid Datetime object." + raise TypeError(msg) from err + + @staticmethod + def serialize_unix(attr, **kwargs): # pylint: disable=unused-argument + """Serialize Datetime object into IntTime format. + This is represented as seconds. + + :param Datetime attr: Object to be serialized. + :rtype: int + :raises SerializationError: if format invalid + :return: serialied unix + """ + if isinstance(attr, int): + return attr + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + return int(calendar.timegm(attr.utctimetuple())) + except AttributeError as exc: + raise TypeError("Unix time object must be valid Datetime object.") from exc + + +def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument + key = attr_desc["key"] + working_data = data + + while "." in key: + # Need the cast, as for some reasons "split" is typed as list[str | Any] + dict_keys = cast(List[str], _FLATTEN.split(key)) + if len(dict_keys) == 1: + key = _decode_attribute_map_key(dict_keys[0]) + break + working_key = _decode_attribute_map_key(dict_keys[0]) + working_data = working_data.get(working_key, data) + if working_data is None: + # If at any point while following flatten JSON path see None, it means + # that all properties under are None as well + return None + key = ".".join(dict_keys[1:]) + + return working_data.get(key) + + +def rest_key_case_insensitive_extractor( # pylint: disable=unused-argument, inconsistent-return-statements + attr, attr_desc, data +): + key = attr_desc["key"] + working_data = data + + while "." in key: + dict_keys = _FLATTEN.split(key) + if len(dict_keys) == 1: + key = _decode_attribute_map_key(dict_keys[0]) + break + working_key = _decode_attribute_map_key(dict_keys[0]) + working_data = attribute_key_case_insensitive_extractor(working_key, None, working_data) + if working_data is None: + # If at any point while following flatten JSON path see None, it means + # that all properties under are None as well + return None + key = ".".join(dict_keys[1:]) + + if working_data: + return attribute_key_case_insensitive_extractor(key, None, working_data) + + +def last_rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument + """Extract the attribute in "data" based on the last part of the JSON path key. + + :param str attr: The attribute to extract + :param dict attr_desc: The attribute description + :param dict data: The data to extract from + :rtype: object + :returns: The extracted attribute + """ + key = attr_desc["key"] + dict_keys = _FLATTEN.split(key) + return attribute_key_extractor(dict_keys[-1], None, data) + + +def last_rest_key_case_insensitive_extractor(attr, attr_desc, data): # pylint: disable=unused-argument + """Extract the attribute in "data" based on the last part of the JSON path key. + + This is the case insensitive version of "last_rest_key_extractor" + :param str attr: The attribute to extract + :param dict attr_desc: The attribute description + :param dict data: The data to extract from + :rtype: object + :returns: The extracted attribute + """ + key = attr_desc["key"] + dict_keys = _FLATTEN.split(key) + return attribute_key_case_insensitive_extractor(dict_keys[-1], None, data) + + +def attribute_key_extractor(attr, _, data): + return data.get(attr) + + +def attribute_key_case_insensitive_extractor(attr, _, data): + found_key = None + lower_attr = attr.lower() + for key in data: + if lower_attr == key.lower(): + found_key = key + break + + return data.get(found_key) + + +def _extract_name_from_internal_type(internal_type): + """Given an internal type XML description, extract correct XML name with namespace. + + :param dict internal_type: An model type + :rtype: tuple + :returns: A tuple XML name + namespace dict + """ + internal_type_xml_map = getattr(internal_type, "_xml_map", {}) + xml_name = internal_type_xml_map.get("name", internal_type.__name__) + xml_ns = internal_type_xml_map.get("ns", None) + if xml_ns: + xml_name = "{{{}}}{}".format(xml_ns, xml_name) + return xml_name + + +def xml_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument,too-many-return-statements + if isinstance(data, dict): + return None + + # Test if this model is XML ready first + if not isinstance(data, ET.Element): + return None + + xml_desc = attr_desc.get("xml", {}) + xml_name = xml_desc.get("name", attr_desc["key"]) + + # Look for a children + is_iter_type = attr_desc["type"].startswith("[") + is_wrapped = xml_desc.get("wrapped", False) + internal_type = attr_desc.get("internalType", None) + internal_type_xml_map = getattr(internal_type, "_xml_map", {}) + + # Integrate namespace if necessary + xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None)) + if xml_ns: + xml_name = "{{{}}}{}".format(xml_ns, xml_name) + + # If it's an attribute, that's simple + if xml_desc.get("attr", False): + return data.get(xml_name) + + # If it's x-ms-text, that's simple too + if xml_desc.get("text", False): + return data.text + + # Scenario where I take the local name: + # - Wrapped node + # - Internal type is an enum (considered basic types) + # - Internal type has no XML/Name node + if is_wrapped or (internal_type and (issubclass(internal_type, Enum) or "name" not in internal_type_xml_map)): + children = data.findall(xml_name) + # If internal type has a local name and it's not a list, I use that name + elif not is_iter_type and internal_type and "name" in internal_type_xml_map: + xml_name = _extract_name_from_internal_type(internal_type) + children = data.findall(xml_name) + # That's an array + else: + if internal_type: # Complex type, ignore itemsName and use the complex type name + items_name = _extract_name_from_internal_type(internal_type) + else: + items_name = xml_desc.get("itemsName", xml_name) + children = data.findall(items_name) + + if len(children) == 0: + if is_iter_type: + if is_wrapped: + return None # is_wrapped no node, we want None + return [] # not wrapped, assume empty list + return None # Assume it's not there, maybe an optional node. + + # If is_iter_type and not wrapped, return all found children + if is_iter_type: + if not is_wrapped: + return children + # Iter and wrapped, should have found one node only (the wrap one) + if len(children) != 1: + raise DeserializationError( + "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( + xml_name + ) + ) + return list(children[0]) # Might be empty list and that's ok. + + # Here it's not a itertype, we should have found one element only or empty + if len(children) > 1: + raise DeserializationError("Find several XML '{}' where it was not expected".format(xml_name)) + return children[0] + + +class Deserializer: + """Response object model deserializer. + + :param dict classes: Class type dictionary for deserializing complex types. + :ivar list key_extractors: Ordered list of extractors to be used by this deserializer. + """ + + basic_types = {str: "str", int: "int", bool: "bool", float: "float"} + + valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") + + def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: + self.deserialize_type = { + "iso-8601": Deserializer.deserialize_iso, + "rfc-1123": Deserializer.deserialize_rfc, + "unix-time": Deserializer.deserialize_unix, + "duration": Deserializer.deserialize_duration, + "date": Deserializer.deserialize_date, + "time": Deserializer.deserialize_time, + "decimal": Deserializer.deserialize_decimal, + "long": Deserializer.deserialize_long, + "bytearray": Deserializer.deserialize_bytearray, + "base64": Deserializer.deserialize_base64, + "object": self.deserialize_object, + "[]": self.deserialize_iter, + "{}": self.deserialize_dict, + } + self.deserialize_expected_types = { + "duration": (isodate.Duration, datetime.timedelta), + "iso-8601": (datetime.datetime), + } + self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.key_extractors = [rest_key_extractor, xml_key_extractor] + # Additional properties only works if the "rest_key_extractor" is used to + # extract the keys. Making it to work whatever the key extractor is too much + # complicated, with no real scenario for now. + # So adding a flag to disable additional properties detection. This flag should be + # used if your expect the deserialization to NOT come from a JSON REST syntax. + # Otherwise, result are unexpected + self.additional_properties_detection = True + + def __call__(self, target_obj, response_data, content_type=None): + """Call the deserializer to process a REST response. + + :param str target_obj: Target data type to deserialize to. + :param requests.Response response_data: REST response object. + :param str content_type: Swagger "produces" if available. + :raises DeserializationError: if deserialization fails. + :return: Deserialized object. + :rtype: object + """ + data = self._unpack_content(response_data, content_type) + return self._deserialize(target_obj, data) + + def _deserialize(self, target_obj, data): # pylint: disable=inconsistent-return-statements + """Call the deserializer on a model. + + Data needs to be already deserialized as JSON or XML ElementTree + + :param str target_obj: Target data type to deserialize to. + :param object data: Object to deserialize. + :raises DeserializationError: if deserialization fails. + :return: Deserialized object. + :rtype: object + """ + # This is already a model, go recursive just in case + if hasattr(data, "_attribute_map"): + constants = [name for name, config in getattr(data, "_validation", {}).items() if config.get("constant")] + try: + for attr, mapconfig in data._attribute_map.items(): # pylint: disable=protected-access + if attr in constants: + continue + value = getattr(data, attr) + if value is None: + continue + local_type = mapconfig["type"] + internal_data_type = local_type.strip("[]{}") + if internal_data_type not in self.dependencies or isinstance(internal_data_type, Enum): + continue + setattr(data, attr, self._deserialize(local_type, value)) + return data + except AttributeError: + return + + response, class_name = self._classify_target(target_obj, data) + + if isinstance(response, str): + return self.deserialize_data(data, response) + if isinstance(response, type) and issubclass(response, Enum): + return self.deserialize_enum(data, response) + + if data is None or data is CoreNull: + return data + try: + attributes = response._attribute_map # type: ignore # pylint: disable=protected-access + d_attrs = {} + for attr, attr_desc in attributes.items(): + # Check empty string. If it's not empty, someone has a real "additionalProperties"... + if attr == "additional_properties" and attr_desc["key"] == "": + continue + raw_value = None + # Enhance attr_desc with some dynamic data + attr_desc = attr_desc.copy() # Do a copy, do not change the real one + internal_data_type = attr_desc["type"].strip("[]{}") + if internal_data_type in self.dependencies: + attr_desc["internalType"] = self.dependencies[internal_data_type] + + for key_extractor in self.key_extractors: + found_value = key_extractor(attr, attr_desc, data) + if found_value is not None: + if raw_value is not None and raw_value != found_value: + msg = ( + "Ignoring extracted value '%s' from %s for key '%s'" + " (duplicate extraction, follow extractors order)" + ) + _LOGGER.warning(msg, found_value, key_extractor, attr) + continue + raw_value = found_value + + value = self.deserialize_data(raw_value, attr_desc["type"]) + d_attrs[attr] = value + except (AttributeError, TypeError, KeyError) as err: + msg = "Unable to deserialize to object: " + class_name # type: ignore + raise DeserializationError(msg) from err + additional_properties = self._build_additional_properties(attributes, data) + return self._instantiate_model(response, d_attrs, additional_properties) + + def _build_additional_properties(self, attribute_map, data): + if not self.additional_properties_detection: + return None + if "additional_properties" in attribute_map and attribute_map.get("additional_properties", {}).get("key") != "": + # Check empty string. If it's not empty, someone has a real "additionalProperties" + return None + if isinstance(data, ET.Element): + data = {el.tag: el.text for el in data} + + known_keys = { + _decode_attribute_map_key(_FLATTEN.split(desc["key"])[0]) + for desc in attribute_map.values() + if desc["key"] != "" + } + present_keys = set(data.keys()) + missing_keys = present_keys - known_keys + return {key: data[key] for key in missing_keys} + + def _classify_target(self, target, data): + """Check to see whether the deserialization target object can + be classified into a subclass. + Once classification has been determined, initialize object. + + :param str target: The target object type to deserialize to. + :param str/dict data: The response data to deserialize. + :return: The classified target object and its class name. + :rtype: tuple + """ + if target is None: + return None, None + + if isinstance(target, str): + try: + target = self.dependencies[target] + except KeyError: + return target, target + + try: + target = target._classify(data, self.dependencies) # type: ignore # pylint: disable=protected-access + except AttributeError: + pass # Target is not a Model, no classify + return target, target.__class__.__name__ # type: ignore + + def failsafe_deserialize(self, target_obj, data, content_type=None): + """Ignores any errors encountered in deserialization, + and falls back to not deserializing the object. Recommended + for use in error deserialization, as we want to return the + HttpResponseError to users, and not have them deal with + a deserialization error. + + :param str target_obj: The target object type to deserialize to. + :param str/dict data: The response data to deserialize. + :param str content_type: Swagger "produces" if available. + :return: Deserialized object. + :rtype: object + """ + try: + return self(target_obj, data, content_type=content_type) + except: # pylint: disable=bare-except + _LOGGER.debug( + "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True + ) + return None + + @staticmethod + def _unpack_content(raw_data, content_type=None): + """Extract the correct structure for deserialization. + + If raw_data is a PipelineResponse, try to extract the result of RawDeserializer. + if we can't, raise. Your Pipeline should have a RawDeserializer. + + If not a pipeline response and raw_data is bytes or string, use content-type + to decode it. If no content-type, try JSON. + + If raw_data is something else, bypass all logic and return it directly. + + :param obj raw_data: Data to be processed. + :param str content_type: How to parse if raw_data is a string/bytes. + :raises JSONDecodeError: If JSON is requested and parsing is impossible. + :raises UnicodeDecodeError: If bytes is not UTF8 + :rtype: object + :return: Unpacked content. + """ + # Assume this is enough to detect a Pipeline Response without importing it + context = getattr(raw_data, "context", {}) + if context: + if RawDeserializer.CONTEXT_NAME in context: + return context[RawDeserializer.CONTEXT_NAME] + raise ValueError("This pipeline didn't have the RawDeserializer policy; can't deserialize") + + # Assume this is enough to recognize universal_http.ClientResponse without importing it + if hasattr(raw_data, "body"): + return RawDeserializer.deserialize_from_http_generics(raw_data.text(), raw_data.headers) + + # Assume this enough to recognize requests.Response without importing it. + if hasattr(raw_data, "_content_consumed"): + return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers) + + if isinstance(raw_data, (str, bytes)) or hasattr(raw_data, "read"): + return RawDeserializer.deserialize_from_text(raw_data, content_type) # type: ignore + return raw_data + + def _instantiate_model(self, response, attrs, additional_properties=None): + """Instantiate a response model passing in deserialized args. + + :param Response response: The response model class. + :param dict attrs: The deserialized response attributes. + :param dict additional_properties: Additional properties to be set. + :rtype: Response + :return: The instantiated response model. + """ + if callable(response): + subtype = getattr(response, "_subtype_map", {}) + try: + readonly = [ + k + for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore + if v.get("readonly") + ] + const = [ + k + for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore + if v.get("constant") + ] + kwargs = {k: v for k, v in attrs.items() if k not in subtype and k not in readonly + const} + response_obj = response(**kwargs) + for attr in readonly: + setattr(response_obj, attr, attrs.get(attr)) + if additional_properties: + response_obj.additional_properties = additional_properties # type: ignore + return response_obj + except TypeError as err: + msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) # type: ignore + raise DeserializationError(msg + str(err)) from err + else: + try: + for attr, value in attrs.items(): + setattr(response, attr, value) + return response + except Exception as exp: + msg = "Unable to populate response model. " + msg += "Type: {}, Error: {}".format(type(response), exp) + raise DeserializationError(msg) from exp + + def deserialize_data(self, data, data_type): # pylint: disable=too-many-return-statements + """Process data for deserialization according to data type. + + :param str data: The response string to be deserialized. + :param str data_type: The type to deserialize to. + :raises DeserializationError: if deserialization fails. + :return: Deserialized object. + :rtype: object + """ + if data is None: + return data + + try: + if not data_type: + return data + if data_type in self.basic_types.values(): + return self.deserialize_basic(data, data_type) + if data_type in self.deserialize_type: + if isinstance(data, self.deserialize_expected_types.get(data_type, tuple())): + return data + + is_a_text_parsing_type = lambda x: x not in [ # pylint: disable=unnecessary-lambda-assignment + "object", + "[]", + r"{}", + ] + if isinstance(data, ET.Element) and is_a_text_parsing_type(data_type) and not data.text: + return None + data_val = self.deserialize_type[data_type](data) + return data_val + + iter_type = data_type[0] + data_type[-1] + if iter_type in self.deserialize_type: + return self.deserialize_type[iter_type](data, data_type[1:-1]) + + obj_type = self.dependencies[data_type] + if issubclass(obj_type, Enum): + if isinstance(data, ET.Element): + data = data.text + return self.deserialize_enum(data, obj_type) + + except (ValueError, TypeError, AttributeError) as err: + msg = "Unable to deserialize response data." + msg += " Data: {}, {}".format(data, data_type) + raise DeserializationError(msg) from err + return self._deserialize(obj_type, data) + + def deserialize_iter(self, attr, iter_type): + """Deserialize an iterable. + + :param list attr: Iterable to be deserialized. + :param str iter_type: The type of object in the iterable. + :return: Deserialized iterable. + :rtype: list + """ + if attr is None: + return None + if isinstance(attr, ET.Element): # If I receive an element here, get the children + attr = list(attr) + if not isinstance(attr, (list, set)): + raise DeserializationError("Cannot deserialize as [{}] an object of type {}".format(iter_type, type(attr))) + return [self.deserialize_data(a, iter_type) for a in attr] + + def deserialize_dict(self, attr, dict_type): + """Deserialize a dictionary. + + :param dict/list attr: Dictionary to be deserialized. Also accepts + a list of key, value pairs. + :param str dict_type: The object type of the items in the dictionary. + :return: Deserialized dictionary. + :rtype: dict + """ + if isinstance(attr, list): + return {x["key"]: self.deserialize_data(x["value"], dict_type) for x in attr} + + if isinstance(attr, ET.Element): + # Transform value into {"Key": "value"} + attr = {el.tag: el.text for el in attr} + return {k: self.deserialize_data(v, dict_type) for k, v in attr.items()} + + def deserialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements + """Deserialize a generic object. + This will be handled as a dictionary. + + :param dict attr: Dictionary to be deserialized. + :return: Deserialized object. + :rtype: dict + :raises TypeError: if non-builtin datatype encountered. + """ + if attr is None: + return None + if isinstance(attr, ET.Element): + # Do no recurse on XML, just return the tree as-is + return attr + if isinstance(attr, str): + return self.deserialize_basic(attr, "str") + obj_type = type(attr) + if obj_type in self.basic_types: + return self.deserialize_basic(attr, self.basic_types[obj_type]) + if obj_type is _long_type: + return self.deserialize_long(attr) + + if obj_type == dict: + deserialized = {} + for key, value in attr.items(): + try: + deserialized[key] = self.deserialize_object(value, **kwargs) + except ValueError: + deserialized[key] = None + return deserialized + + if obj_type == list: + deserialized = [] + for obj in attr: + try: + deserialized.append(self.deserialize_object(obj, **kwargs)) + except ValueError: + pass + return deserialized + + error = "Cannot deserialize generic object with type: " + raise TypeError(error + str(obj_type)) + + def deserialize_basic(self, attr, data_type): # pylint: disable=too-many-return-statements + """Deserialize basic builtin data type from string. + Will attempt to convert to str, int, float and bool. + This function will also accept '1', '0', 'true' and 'false' as + valid bool values. + + :param str attr: response string to be deserialized. + :param str data_type: deserialization data type. + :return: Deserialized basic type. + :rtype: str, int, float or bool + :raises TypeError: if string format is not valid. + """ + # If we're here, data is supposed to be a basic type. + # If it's still an XML node, take the text + if isinstance(attr, ET.Element): + attr = attr.text + if not attr: + if data_type == "str": + # None or '', node is empty string. + return "" + # None or '', node with a strong type is None. + # Don't try to model "empty bool" or "empty int" + return None + + if data_type == "bool": + if attr in [True, False, 1, 0]: + return bool(attr) + if isinstance(attr, str): + if attr.lower() in ["true", "1"]: + return True + if attr.lower() in ["false", "0"]: + return False + raise TypeError("Invalid boolean value: {}".format(attr)) + + if data_type == "str": + return self.deserialize_unicode(attr) + return eval(data_type)(attr) # nosec # pylint: disable=eval-used + + @staticmethod + def deserialize_unicode(data): + """Preserve unicode objects in Python 2, otherwise return data + as a string. + + :param str data: response string to be deserialized. + :return: Deserialized string. + :rtype: str or unicode + """ + # We might be here because we have an enum modeled as string, + # and we try to deserialize a partial dict with enum inside + if isinstance(data, Enum): + return data + + # Consider this is real string + try: + if isinstance(data, unicode): # type: ignore + return data + except NameError: + return str(data) + return str(data) + + @staticmethod + def deserialize_enum(data, enum_obj): + """Deserialize string into enum object. + + If the string is not a valid enum value it will be returned as-is + and a warning will be logged. + + :param str data: Response string to be deserialized. If this value is + None or invalid it will be returned as-is. + :param Enum enum_obj: Enum object to deserialize to. + :return: Deserialized enum object. + :rtype: Enum + """ + if isinstance(data, enum_obj) or data is None: + return data + if isinstance(data, Enum): + data = data.value + if isinstance(data, int): + # Workaround. We might consider remove it in the future. + try: + return list(enum_obj.__members__.values())[data] + except IndexError as exc: + error = "{!r} is not a valid index for enum {!r}" + raise DeserializationError(error.format(data, enum_obj)) from exc + try: + return enum_obj(str(data)) + except ValueError: + for enum_value in enum_obj: + if enum_value.value.lower() == str(data).lower(): + return enum_value + # We don't fail anymore for unknown value, we deserialize as a string + _LOGGER.warning("Deserializer is not able to find %s as valid enum in %s", data, enum_obj) + return Deserializer.deserialize_unicode(data) + + @staticmethod + def deserialize_bytearray(attr): + """Deserialize string into bytearray. + + :param str attr: response string to be deserialized. + :return: Deserialized bytearray + :rtype: bytearray + :raises TypeError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + return bytearray(b64decode(attr)) # type: ignore + + @staticmethod + def deserialize_base64(attr): + """Deserialize base64 encoded string into string. + + :param str attr: response string to be deserialized. + :return: Deserialized base64 string + :rtype: bytearray + :raises TypeError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore + attr = attr + padding # type: ignore + encoded = attr.replace("-", "+").replace("_", "/") + return b64decode(encoded) + + @staticmethod + def deserialize_decimal(attr): + """Deserialize string into Decimal object. + + :param str attr: response string to be deserialized. + :return: Deserialized decimal + :raises DeserializationError: if string format invalid. + :rtype: decimal + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + return decimal.Decimal(str(attr)) # type: ignore + except decimal.DecimalException as err: + msg = "Invalid decimal {}".format(attr) + raise DeserializationError(msg) from err + + @staticmethod + def deserialize_long(attr): + """Deserialize string into long (Py2) or int (Py3). + + :param str attr: response string to be deserialized. + :return: Deserialized int + :rtype: long or int + :raises ValueError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + return _long_type(attr) # type: ignore + + @staticmethod + def deserialize_duration(attr): + """Deserialize ISO-8601 formatted string into TimeDelta object. + + :param str attr: response string to be deserialized. + :return: Deserialized duration + :rtype: TimeDelta + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + duration = isodate.parse_duration(attr) + except (ValueError, OverflowError, AttributeError) as err: + msg = "Cannot deserialize duration object." + raise DeserializationError(msg) from err + return duration + + @staticmethod + def deserialize_date(attr): + """Deserialize ISO-8601 formatted string into Date object. + + :param str attr: response string to be deserialized. + :return: Deserialized date + :rtype: Date + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore + raise DeserializationError("Date must have only digits and -. Received: %s" % attr) + # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. + return isodate.parse_date(attr, defaultmonth=0, defaultday=0) + + @staticmethod + def deserialize_time(attr): + """Deserialize ISO-8601 formatted string into time object. + + :param str attr: response string to be deserialized. + :return: Deserialized time + :rtype: datetime.time + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore + raise DeserializationError("Date must have only digits and -. Received: %s" % attr) + return isodate.parse_time(attr) + + @staticmethod + def deserialize_rfc(attr): + """Deserialize RFC-1123 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :return: Deserialized RFC datetime + :rtype: Datetime + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + parsed_date = email.utils.parsedate_tz(attr) # type: ignore + date_obj = datetime.datetime( + *parsed_date[:6], tzinfo=datetime.timezone(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60)) + ) + if not date_obj.tzinfo: + date_obj = date_obj.astimezone(tz=TZ_UTC) + except ValueError as err: + msg = "Cannot deserialize to rfc datetime object." + raise DeserializationError(msg) from err + return date_obj + + @staticmethod + def deserialize_iso(attr): + """Deserialize ISO-8601 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :return: Deserialized ISO datetime + :rtype: Datetime + :raises DeserializationError: if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + attr = attr.upper() # type: ignore + match = Deserializer.valid_date.match(attr) + if not match: + raise ValueError("Invalid datetime string: " + attr) + + check_decimal = attr.split(".") + if len(check_decimal) > 1: + decimal_str = "" + for digit in check_decimal[1]: + if digit.isdigit(): + decimal_str += digit + else: + break + if len(decimal_str) > 6: + attr = attr.replace(decimal_str, decimal_str[0:6]) + + date_obj = isodate.parse_datetime(attr) + test_utc = date_obj.utctimetuple() + if test_utc.tm_year > 9999 or test_utc.tm_year < 1: + raise OverflowError("Hit max or min date") + except (ValueError, OverflowError, AttributeError) as err: + msg = "Cannot deserialize datetime object." + raise DeserializationError(msg) from err + return date_obj + + @staticmethod + def deserialize_unix(attr): + """Serialize Datetime object into IntTime format. + This is represented as seconds. + + :param int attr: Object to be serialized. + :return: Deserialized datetime + :rtype: Datetime + :raises DeserializationError: if format invalid + """ + if isinstance(attr, ET.Element): + attr = int(attr.text) # type: ignore + try: + attr = int(attr) + date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC) + except ValueError as err: + msg = "Cannot deserialize to unix datetime object." + raise DeserializationError(msg) from err + return date_obj diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_validation.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_validation.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_validation.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_validation.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_vendor.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_version.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_version.py new file mode 100644 index 00000000000..be71c81bd28 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/_version.py @@ -0,0 +1,9 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +VERSION = "1.0.0b1" diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/__init__.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/__init__.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/_client.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_client.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/_client.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_client.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/_configuration.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_configuration.py similarity index 95% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/_configuration.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_configuration.py index a387e70485c..09cf67a568f 100644 --- a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_configuration.py @@ -26,7 +26,7 @@ class PageableClientConfiguration: # pylint: disable=too-many-instance-attribut def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "specs-azure-payload-pageable/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "payload-pageable/{}".format(VERSION)) self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/_operations/__init__.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_operations/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/_operations/__init__.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_operations/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_operations/_operations.py similarity index 97% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/_operations/_operations.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_operations/_operations.py index c02b0ea036e..057a598545f 100644 --- a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_operations/_operations.py @@ -42,7 +42,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.User"]: """List users. :return: An iterator like instance of User - :rtype: ~azure.core.async_paging.AsyncItemPaged[~specs.azure.payload.pageable.models.User] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.payload.pageable.models.User] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_operations/_patch.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_operations/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_operations/_patch.py @@ -0,0 +1,21 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_patch.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_patch.py @@ -0,0 +1,21 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/_vendor.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_vendor.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/aio/_vendor.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/aio/_vendor.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/models/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/models/__init__.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/models/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/models/_models.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/models/_models.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/pageable/models/_models.py rename to packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/models/_models.py diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/models/_patch.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/models/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/models/_patch.py @@ -0,0 +1,21 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/py.typed b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/py.typed new file mode 100644 index 00000000000..e5aff4f83af --- /dev/null +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/azure/payload/pageable/py.typed @@ -0,0 +1 @@ +# Marker file for PEP 561. \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/generated_tests/testpreparer.py index 97506d440e4..f5eda2da88c 100644 --- a/packages/typespec-python/test/azure/generated/azure-payload-pageable/generated_tests/testpreparer.py +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/generated_tests/testpreparer.py @@ -5,9 +5,9 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.payload.pageable import PageableClient from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer import functools -from specs.azure.payload.pageable import PageableClient class PageableClientTestBase(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/generated_tests/testpreparer_async.py index 89fed6a680a..64f2fa5e244 100644 --- a/packages/typespec-python/test/azure/generated/azure-payload-pageable/generated_tests/testpreparer_async.py +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/generated_tests/testpreparer_async.py @@ -5,8 +5,8 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from azure.payload.pageable.aio import PageableClient from devtools_testutils import AzureRecordedTestCase -from specs.azure.payload.pageable.aio import PageableClient class PageableClientTestBaseAsync(AzureRecordedTestCase): diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/setup.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/setup.py index 8fc0046daad..94d05019769 100644 --- a/packages/typespec-python/test/azure/generated/azure-payload-pageable/setup.py +++ b/packages/typespec-python/test/azure/generated/azure-payload-pageable/setup.py @@ -12,8 +12,8 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "specs-azure-payload-pageable" -PACKAGE_PPRINT_NAME = "Specs Azure Payload Pageable" +PACKAGE_NAME = "azure-payload-pageable" +PACKAGE_PPRINT_NAME = "Azure Payload Pageable" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace("-", "/") @@ -53,14 +53,13 @@ exclude=[ "tests", # Exclude packages that will be covered by PEP420 or nspkg - "specs", - "specs.azure", - "specs.azure.payload", + "azure", + "azure.payload", ] ), include_package_data=True, package_data={ - "specs.azure.payload.pageable": ["py.typed"], + "azure.payload.pageable": ["py.typed"], }, install_requires=[ "isodate>=0.6.1", diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/__init__.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/__init__.py deleted file mode 100644 index d55ccad1f57..00000000000 --- a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/__init__.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/__init__.py deleted file mode 100644 index d55ccad1f57..00000000000 --- a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/__init__.py b/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/__init__.py deleted file mode 100644 index d55ccad1f57..00000000000 --- a/packages/typespec-python/test/azure/generated/azure-payload-pageable/specs/azure/payload/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/apiview-properties.json b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/apiview-properties.json index a4d80c3dc3a..860722b0184 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/apiview-properties.json +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/apiview-properties.json @@ -7,6 +7,7 @@ "azure.resourcemanager.operationtemplates.models.ErrorDetail": "Azure.ResourceManager.CommonTypes.ErrorDetail", "azure.resourcemanager.operationtemplates.models.ErrorResponse": "Azure.ResourceManager.CommonTypes.ErrorResponse", "azure.resourcemanager.operationtemplates.models.ExportRequest": "Azure.ResourceManager.OperationTemplates.ExportRequest", + "azure.resourcemanager.operationtemplates.models.ExportResult": "Azure.ResourceManager.OperationTemplates.ExportResult", "azure.resourcemanager.operationtemplates.models.Operation": "Azure.ResourceManager.CommonTypes.Operation", "azure.resourcemanager.operationtemplates.models.OperationDisplay": "Azure.ResourceManager.CommonTypes.OperationDisplay", "azure.resourcemanager.operationtemplates.models.Resource": "Azure.ResourceManager.CommonTypes.Resource", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/aio/operations/_operations.py index 93e1da2a2f1..0ee9a00adf7 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/aio/operations/_operations.py @@ -767,7 +767,7 @@ async def begin_export( *, content_type: str = "application/json", **kwargs: Any - ) -> AsyncLROPoller[None]: + ) -> AsyncLROPoller[_models.ExportResult]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -780,8 +780,10 @@ async def begin_export( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :return: An instance of AsyncLROPoller that returns None - :rtype: ~azure.core.polling.AsyncLROPoller[None] + :return: An instance of AsyncLROPoller that returns ExportResult. The ExportResult is + compatible with MutableMapping + :rtype: + ~azure.core.polling.AsyncLROPoller[~azure.resourcemanager.operationtemplates.models.ExportResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -794,7 +796,7 @@ async def begin_export( *, content_type: str = "application/json", **kwargs: Any - ) -> AsyncLROPoller[None]: + ) -> AsyncLROPoller[_models.ExportResult]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -807,8 +809,10 @@ async def begin_export( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :return: An instance of AsyncLROPoller that returns None - :rtype: ~azure.core.polling.AsyncLROPoller[None] + :return: An instance of AsyncLROPoller that returns ExportResult. The ExportResult is + compatible with MutableMapping + :rtype: + ~azure.core.polling.AsyncLROPoller[~azure.resourcemanager.operationtemplates.models.ExportResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -821,7 +825,7 @@ async def begin_export( *, content_type: str = "application/json", **kwargs: Any - ) -> AsyncLROPoller[None]: + ) -> AsyncLROPoller[_models.ExportResult]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -834,8 +838,10 @@ async def begin_export( :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :return: An instance of AsyncLROPoller that returns None - :rtype: ~azure.core.polling.AsyncLROPoller[None] + :return: An instance of AsyncLROPoller that returns ExportResult. The ExportResult is + compatible with MutableMapping + :rtype: + ~azure.core.polling.AsyncLROPoller[~azure.resourcemanager.operationtemplates.models.ExportResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -846,7 +852,7 @@ async def begin_export( order_name: str, body: Union[_models.ExportRequest, JSON, IO[bytes]], **kwargs: Any - ) -> AsyncLROPoller[None]: + ) -> AsyncLROPoller[_models.ExportResult]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -857,15 +863,17 @@ async def begin_export( :param body: The content of the action request. Is one of the following types: ExportRequest, JSON, IO[bytes] Required. :type body: ~azure.resourcemanager.operationtemplates.models.ExportRequest or JSON or IO[bytes] - :return: An instance of AsyncLROPoller that returns None - :rtype: ~azure.core.polling.AsyncLROPoller[None] + :return: An instance of AsyncLROPoller that returns ExportResult. The ExportResult is + compatible with MutableMapping + :rtype: + ~azure.core.polling.AsyncLROPoller[~azure.resourcemanager.operationtemplates.models.ExportResult] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) + cls: ClsType[_models.ExportResult] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token: Optional[str] = kwargs.pop("continuation_token", None) @@ -883,9 +891,19 @@ async def begin_export( await raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) - def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements + def get_long_running_output(pipeline_response): + response_headers = {} + response = pipeline_response.http_response + response_headers["Azure-AsyncOperation"] = self._deserialize( + "str", response.headers.get("Azure-AsyncOperation") + ) + response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) + + deserialized = _deserialize(_models.ExportResult, response.json()) if cls: - return cls(pipeline_response, None, {}) # type: ignore + return cls(pipeline_response, deserialized, response_headers) # type: ignore + return deserialized path_format_arguments = { "endpoint": self._serialize.url("self._config.base_url", self._config.base_url, "str", skip_quote=True), @@ -900,13 +918,15 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent- else: polling_method = polling if cont_token: - return AsyncLROPoller[None].from_continuation_token( + return AsyncLROPoller[_models.ExportResult].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore + return AsyncLROPoller[_models.ExportResult]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) async def _delete_initial(self, resource_group_name: str, order_name: str, **kwargs: Any) -> AsyncIterator[bytes]: error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/__init__.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/__init__.py index 7b636e9a55d..38d45321f5f 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/__init__.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/__init__.py @@ -20,6 +20,7 @@ ErrorDetail, ErrorResponse, ExportRequest, + ExportResult, Operation, OperationDisplay, Order, @@ -46,6 +47,7 @@ "ErrorDetail", "ErrorResponse", "ExportRequest", + "ExportResult", "Operation", "OperationDisplay", "Order", diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/_models.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/_models.py index 43fed9e0a8f..8fb824dab0e 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/models/_models.py @@ -198,6 +198,34 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) +class ExportResult(_model_base.Model): + """ExportResult. + + :ivar content: Content of the exported order. Required. + :vartype content: str + """ + + content: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) + """Content of the exported order. Required.""" + + @overload + def __init__( + self, + *, + content: str, + ) -> None: ... + + @overload + def __init__(self, mapping: Mapping[str, Any]) -> None: + """ + :param mapping: raw JSON to initialize the model. + :type mapping: Mapping[str, Any] + """ + + def __init__(self, *args: Any, **kwargs: Any) -> None: + super().__init__(*args, **kwargs) + + class Operation(_model_base.Model): """Details of a REST API operation, returned from the Resource Provider Operations API. diff --git a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/operations/_operations.py index cf6659db784..b2906cb9406 100644 --- a/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/operations/_operations.py @@ -925,7 +925,7 @@ def begin_export( *, content_type: str = "application/json", **kwargs: Any - ) -> LROPoller[None]: + ) -> LROPoller[_models.ExportResult]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -938,8 +938,10 @@ def begin_export( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :return: An instance of LROPoller that returns None - :rtype: ~azure.core.polling.LROPoller[None] + :return: An instance of LROPoller that returns ExportResult. The ExportResult is compatible + with MutableMapping + :rtype: + ~azure.core.polling.LROPoller[~azure.resourcemanager.operationtemplates.models.ExportResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -952,7 +954,7 @@ def begin_export( *, content_type: str = "application/json", **kwargs: Any - ) -> LROPoller[None]: + ) -> LROPoller[_models.ExportResult]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -965,8 +967,10 @@ def begin_export( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :return: An instance of LROPoller that returns None - :rtype: ~azure.core.polling.LROPoller[None] + :return: An instance of LROPoller that returns ExportResult. The ExportResult is compatible + with MutableMapping + :rtype: + ~azure.core.polling.LROPoller[~azure.resourcemanager.operationtemplates.models.ExportResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -979,7 +983,7 @@ def begin_export( *, content_type: str = "application/json", **kwargs: Any - ) -> LROPoller[None]: + ) -> LROPoller[_models.ExportResult]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -992,8 +996,10 @@ def begin_export( :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :return: An instance of LROPoller that returns None - :rtype: ~azure.core.polling.LROPoller[None] + :return: An instance of LROPoller that returns ExportResult. The ExportResult is compatible + with MutableMapping + :rtype: + ~azure.core.polling.LROPoller[~azure.resourcemanager.operationtemplates.models.ExportResult] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1004,7 +1010,7 @@ def begin_export( order_name: str, body: Union[_models.ExportRequest, JSON, IO[bytes]], **kwargs: Any - ) -> LROPoller[None]: + ) -> LROPoller[_models.ExportResult]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -1015,15 +1021,17 @@ def begin_export( :param body: The content of the action request. Is one of the following types: ExportRequest, JSON, IO[bytes] Required. :type body: ~azure.resourcemanager.operationtemplates.models.ExportRequest or JSON or IO[bytes] - :return: An instance of LROPoller that returns None - :rtype: ~azure.core.polling.LROPoller[None] + :return: An instance of LROPoller that returns ExportResult. The ExportResult is compatible + with MutableMapping + :rtype: + ~azure.core.polling.LROPoller[~azure.resourcemanager.operationtemplates.models.ExportResult] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) + cls: ClsType[_models.ExportResult] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token: Optional[str] = kwargs.pop("continuation_token", None) @@ -1041,9 +1049,19 @@ def begin_export( raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) - def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements + def get_long_running_output(pipeline_response): + response_headers = {} + response = pipeline_response.http_response + response_headers["Azure-AsyncOperation"] = self._deserialize( + "str", response.headers.get("Azure-AsyncOperation") + ) + response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) + + deserialized = _deserialize(_models.ExportResult, response.json()) if cls: - return cls(pipeline_response, None, {}) # type: ignore + return cls(pipeline_response, deserialized, response_headers) # type: ignore + return deserialized path_format_arguments = { "endpoint": self._serialize.url("self._config.base_url", self._config.base_url, "str", skip_quote=True), @@ -1058,13 +1076,15 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent- else: polling_method = polling if cont_token: - return LROPoller[None].from_continuation_token( + return LROPoller[_models.ExportResult].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore + return LROPoller[_models.ExportResult]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) def _delete_initial(self, resource_group_name: str, order_name: str, **kwargs: Any) -> Iterator[bytes]: error_map: MutableMapping = { diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/_client.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/_client.py index 14f4ad71030..b6a75654931 100644 --- a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/_client.py +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/_client.py @@ -17,7 +17,9 @@ from . import models as _models from ._configuration import ServiceClientConfiguration from ._serialization import Deserializer, Serializer -from .operations import BarOperations, BazOperations, FooOperations, QuxOperations, ServiceClientOperationsMixin +from .baz.operations import BazOperations +from .operations import BarOperations, FooOperations, ServiceClientOperationsMixin +from .qux.operations import QuxOperations class ServiceClient(ServiceClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/aio/_client.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/aio/_client.py index a59b3a26d57..ac69e7b71d3 100644 --- a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/aio/_client.py +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/aio/_client.py @@ -14,10 +14,12 @@ from azure.core.pipeline import policies from azure.core.rest import AsyncHttpResponse, HttpRequest -from .. import models as _models +from .. import models as _models1 from .._serialization import Deserializer, Serializer +from ..baz.aio.operations import BazOperations +from ..qux.aio.operations import QuxOperations from ._configuration import ServiceClientConfiguration -from .operations import BarOperations, BazOperations, FooOperations, QuxOperations, ServiceClientOperationsMixin +from .operations import BarOperations, FooOperations, ServiceClientOperationsMixin class ServiceClient(ServiceClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword @@ -49,7 +51,7 @@ class ServiceClient(ServiceClientOperationsMixin): # pylint: disable=client-acc """ def __init__( # pylint: disable=missing-client-constructor-parameter-credential - self, endpoint: str, client: Union[str, _models.ClientType], **kwargs: Any + self, endpoint: str, client: Union[str, _models1.ClientType], **kwargs: Any ) -> None: _endpoint = "{endpoint}/client/structure/{client}" self._config = ServiceClientConfiguration(endpoint=endpoint, client=client, **kwargs) diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/aio/_configuration.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/aio/_configuration.py index deab582a1ff..26c7e1c94e1 100644 --- a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/aio/_configuration.py +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/aio/_configuration.py @@ -10,7 +10,7 @@ from azure.core.pipeline import policies -from .. import models as _models +from .. import models as _models1 from .._version import VERSION diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/aio/operations/__init__.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/aio/operations/__init__.py index 3560145a703..7a5f390b339 100644 --- a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/aio/operations/__init__.py +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/aio/operations/__init__.py @@ -12,8 +12,6 @@ if TYPE_CHECKING: from ._patch import * # pylint: disable=unused-wildcard-import -from ._operations import BazOperations # type: ignore -from ._operations import QuxOperations # type: ignore from ._operations import FooOperations # type: ignore from ._operations import BarOperations # type: ignore from ._operations import ServiceClientOperationsMixin # type: ignore @@ -23,8 +21,6 @@ from ._patch import patch_sdk as _patch_sdk __all__ = [ - "BazOperations", - "QuxOperations", "FooOperations", "BarOperations", "ServiceClientOperationsMixin", diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/aio/operations/_operations.py index bf454ec36c0..cfe1a2f601b 100644 --- a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/aio/operations/_operations.py @@ -26,11 +26,8 @@ from ...operations._operations import ( build_bar_five_request, build_bar_six_request, - build_baz_foo_seven_request, build_foo_four_request, build_foo_three_request, - build_qux_bar_nine_request, - build_qux_eight_request, build_service_one_request, build_service_two_request, ) @@ -41,91 +38,6 @@ ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] -class BazOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~client.structure.service.aio.ServiceClient`'s - :attr:`baz` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: ServiceClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - self.foo = BazFooOperations(self._client, self._config, self._serialize, self._deserialize) - - -class QuxOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~client.structure.service.aio.ServiceClient`'s - :attr:`qux` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: ServiceClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - self.bar = QuxBarOperations(self._client, self._config, self._serialize, self._deserialize) - - @distributed_trace_async - async def eight(self, **kwargs: Any) -> None: - """eight. - - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_qux_eight_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - "client": self._serialize.url("self._config.client", self._config.client, "str"), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - class FooOperations: """ .. warning:: @@ -433,129 +345,3 @@ async def two(self, **kwargs: Any) -> None: if cls: return cls(pipeline_response, None, {}) # type: ignore - - -class BazFooOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~client.structure.service.aio.ServiceClient`'s - :attr:`foo` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: ServiceClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace_async - async def seven(self, **kwargs: Any) -> None: - """seven. - - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_baz_foo_seven_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - "client": self._serialize.url("self._config.client", self._config.client, "str"), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class QuxBarOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~client.structure.service.aio.ServiceClient`'s - :attr:`bar` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: ServiceClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace_async - async def nine(self, **kwargs: Any) -> None: - """nine. - - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_qux_bar_nine_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - "client": self._serialize.url("self._config.client", self._config.client, "str"), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/__init__.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/__init__.py rename to packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/__init__.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/__init__.py rename to packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/aio/operations/__init__.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/aio/operations/__init__.py new file mode 100644 index 00000000000..b4a3b318840 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/aio/operations/__init__.py @@ -0,0 +1,25 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._operations import BazOperations # type: ignore + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "BazOperations", +] +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore +_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/aio/operations/_operations.py new file mode 100644 index 00000000000..51bdcdbe140 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/aio/operations/_operations.py @@ -0,0 +1,112 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from collections.abc import MutableMapping +from typing import Any, Callable, Dict, Optional, TypeVar + +from azure.core import AsyncPipelineClient +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) +from azure.core.pipeline import PipelineResponse +from azure.core.rest import AsyncHttpResponse, HttpRequest +from azure.core.tracing.decorator_async import distributed_trace_async + +from ...._serialization import Deserializer, Serializer +from ....aio._configuration import ServiceClientConfiguration +from ...operations._operations import build_baz_foo_seven_request + +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + + +class BazOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~client.structure.service.aio.ServiceClient`'s + :attr:`baz` attribute. + """ + + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: ServiceClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") + + self.foo = BazFooOperations(self._client, self._config, self._serialize, self._deserialize) + + +class BazFooOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~client.structure.service.aio.ServiceClient`'s + :attr:`foo` attribute. + """ + + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: ServiceClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") + + @distributed_trace_async + async def seven(self, **kwargs: Any) -> None: + """seven. + + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_baz_foo_seven_request( + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + "client": self._serialize.url("self._config.client", self._config.client, "str"), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/aio/operations/_patch.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/aio/operations/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/aio/operations/_patch.py @@ -0,0 +1,21 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/operations/__init__.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/operations/__init__.py new file mode 100644 index 00000000000..b4a3b318840 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/operations/__init__.py @@ -0,0 +1,25 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._operations import BazOperations # type: ignore + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "BazOperations", +] +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore +_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/operations/_operations.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/operations/_operations.py new file mode 100644 index 00000000000..2279ed066d3 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/operations/_operations.py @@ -0,0 +1,121 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from collections.abc import MutableMapping +from typing import Any, Callable, Dict, Optional, TypeVar + +from azure.core import PipelineClient +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) +from azure.core.pipeline import PipelineResponse +from azure.core.rest import HttpRequest, HttpResponse +from azure.core.tracing.decorator import distributed_trace + +from ..._configuration import ServiceClientConfiguration +from ..._serialization import Deserializer, Serializer + +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +_SERIALIZER = Serializer() +_SERIALIZER.client_side_validation = False + + +def build_baz_foo_seven_request(**kwargs: Any) -> HttpRequest: + # Construct URL + _url = "/seven" + + return HttpRequest(method="POST", url=_url, **kwargs) + + +class BazOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~client.structure.service.ServiceClient`'s + :attr:`baz` attribute. + """ + + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: ServiceClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") + + self.foo = BazFooOperations(self._client, self._config, self._serialize, self._deserialize) + + +class BazFooOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~client.structure.service.ServiceClient`'s + :attr:`foo` attribute. + """ + + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: ServiceClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") + + @distributed_trace + def seven(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + """seven. + + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_baz_foo_seven_request( + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + "client": self._serialize.url("self._config.client", self._config.client, "str"), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/operations/_patch.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/operations/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/baz/operations/_patch.py @@ -0,0 +1,21 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/operations/__init__.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/operations/__init__.py index 3560145a703..7a5f390b339 100644 --- a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/operations/__init__.py +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/operations/__init__.py @@ -12,8 +12,6 @@ if TYPE_CHECKING: from ._patch import * # pylint: disable=unused-wildcard-import -from ._operations import BazOperations # type: ignore -from ._operations import QuxOperations # type: ignore from ._operations import FooOperations # type: ignore from ._operations import BarOperations # type: ignore from ._operations import ServiceClientOperationsMixin # type: ignore @@ -23,8 +21,6 @@ from ._patch import patch_sdk as _patch_sdk __all__ = [ - "BazOperations", - "QuxOperations", "FooOperations", "BarOperations", "ServiceClientOperationsMixin", diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/operations/_operations.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/operations/_operations.py index 55a13f4c1bb..4647ad6bb5f 100644 --- a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/operations/_operations.py @@ -32,13 +32,6 @@ _SERIALIZER.client_side_validation = False -def build_qux_eight_request(**kwargs: Any) -> HttpRequest: - # Construct URL - _url = "/eight" - - return HttpRequest(method="POST", url=_url, **kwargs) - - def build_foo_three_request(**kwargs: Any) -> HttpRequest: # Construct URL _url = "/three" @@ -81,105 +74,6 @@ def build_service_two_request(**kwargs: Any) -> HttpRequest: return HttpRequest(method="POST", url=_url, **kwargs) -def build_baz_foo_seven_request(**kwargs: Any) -> HttpRequest: - # Construct URL - _url = "/seven" - - return HttpRequest(method="POST", url=_url, **kwargs) - - -def build_qux_bar_nine_request(**kwargs: Any) -> HttpRequest: - # Construct URL - _url = "/nine" - - return HttpRequest(method="POST", url=_url, **kwargs) - - -class BazOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~client.structure.service.ServiceClient`'s - :attr:`baz` attribute. - """ - - def __init__(self, *args, **kwargs): - input_args = list(args) - self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: ServiceClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - self.foo = BazFooOperations(self._client, self._config, self._serialize, self._deserialize) - - -class QuxOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~client.structure.service.ServiceClient`'s - :attr:`qux` attribute. - """ - - def __init__(self, *args, **kwargs): - input_args = list(args) - self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: ServiceClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - self.bar = QuxBarOperations(self._client, self._config, self._serialize, self._deserialize) - - @distributed_trace - def eight(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements - """eight. - - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_qux_eight_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - "client": self._serialize.url("self._config.client", self._config.client, "str"), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - class FooOperations: """ .. warning:: @@ -487,129 +381,3 @@ def two(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-sta if cls: return cls(pipeline_response, None, {}) # type: ignore - - -class BazFooOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~client.structure.service.ServiceClient`'s - :attr:`foo` attribute. - """ - - def __init__(self, *args, **kwargs): - input_args = list(args) - self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: ServiceClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace - def seven(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements - """seven. - - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_baz_foo_seven_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - "client": self._serialize.url("self._config.client", self._config.client, "str"), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class QuxBarOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~client.structure.service.ServiceClient`'s - :attr:`bar` attribute. - """ - - def __init__(self, *args, **kwargs): - input_args = list(args) - self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: ServiceClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace - def nine(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements - """nine. - - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_qux_bar_nine_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - "client": self._serialize.url("self._config.client", self._config.client, "str"), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/__init__.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/__init__.py rename to packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/__init__.py diff --git a/packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/__init__.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/aio/__init__.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-encode-duration/specs/azure/encode/__init__.py rename to packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/aio/__init__.py diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/aio/operations/__init__.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/aio/operations/__init__.py new file mode 100644 index 00000000000..fde2c7d7e1c --- /dev/null +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/aio/operations/__init__.py @@ -0,0 +1,25 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._operations import QuxOperations # type: ignore + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "QuxOperations", +] +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore +_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/aio/operations/_operations.py new file mode 100644 index 00000000000..5b603aef3b9 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/aio/operations/_operations.py @@ -0,0 +1,157 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from collections.abc import MutableMapping +from typing import Any, Callable, Dict, Optional, TypeVar + +from azure.core import AsyncPipelineClient +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) +from azure.core.pipeline import PipelineResponse +from azure.core.rest import AsyncHttpResponse, HttpRequest +from azure.core.tracing.decorator_async import distributed_trace_async + +from ...._serialization import Deserializer, Serializer +from ....aio._configuration import ServiceClientConfiguration +from ...operations._operations import build_qux_bar_nine_request, build_qux_eight_request + +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + + +class QuxOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~client.structure.service.aio.ServiceClient`'s + :attr:`qux` attribute. + """ + + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: ServiceClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") + + self.bar = QuxBarOperations(self._client, self._config, self._serialize, self._deserialize) + + @distributed_trace_async + async def eight(self, **kwargs: Any) -> None: + """eight. + + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_qux_eight_request( + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + "client": self._serialize.url("self._config.client", self._config.client, "str"), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + +class QuxBarOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~client.structure.service.aio.ServiceClient`'s + :attr:`bar` attribute. + """ + + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: ServiceClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") + + @distributed_trace_async + async def nine(self, **kwargs: Any) -> None: + """nine. + + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_qux_bar_nine_request( + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + "client": self._serialize.url("self._config.client", self._config.client, "str"), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/aio/operations/_patch.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/aio/operations/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/aio/operations/_patch.py @@ -0,0 +1,21 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/operations/__init__.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/operations/__init__.py new file mode 100644 index 00000000000..fde2c7d7e1c --- /dev/null +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/operations/__init__.py @@ -0,0 +1,25 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._operations import QuxOperations # type: ignore + +from ._patch import __all__ as _patch_all +from ._patch import * +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "QuxOperations", +] +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore +_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/operations/_operations.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/operations/_operations.py new file mode 100644 index 00000000000..3a70d3c8c15 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/operations/_operations.py @@ -0,0 +1,173 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from collections.abc import MutableMapping +from typing import Any, Callable, Dict, Optional, TypeVar + +from azure.core import PipelineClient +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) +from azure.core.pipeline import PipelineResponse +from azure.core.rest import HttpRequest, HttpResponse +from azure.core.tracing.decorator import distributed_trace + +from ..._configuration import ServiceClientConfiguration +from ..._serialization import Deserializer, Serializer + +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +_SERIALIZER = Serializer() +_SERIALIZER.client_side_validation = False + + +def build_qux_eight_request(**kwargs: Any) -> HttpRequest: + # Construct URL + _url = "/eight" + + return HttpRequest(method="POST", url=_url, **kwargs) + + +def build_qux_bar_nine_request(**kwargs: Any) -> HttpRequest: + # Construct URL + _url = "/nine" + + return HttpRequest(method="POST", url=_url, **kwargs) + + +class QuxOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~client.structure.service.ServiceClient`'s + :attr:`qux` attribute. + """ + + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: ServiceClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") + + self.bar = QuxBarOperations(self._client, self._config, self._serialize, self._deserialize) + + @distributed_trace + def eight(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + """eight. + + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_qux_eight_request( + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + "client": self._serialize.url("self._config.client", self._config.client, "str"), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore + + +class QuxBarOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~client.structure.service.ServiceClient`'s + :attr:`bar` attribute. + """ + + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: ServiceClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") + + @distributed_trace + def nine(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + """nine. + + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_qux_bar_nine_request( + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + "client": self._serialize.url("self._config.client", self._config.client, "str"), + } + _request.url = self._client.format_url(_request.url, **path_format_arguments) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/operations/_patch.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/operations/_patch.py new file mode 100644 index 00000000000..8bcb627aa47 --- /dev/null +++ b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/qux/operations/_patch.py @@ -0,0 +1,21 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------- +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_access_async.py b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_access_async.py index d1b6728a30e..85479bfd2ff 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_access_async.py +++ b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_access_async.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.clientgenerator.core.access.aio import AccessClient -from specs.azure.clientgenerator.core.access import models +from azure.clientgenerator.core.access.aio import AccessClient +from azure.clientgenerator.core.access import models @pytest.fixture @@ -32,7 +32,7 @@ async def test_no_decorator_in_internal(client: AccessClient): assert result == models._models.NoDecoratorModelInInternal(name="sample") with pytest.raises(ImportError): - from specs.azure.clientgenerator.core.access.models import NoDecoratorModelInInternal + from azure.clientgenerator.core.access.models import NoDecoratorModelInInternal with pytest.raises(AttributeError): await client.internal_operation.no_decorator_in_internal(name="sample") @@ -44,7 +44,7 @@ async def test_internal_decorator_in_internal(client: AccessClient): assert result == models._models.InternalDecoratorModelInInternal(name="sample") with pytest.raises(ImportError): - from specs.azure.clientgenerator.core.access.models import InternalDecoratorModelInInternal + from azure.clientgenerator.core.access.models import InternalDecoratorModelInInternal with pytest.raises(AttributeError): await client.internal_operation.internal_decorator_in_internal(name="sample") @@ -80,10 +80,10 @@ async def test_operation(client: AccessClient): assert result == models._models.OuterModel(name="Madge", inner=models._models.InnerModel(name="Madge")) with pytest.raises(ImportError): - from specs.azure.clientgenerator.core.access.models import OuterModel + from azure.clientgenerator.core.access.models import OuterModel with pytest.raises(ImportError): - from specs.azure.clientgenerator.core.access.models import InnerModel + from azure.clientgenerator.core.access.models import InnerModel with pytest.raises(AttributeError): await client.shared_model_in_operation.operation(name="Madge") @@ -95,7 +95,7 @@ async def test_discriminator(client: AccessClient): assert result == models._models.RealModel(name="Madge") with pytest.raises(ImportError): - from specs.azure.clientgenerator.core.access.models import RealModel + from azure.clientgenerator.core.access.models import RealModel with pytest.raises(AttributeError): await client.shared_model_in_operation.discriminator(kind="real") 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/azure/mock_api_tests/asynctests/test_azure_client_generator_core_flatten_async.py index 2ff5d0af0ea..58f626eeb88 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_flatten_async.py +++ b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_flatten_async.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.clientgenerator.core.flattenproperty.aio import FlattenPropertyClient -from specs.azure.clientgenerator.core.flattenproperty.models import ( +from azure.clientgenerator.core.flattenproperty.aio import FlattenPropertyClient +from azure.clientgenerator.core.flattenproperty.models import ( FlattenModel, ChildModel, NestedFlattenModel, diff --git a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_usage_async.py b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_usage_async.py index af1b31e92ff..b6710718ab0 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_usage_async.py +++ b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_usage_async.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.clientgenerator.core.usage.aio import UsageClient -from specs.azure.clientgenerator.core.usage import models +from azure.clientgenerator.core.usage.aio import UsageClient +from azure.clientgenerator.core.usage import models @pytest.fixture diff --git a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_basic_async.py b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_basic_async.py index 87946f37ca2..2027a85bf73 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_basic_async.py +++ b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_basic_async.py @@ -4,7 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.core.basic import models, aio +from azure.core.basic import models, aio VALID_USER = models.User(id=1, name="Madge", etag="11bdc430-65e8-45ad-81d9-8ffa60d55b59") diff --git a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_lro_rpc_async.py b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_lro_rpc_async.py index bc572bf298b..64666388a03 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_lro_rpc_async.py +++ b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_lro_rpc_async.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.core.lro.rpc.aio import RpcClient -from specs.azure.core.lro.rpc import models +from azure.core.lro.rpc.aio import RpcClient +from azure.core.lro.rpc import models @pytest.fixture diff --git a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_lro_standard_async.py b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_lro_standard_async.py index b9b00668cae..27084e0a50d 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_lro_standard_async.py +++ b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_lro_standard_async.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.core.lro.standard.aio import StandardClient -from specs.azure.core.lro.standard.models import User, ExportedUser +from azure.core.lro.standard.aio import StandardClient +from azure.core.lro.standard.models import User, ExportedUser @pytest.fixture diff --git a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_model_async.py b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_model_async.py index b2f8eed8952..1bb85e84988 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_model_async.py +++ b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_model_async.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.core.model.aio import ModelClient -from specs.azure.core.model.models import AzureEmbeddingModel +from azure.core.model.aio import ModelClient +from azure.core.model.models import AzureEmbeddingModel @pytest.fixture diff --git a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_page_async.py b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_page_async.py index 980083bc222..c718bcc1779 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_page_async.py +++ b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_page_async.py @@ -5,7 +5,7 @@ # -------------------------------------------------------------------------- import pytest from typing import AsyncIterable -from specs.azure.core.page import models, aio +from azure.core.page import models, aio VALID_USER = models.User(id=1, name="Madge", etag="11bdc430-65e8-45ad-81d9-8ffa60d55b59") diff --git a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_scalar_async.py b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_scalar_async.py index 4616cc2b5e4..d1727a29a35 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_scalar_async.py +++ b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_scalar_async.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.core.scalar.aio import ScalarClient -from specs.azure.core.scalar import models +from azure.core.scalar.aio import ScalarClient +from azure.core.scalar import models @pytest.fixture diff --git a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_traits_async.py b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_traits_async.py index dca81854423..3a373a68f85 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_traits_async.py +++ b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_core_traits_async.py @@ -9,8 +9,8 @@ import pytest from azure.core.exceptions import HttpResponseError from azure.core import MatchConditions -from specs.azure.core.traits.aio import TraitsClient -from specs.azure.core.traits.models import UserActionParam +from azure.core.traits.aio import TraitsClient +from azure.core.traits.models import UserActionParam @pytest.fixture diff --git a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_example_basic_async.py b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_example_basic_async.py index 46a66e519d0..f6f44478ab5 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_example_basic_async.py +++ b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_example_basic_async.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.example.basic.aio import AzureExampleClient -from specs.azure.example.basic.models import ActionRequest, Model +from azure.example.basic.aio import AzureExampleClient +from azure.example.basic.models import ActionRequest, Model @pytest.fixture diff --git a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_payload_pageable_async.py b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_payload_pageable_async.py index 440a4a51170..b7c8f2ee25d 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_payload_pageable_async.py +++ b/packages/typespec-python/test/azure/mock_api_tests/asynctests/test_azure_payload_pageable_async.py @@ -4,7 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.payload.pageable.aio import PageableClient +from azure.payload.pageable.aio import PageableClient @pytest.fixture diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_access.py b/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_access.py index ba26314706e..72781d27803 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_access.py +++ b/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_access.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.clientgenerator.core.access import AccessClient -from specs.azure.clientgenerator.core.access import models +from azure.clientgenerator.core.access import AccessClient +from azure.clientgenerator.core.access import models @pytest.fixture @@ -29,7 +29,7 @@ def test_no_decorator_in_internal(client: AccessClient): assert result == models._models.NoDecoratorModelInInternal(name="sample") with pytest.raises(ImportError): - from specs.azure.clientgenerator.core.access.models import NoDecoratorModelInInternal + from azure.clientgenerator.core.access.models import NoDecoratorModelInInternal with pytest.raises(AttributeError): client.internal_operation.no_decorator_in_internal(name="sample") @@ -40,7 +40,7 @@ def test_internal_decorator_in_internal(client: AccessClient): assert result == models._models.InternalDecoratorModelInInternal(name="sample") with pytest.raises(ImportError): - from specs.azure.clientgenerator.core.access.models import InternalDecoratorModelInInternal + from azure.clientgenerator.core.access.models import InternalDecoratorModelInInternal with pytest.raises(AttributeError): client.internal_operation.internal_decorator_in_internal(name="sample") @@ -72,10 +72,10 @@ def test_operation(client: AccessClient): assert result == models._models.OuterModel(name="Madge", inner=models._models.InnerModel(name="Madge")) with pytest.raises(ImportError): - from specs.azure.clientgenerator.core.access.models import OuterModel + from azure.clientgenerator.core.access.models import OuterModel with pytest.raises(ImportError): - from specs.azure.clientgenerator.core.access.models import InnerModel + from azure.clientgenerator.core.access.models import InnerModel with pytest.raises(AttributeError): client.shared_model_in_operation.operation(name="sample") @@ -86,7 +86,7 @@ def test_discriminator(client: AccessClient): assert result == models._models.RealModel(name="Madge") with pytest.raises(ImportError): - from specs.azure.clientgenerator.core.access.models import RealModel + from azure.clientgenerator.core.access.models import RealModel with pytest.raises(AttributeError): client.shared_model_in_operation.discriminator(kind="real") diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_flatten.py b/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_flatten.py index 366498d265c..72dc50cc51a 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_flatten.py +++ b/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_flatten.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.clientgenerator.core.flattenproperty import FlattenPropertyClient -from specs.azure.clientgenerator.core.flattenproperty.models import ( +from azure.clientgenerator.core.flattenproperty import FlattenPropertyClient +from azure.clientgenerator.core.flattenproperty.models import ( FlattenModel, ChildModel, NestedFlattenModel, diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_usage.py b/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_usage.py index 3416ef21b24..9765bffb92d 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_usage.py +++ b/packages/typespec-python/test/azure/mock_api_tests/test_azure_client_generator_core_usage.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.clientgenerator.core.usage import UsageClient -from specs.azure.clientgenerator.core.usage import models +from azure.clientgenerator.core.usage import UsageClient +from azure.clientgenerator.core.usage import models @pytest.fixture diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_basic.py b/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_basic.py index 8ba50795a8d..73732c9e448 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_basic.py +++ b/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_basic.py @@ -4,7 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.core.basic import BasicClient, models +from azure.core.basic import BasicClient, models VALID_USER = models.User(id=1, name="Madge", etag="11bdc430-65e8-45ad-81d9-8ffa60d55b59") diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_lro_rpc.py b/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_lro_rpc.py index 7710fd9eb6f..0c01aab0657 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_lro_rpc.py +++ b/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_lro_rpc.py @@ -4,7 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.core.lro.rpc import RpcClient, models +from azure.core.lro.rpc import RpcClient, models @pytest.fixture diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_lro_standard.py b/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_lro_standard.py index c9337e93fad..9bd7659f837 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_lro_standard.py +++ b/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_lro_standard.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.core.lro.standard import StandardClient -from specs.azure.core.lro.standard.models import User, ExportedUser +from azure.core.lro.standard import StandardClient +from azure.core.lro.standard.models import User, ExportedUser @pytest.fixture diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_model.py b/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_model.py index adca0211e51..f036550d166 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_model.py +++ b/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_model.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.core.model import ModelClient -from specs.azure.core.model.models import AzureEmbeddingModel +from azure.core.model import ModelClient +from azure.core.model.models import AzureEmbeddingModel @pytest.fixture diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_page.py b/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_page.py index 1c2ec72e160..42dc56ac472 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_page.py +++ b/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_page.py @@ -5,7 +5,7 @@ # -------------------------------------------------------------------------- import pytest from typing import Iterable -from specs.azure.core.page import PageClient, models +from azure.core.page import PageClient, models VALID_USER = models.User(id=1, name="Madge", etag="11bdc430-65e8-45ad-81d9-8ffa60d55b59") diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_scalar.py b/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_scalar.py index 1bca122b363..034bc70d2df 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_scalar.py +++ b/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_scalar.py @@ -4,7 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.core.scalar import ScalarClient, models +from azure.core.scalar import ScalarClient, models @pytest.fixture diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_traits.py b/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_traits.py index 982931efb59..bb1e1e6297b 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_traits.py +++ b/packages/typespec-python/test/azure/mock_api_tests/test_azure_core_traits.py @@ -9,8 +9,8 @@ import pytest from azure.core.exceptions import HttpResponseError from azure.core import MatchConditions -from specs.azure.core.traits import TraitsClient -from specs.azure.core.traits.models import UserActionParam +from azure.core.traits import TraitsClient +from azure.core.traits.models import UserActionParam @pytest.fixture diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_azure_example_basic.py b/packages/typespec-python/test/azure/mock_api_tests/test_azure_example_basic.py index a3b0ee01cdc..de2c08914d7 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_azure_example_basic.py +++ b/packages/typespec-python/test/azure/mock_api_tests/test_azure_example_basic.py @@ -4,8 +4,8 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.example.basic import AzureExampleClient -from specs.azure.example.basic.models import ActionRequest, Model +from azure.example.basic import AzureExampleClient +from azure.example.basic.models import ActionRequest, Model @pytest.fixture diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_azure_payload_pageable.py b/packages/typespec-python/test/azure/mock_api_tests/test_azure_payload_pageable.py index e846ae434c0..3077fe8a0c0 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_azure_payload_pageable.py +++ b/packages/typespec-python/test/azure/mock_api_tests/test_azure_payload_pageable.py @@ -4,7 +4,7 @@ # license information. # -------------------------------------------------------------------------- import pytest -from specs.azure.payload.pageable import PageableClient +from azure.payload.pageable import PageableClient @pytest.fixture diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key/setup.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key/setup.py index 3e1adb2aa70..f5b883ee990 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key/setup.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/authentication-http-custom/setup.py b/packages/typespec-python/test/unbranded/generated/authentication-http-custom/setup.py index 5696d0f7c34..771762d8c48 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-http-custom/setup.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-http-custom/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/authentication-oauth2/setup.py b/packages/typespec-python/test/unbranded/generated/authentication-oauth2/setup.py index d000efae9fd..00c81f79dbd 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-oauth2/setup.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-oauth2/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/authentication-union/setup.py b/packages/typespec-python/test/unbranded/generated/authentication-union/setup.py index d855d975bf8..eb3359e3ad2 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-union/setup.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-union/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/encode-bytes/setup.py b/packages/typespec-python/test/unbranded/generated/encode-bytes/setup.py index 83bab9ec46e..a866bd41d66 100644 --- a/packages/typespec-python/test/unbranded/generated/encode-bytes/setup.py +++ b/packages/typespec-python/test/unbranded/generated/encode-bytes/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/encode-datetime/setup.py b/packages/typespec-python/test/unbranded/generated/encode-datetime/setup.py index 20d01ac8d2d..9e447a578d2 100644 --- a/packages/typespec-python/test/unbranded/generated/encode-datetime/setup.py +++ b/packages/typespec-python/test/unbranded/generated/encode-datetime/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/encode-duration/setup.py b/packages/typespec-python/test/unbranded/generated/encode-duration/setup.py index 65f85b2b9b2..c74a22cb212 100644 --- a/packages/typespec-python/test/unbranded/generated/encode-duration/setup.py +++ b/packages/typespec-python/test/unbranded/generated/encode-duration/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/encode-numeric/setup.py b/packages/typespec-python/test/unbranded/generated/encode-numeric/setup.py index 0e133c7c1b0..29e18554a31 100644 --- a/packages/typespec-python/test/unbranded/generated/encode-numeric/setup.py +++ b/packages/typespec-python/test/unbranded/generated/encode-numeric/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/setup.py b/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/setup.py index 84eddd8b4e2..3e9444d27a6 100644 --- a/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/setup.py +++ b/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/setup.py @@ -51,7 +51,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/headasbooleantrue/setup.py b/packages/typespec-python/test/unbranded/generated/headasbooleantrue/setup.py index 14a3f0bb340..d4da8106bc2 100644 --- a/packages/typespec-python/test/unbranded/generated/headasbooleantrue/setup.py +++ b/packages/typespec-python/test/unbranded/generated/headasbooleantrue/setup.py @@ -51,7 +51,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/parameters-basic/setup.py b/packages/typespec-python/test/unbranded/generated/parameters-basic/setup.py index 62499411dcd..cccf11be6dd 100644 --- a/packages/typespec-python/test/unbranded/generated/parameters-basic/setup.py +++ b/packages/typespec-python/test/unbranded/generated/parameters-basic/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/setup.py b/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/setup.py index feb0fea3787..856c4c31761 100644 --- a/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/setup.py +++ b/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/parameters-collection-format/setup.py b/packages/typespec-python/test/unbranded/generated/parameters-collection-format/setup.py index 39fae35d784..c20929081a4 100644 --- a/packages/typespec-python/test/unbranded/generated/parameters-collection-format/setup.py +++ b/packages/typespec-python/test/unbranded/generated/parameters-collection-format/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/parameters-spread/setup.py b/packages/typespec-python/test/unbranded/generated/parameters-spread/setup.py index 087b2c040b7..e54a43b1dcd 100644 --- a/packages/typespec-python/test/unbranded/generated/parameters-spread/setup.py +++ b/packages/typespec-python/test/unbranded/generated/parameters-spread/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/setup.py b/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/setup.py index 06c572d3c2b..42bfb0b4aac 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/setup.py +++ b/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/setup.py b/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/setup.py index 4c058ba220f..5ee07b9e26d 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/setup.py +++ b/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/payload-media-type/setup.py b/packages/typespec-python/test/unbranded/generated/payload-media-type/setup.py index 385fe73acfa..ea73d181f8e 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-media-type/setup.py +++ b/packages/typespec-python/test/unbranded/generated/payload-media-type/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/payload-multipart/setup.py b/packages/typespec-python/test/unbranded/generated/payload-multipart/setup.py index 81a79155ae3..f2a59e951f9 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-multipart/setup.py +++ b/packages/typespec-python/test/unbranded/generated/payload-multipart/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/payload-pageable/setup.py b/packages/typespec-python/test/unbranded/generated/payload-pageable/setup.py index 4d94c2167aa..5dea6dcc7b8 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-pageable/setup.py +++ b/packages/typespec-python/test/unbranded/generated/payload-pageable/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/payload-xml/setup.py b/packages/typespec-python/test/unbranded/generated/payload-xml/setup.py index 7a9136d86c7..6448a33cf87 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-xml/setup.py +++ b/packages/typespec-python/test/unbranded/generated/payload-xml/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/response-status-code-range/setup.py b/packages/typespec-python/test/unbranded/generated/response-status-code-range/setup.py index 90279b71c9c..15fe5945f32 100644 --- a/packages/typespec-python/test/unbranded/generated/response-status-code-range/setup.py +++ b/packages/typespec-python/test/unbranded/generated/response-status-code-range/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/routes/setup.py b/packages/typespec-python/test/unbranded/generated/routes/setup.py index 29e8f965a98..0df71a269c0 100644 --- a/packages/typespec-python/test/unbranded/generated/routes/setup.py +++ b/packages/typespec-python/test/unbranded/generated/routes/setup.py @@ -51,7 +51,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/setup.py b/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/setup.py index 99bbb42469f..6c6524f8e31 100644 --- a/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/setup.py +++ b/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/server-endpoint-not-defined/setup.py b/packages/typespec-python/test/unbranded/generated/server-endpoint-not-defined/setup.py index e75df3f1dc7..ccef04e1d31 100644 --- a/packages/typespec-python/test/unbranded/generated/server-endpoint-not-defined/setup.py +++ b/packages/typespec-python/test/unbranded/generated/server-endpoint-not-defined/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/server-path-multiple/setup.py b/packages/typespec-python/test/unbranded/generated/server-path-multiple/setup.py index 1716c7983db..f0211b29824 100644 --- a/packages/typespec-python/test/unbranded/generated/server-path-multiple/setup.py +++ b/packages/typespec-python/test/unbranded/generated/server-path-multiple/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/server-path-single/setup.py b/packages/typespec-python/test/unbranded/generated/server-path-single/setup.py index 59fc4d539c0..7b66716ba2f 100644 --- a/packages/typespec-python/test/unbranded/generated/server-path-single/setup.py +++ b/packages/typespec-python/test/unbranded/generated/server-path-single/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/server-versions-not-versioned/setup.py b/packages/typespec-python/test/unbranded/generated/server-versions-not-versioned/setup.py index ff3624338ef..20ce300fdec 100644 --- a/packages/typespec-python/test/unbranded/generated/server-versions-not-versioned/setup.py +++ b/packages/typespec-python/test/unbranded/generated/server-versions-not-versioned/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/server-versions-versioned/setup.py b/packages/typespec-python/test/unbranded/generated/server-versions-versioned/setup.py index c479066e57b..8d011fd5f2f 100644 --- a/packages/typespec-python/test/unbranded/generated/server-versions-versioned/setup.py +++ b/packages/typespec-python/test/unbranded/generated/server-versions-versioned/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/special-headers-conditional-request/setup.py b/packages/typespec-python/test/unbranded/generated/special-headers-conditional-request/setup.py index 21561964029..5d15e6ed21e 100644 --- a/packages/typespec-python/test/unbranded/generated/special-headers-conditional-request/setup.py +++ b/packages/typespec-python/test/unbranded/generated/special-headers-conditional-request/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/special-headers-repeatability/setup.py b/packages/typespec-python/test/unbranded/generated/special-headers-repeatability/setup.py index f37e7121be7..de3be62c229 100644 --- a/packages/typespec-python/test/unbranded/generated/special-headers-repeatability/setup.py +++ b/packages/typespec-python/test/unbranded/generated/special-headers-repeatability/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/special-words/setup.py b/packages/typespec-python/test/unbranded/generated/special-words/setup.py index 09538aedffe..26a27e98ff5 100644 --- a/packages/typespec-python/test/unbranded/generated/special-words/setup.py +++ b/packages/typespec-python/test/unbranded/generated/special-words/setup.py @@ -51,7 +51,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/streaming-jsonl/setup.py b/packages/typespec-python/test/unbranded/generated/streaming-jsonl/setup.py index 3f937db3f65..43702d87e9a 100644 --- a/packages/typespec-python/test/unbranded/generated/streaming-jsonl/setup.py +++ b/packages/typespec-python/test/unbranded/generated/streaming-jsonl/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-array/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-array/setup.py index a3609d320fa..7707ee93885 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-array/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-array/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-dictionary/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-dictionary/setup.py index 2614f937b97..32534eaf2b1 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-dictionary/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-dictionary/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/setup.py index 9efa105ea7e..c5ba74ad54e 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/setup.py index 939f8a3ba7f..7848467e8d7 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-empty/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-model-empty/setup.py index bdadd14ad1c..a683f4742bf 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-empty/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-empty/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/setup.py index 8574714f373..2b107f028d5 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/setup.py index 40c253454f3..3d2d04f054a 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/setup.py index c25a7519562..22a0764a4ea 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/setup.py index 334ae689a44..fea07257674 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/setup.py index a4e3ebbac53..bb428d85164 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-usage/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-model-usage/setup.py index c2fba57929c..fc51eadfd2f 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-usage/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-usage/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/setup.py index a8bfd565a9a..d05627fdb2e 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/setup.py index 85eedd8b351..7f8f8b1a422 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/setup.py index 5eb589d5875..f2c1a0c3ce7 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-optional/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-property-optional/setup.py index f88eeed327f..47bd5773162 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-property-optional/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-property-optional/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/setup.py index b170c55af61..bb0cabcefc8 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/setup.py @@ -54,7 +54,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-scalar/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-scalar/setup.py index 401cb998992..d32e5b5f5c7 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-scalar/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-scalar/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/typetest-union/setup.py b/packages/typespec-python/test/unbranded/generated/typetest-union/setup.py index f3a8b38f7b5..a3269701916 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-union/setup.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-union/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/versioning-added/setup.py b/packages/typespec-python/test/unbranded/generated/versioning-added/setup.py index 254c69e1fc5..ffbc9db08f4 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-added/setup.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-added/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/versioning-madeoptional/setup.py b/packages/typespec-python/test/unbranded/generated/versioning-madeoptional/setup.py index 241d0640946..b309306d4c8 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-madeoptional/setup.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-madeoptional/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/versioning-removed/setup.py b/packages/typespec-python/test/unbranded/generated/versioning-removed/setup.py index df6ab51c4e0..f160c103f42 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-removed/setup.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-removed/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/versioning-renamedfrom/setup.py b/packages/typespec-python/test/unbranded/generated/versioning-renamedfrom/setup.py index 85572667dc2..bc2f284ae36 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-renamedfrom/setup.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-renamedfrom/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/versioning-returntypechangedfrom/setup.py b/packages/typespec-python/test/unbranded/generated/versioning-returntypechangedfrom/setup.py index 85264fa7cc8..97d252a3d54 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-returntypechangedfrom/setup.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-returntypechangedfrom/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/packages/typespec-python/test/unbranded/generated/versioning-typechangedfrom/setup.py b/packages/typespec-python/test/unbranded/generated/versioning-typechangedfrom/setup.py index 5bdef7f29bd..849c1164c47 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-typechangedfrom/setup.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-typechangedfrom/setup.py @@ -53,7 +53,7 @@ }, install_requires=[ "isodate>=0.6.1", - "corehttp[requests]>=1.0.0b6", + "corehttp[requests]", "typing-extensions>=4.6.0", ], python_requires=">=3.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c922c9634fc..2d514aaf662 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -57,8 +57,8 @@ importers: specifier: ~1.0.2 version: 1.0.2 '@typespec/http-client-python': - specifier: ~0.9.3-dev.1 - version: 0.9.3-dev.1(2ivfmxvrftapo7cbuxsaae6yq4) + specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNDc2MTY5Ni9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.9.2.tgz + version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNDc2MTY5Ni9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.9.2.tgz(2ivfmxvrftapo7cbuxsaae6yq4) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -79,8 +79,8 @@ importers: packages/typespec-python: dependencies: '@typespec/http-client-python': - specifier: ~0.9.3-dev.1 - version: 0.9.3-dev.1(2ivfmxvrftapo7cbuxsaae6yq4) + specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNDc2MTY5Ni9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.9.2.tgz + version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNDc2MTY5Ni9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.9.2.tgz(2ivfmxvrftapo7cbuxsaae6yq4) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -95,8 +95,8 @@ importers: version: 4.19.3 devDependencies: '@azure-tools/azure-http-specs': - specifier: 0.1.0-alpha.13 - version: 0.1.0-alpha.13(gfm3f7krb5pm5nvwh6qqwmbzcy) + specifier: 0.1.0-alpha.14-dev.8 + version: 0.1.0-alpha.14-dev.8(gfm3f7krb5pm5nvwh6qqwmbzcy) '@azure-tools/typespec-autorest': specifier: ~0.54.0 version: 0.54.0(eijwshhpe4ydfv4uxokr3dajqe) @@ -191,16 +191,16 @@ packages: resolution: {integrity: sha512-T21naRb6JDdjjn2s/zwr9iCIv/9jviL/PRtiWAhi+3UA2WKH2wrId2VqJa4uVD7iEV8BLkuGgFmMkaMBG26hFw==} engines: {node: '>=12.0.0'} - '@azure-tools/azure-http-specs@0.1.0-alpha.13': - resolution: {integrity: sha512-viKd9OK5rQbuwIiH9ihYQBjvXg/14XH94d3YdeMuTzGaceCbJxqrj/mm/XLPWrT+kHt3rEUhf06TEsmLGdqECQ==} + '@azure-tools/azure-http-specs@0.1.0-alpha.14-dev.8': + resolution: {integrity: sha512-9tocHMei7v3GXY4LWJ9hQ3aIyt+U6A2VDCFERd3lu/PYjf83PdG/5QQSdq8sWXJZYlARS6s4tTaLjDRM8dWUeg==} engines: {node: '>=20.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ^0.54.0 + '@azure-tools/typespec-azure-core': ^0.54.0 || >=0.55.0-dev <0.55.0 '@typespec/compiler': ^1.0.0-rc.0 '@typespec/http': ^1.0.0-rc.0 - '@typespec/rest': ^0.68.0 - '@typespec/versioning': ^0.68.0 - '@typespec/xml': ^0.68.0 + '@typespec/rest': ^0.68.0 || >=0.69.0-dev <0.69.0 + '@typespec/versioning': ^0.68.0 || >=0.69.0-dev <0.69.0 + '@typespec/xml': ^0.68.0 || >=0.69.0-dev <0.69.0 '@azure-tools/typespec-autorest@0.54.0': resolution: {integrity: sha512-7Oh8R48CQfeiFFfrMTKdEozpx/riQe+KENkd6wn1Oku7aZJ/GDsPidwiu98sCBeSXeJhc3/UlHmxMZWgiat5KQ==} @@ -1538,8 +1538,9 @@ packages: peerDependencies: '@typespec/compiler': ^1.0.0-rc.0 - '@typespec/http-client-python@0.9.3-dev.1': - resolution: {integrity: sha512-DaKXTGVkxo9AobzlkbvZePj/0xLuQYo/auiaWZOLMkybox8tQ1OHmsaZ26wdvVwR4bm7l9XstBwn8diKVv6JKA==} + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNDc2MTY5Ni9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.9.2.tgz': + resolution: {tarball: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNDc2MTY5Ni9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.9.2.tgz} + version: 0.9.2 engines: {node: '>=20.0.0'} peerDependencies: '@azure-tools/typespec-autorest': '>=0.54.0 <1.0.0' @@ -4438,7 +4439,7 @@ snapshots: command-exists: 1.2.9 semver: 7.6.3 - '@azure-tools/azure-http-specs@0.1.0-alpha.13(gfm3f7krb5pm5nvwh6qqwmbzcy)': + '@azure-tools/azure-http-specs@0.1.0-alpha.14-dev.8(gfm3f7krb5pm5nvwh6qqwmbzcy)': dependencies: '@azure-tools/typespec-azure-core': 0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))) '@typespec/compiler': 1.0.0-rc.0(@types/node@22.13.17) @@ -5893,7 +5894,7 @@ snapshots: dependencies: '@typespec/compiler': 1.0.0-rc.0(@types/node@22.13.17) - '@typespec/http-client-python@0.9.3-dev.1(2ivfmxvrftapo7cbuxsaae6yq4)': + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNDc2MTY5Ni9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.9.2.tgz(2ivfmxvrftapo7cbuxsaae6yq4)': dependencies: '@azure-tools/typespec-autorest': 0.54.0(eijwshhpe4ydfv4uxokr3dajqe) '@azure-tools/typespec-azure-core': 0.54.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))))(@typespec/rest@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/http@1.0.0-rc.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17))(@typespec/streams@0.68.0(@typespec/compiler@1.0.0-rc.0(@types/node@22.13.17)))))