@typespec/http-client-python 0.27.0 → 0.27.2

package/generator/pygen/codegen/templates/model_base.py.jinja2

@@ -527,6 +527,8 @@ class _MyMutableMapping(MutableMapping[str, typing.Any]):
         return self._data.setdefault(key, default)
 
     def __eq__(self, other: typing.Any) -> bool:
+        if isinstance(other, _MyMutableMapping):
+            return self._data == other._data
         try:
             other_model = self.__class__(other)
         except Exception:
@@ -1020,16 +1022,20 @@ def _deserialize_with_callable(
                 return float(value.text) if value.text else None
             if deserializer is bool:
                 return value.text == "true" if value.text else None
+            if deserializer and deserializer in _DESERIALIZE_MAPPING.values():
+                return deserializer(value.text) if value.text else None
+            if deserializer and deserializer in _DESERIALIZE_MAPPING_WITHFORMAT.values():
+                return deserializer(value.text) 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)
+                return deserializer(value.text if isinstance(value, ET.Element) else value)
             except ValueError:
                 # for unknown value, return raw value
-                return value
+                return value.text if isinstance(value, ET.Element) else value
         if isinstance(deserializer, type) and issubclass(deserializer, Model):
             return deserializer._deserialize(value, [])
         return typing.cast(typing.Callable[[typing.Any], typing.Any], deserializer)(value)

package/generator/test/azure/mock_api_tests/asynctests/test_azure_arm_operationtemplates_async.py

@@ -176,6 +176,18 @@ async def test_optional_body_provider_post_with_body(client):
     assert result.status == "Changed to requested allowance"
 
 
+@pytest.mark.asyncio
+async def test_lro_begin_export_array(client):
+    result = await (
+        await client.lro.begin_export_array(
+            body=models.ExportRequest(format="csv"),
+        )
+    ).result()
+    assert len(result) == 2
+    assert result[0].content == "order1,product1,1"
+    assert result[1].content == "order2,product2,2"
+
+
 @pytest.mark.asyncio
 async def test_lro_paging_begin_post_paging_lro(client):
     poller = await client.lro_paging.begin_post_paging_lro(

package/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_initialization_async.py

@@ -4,15 +4,14 @@
 # license information.
 # --------------------------------------------------------------------------
 import pytest
-from specs.azure.clientgenerator.core.clientinitialization.aio import (
+from specs.azure.clientgenerator.core.clientinitialization.default.aio import (
     HeaderParamClient,
     MultipleParamsClient,
     MixedParamsClient,
     PathParamClient,
     ParamAliasClient,
-    ParentClient,
 )
-from specs.azure.clientgenerator.core.clientinitialization.models import Input
+from specs.azure.clientgenerator.core.clientinitialization.default.models import Input
 
 
 @pytest.mark.asyncio

package/generator/test/azure/mock_api_tests/asynctests/test_azure_core_page_async.py

@@ -66,3 +66,15 @@ async def test_list_with_parameterized_next_link(client: aio.PageClient):
     assert result[0].name == "User1"
     assert result[1].id == 2
     assert result[1].name == "User2"
+
+
+@pytest.mark.asyncio
+async def test_list_with_relative_next_link(client: aio.PageClient):
+    result = [item async for item in client.with_relative_next_link()]
+    assert len(result) == 2
+    assert result[0].id == 1
+    assert result[0].name == "User1"
+    assert result[0].etag == "11bdc430-65e8-45ad-81d9-8ffa60d55b59"
+    assert result[1].id == 2
+    assert result[1].name == "User2"
+    assert result[1].etag == "11bdc430-65e8-45ad-81d9-8ffa60d55b59"

package/generator/test/azure/mock_api_tests/asynctests/test_azure_resource_manager_multi_service_older_versions_async.py

@@ -0,0 +1,111 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+import pytest
+from azure.resourcemanager.multiserviceolderversions.combined.aio import CombinedClient
+from azure.resourcemanager.multiserviceolderversions.combined.models import (
+    VirtualMachine,
+    Disk,
+    VirtualMachineProperties,
+    DiskProperties,
+)
+
+
+@pytest.fixture
+async def client(credential, authentication_policy):
+    """Create a Combined async client for testing."""
+    return CombinedClient(
+        credential=credential,
+        subscription_id="00000000-0000-0000-0000-000000000000",
+        base_url="http://localhost:3000",
+        authentication_policy=authentication_policy,
+        polling_interval=0.1,
+    )
+
+
+@pytest.mark.asyncio
+async def test_virtual_machines_get(client):
+    """Test getting a virtual machine."""
+    resource_group_name = "test-rg"
+    vm_name = "vm-old1"
+
+    result = await client.virtual_machines.get(resource_group_name=resource_group_name, vm_name=vm_name)
+
+    assert result is not None
+    assert isinstance(result, VirtualMachine)
+    assert result.name == vm_name
+    assert result.location == "eastus"
+    assert result.properties is not None
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.properties.size == "Standard_D2s_v3"
+
+
+@pytest.mark.asyncio
+async def test_virtual_machines_create_or_update(client):
+    """Test creating or updating a virtual machine."""
+    resource_group_name = "test-rg"
+    vm_name = "vm-old1"
+
+    vm_resource = VirtualMachine(
+        location="eastus",
+        properties=VirtualMachineProperties(size="Standard_D2s_v3"),
+    )
+
+    poller = await client.virtual_machines.begin_create_or_update(
+        resource_group_name=resource_group_name,
+        vm_name=vm_name,
+        resource=vm_resource,
+    )
+
+    result = await poller.result()
+    assert result is not None
+    assert isinstance(result, VirtualMachine)
+    assert result.location == "eastus"
+    assert result.properties is not None
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.properties.size == "Standard_D2s_v3"
+
+
+@pytest.mark.asyncio
+async def test_disks_get(client):
+    """Test getting a disk."""
+    resource_group_name = "test-rg"
+    disk_name = "disk-old1"
+
+    result = await client.disks.get(resource_group_name=resource_group_name, disk_name=disk_name)
+
+    assert result is not None
+    assert isinstance(result, Disk)
+    assert result.name == disk_name
+    assert result.location == "eastus"
+    assert result.properties is not None
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.properties.disk_size_gb == 128
+
+
+@pytest.mark.asyncio
+async def test_disks_create_or_update(client):
+    """Test creating or updating a disk."""
+    resource_group_name = "test-rg"
+    disk_name = "disk-old1"
+
+    disk_resource = Disk(
+        location="eastus",
+        properties=DiskProperties(disk_size_gb=128),
+    )
+
+    poller = await client.disks.begin_create_or_update(
+        resource_group_name=resource_group_name,
+        disk_name=disk_name,
+        resource=disk_resource,
+    )
+
+    result = await poller.result()
+    assert result is not None
+    assert isinstance(result, Disk)
+    assert result.location == "eastus"
+    assert result.properties is not None
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.properties.disk_size_gb == 128

package/generator/test/azure/mock_api_tests/asynctests/test_azure_resource_manager_multi_service_shared_models_async.py

@@ -0,0 +1,132 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+import pytest
+from azure.resourcemanager.multiservicesharedmodels.combined.aio import CombinedClient
+from azure.resourcemanager.multiservicesharedmodels.combined.models import (
+    VirtualMachine,
+    VirtualMachineProperties,
+    StorageAccount,
+    StorageAccountProperties,
+    SharedMetadata,
+)
+
+
+@pytest.fixture
+async def client(credential, authentication_policy):
+    """Create a Combined async client for testing."""
+    return CombinedClient(
+        credential=credential,
+        subscription_id="00000000-0000-0000-0000-000000000000",
+        base_url="http://localhost:3000",
+        authentication_policy=authentication_policy,
+        polling_interval=0.1,
+    )
+
+
+@pytest.mark.asyncio
+async def test_virtual_machines_get(client):
+    """Test getting a virtual machine with shared metadata."""
+    resource_group_name = "test-rg"
+    vm_name = "vm-shared1"
+
+    result = await client.virtual_machines.get(resource_group_name=resource_group_name, vm_name=vm_name)
+
+    assert result is not None
+    assert isinstance(result, VirtualMachine)
+    assert result.name == vm_name
+    assert result.location == "eastus"
+    assert result.type == "Microsoft.Compute/virtualMachinesShared"
+    assert result.properties is not None
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.properties.metadata is not None
+    assert result.properties.metadata.created_by == "user@example.com"
+    assert result.properties.metadata.tags == {"environment": "production"}
+
+
+@pytest.mark.asyncio
+async def test_virtual_machines_create_or_update(client):
+    """Test creating or updating a virtual machine with shared metadata."""
+    resource_group_name = "test-rg"
+    vm_name = "vm-shared1"
+
+    vm_resource = VirtualMachine(
+        location="eastus",
+        properties=VirtualMachineProperties(
+            metadata=SharedMetadata(
+                created_by="user@example.com",
+                tags={"environment": "production"},
+            ),
+        ),
+    )
+
+    poller = await client.virtual_machines.begin_create_or_update(
+        resource_group_name=resource_group_name,
+        vm_name=vm_name,
+        resource=vm_resource,
+    )
+
+    result = await poller.result()
+    assert result is not None
+    assert isinstance(result, VirtualMachine)
+    assert result.location == "eastus"
+    assert result.properties is not None
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.properties.metadata is not None
+    assert result.properties.metadata.created_by == "user@example.com"
+    assert result.properties.metadata.tags == {"environment": "production"}
+
+
+@pytest.mark.asyncio
+async def test_storage_accounts_get(client):
+    """Test getting a storage account with shared metadata."""
+    resource_group_name = "test-rg"
+    account_name = "account1"
+
+    result = await client.storage_accounts.get(resource_group_name=resource_group_name, account_name=account_name)
+
+    assert result is not None
+    assert isinstance(result, StorageAccount)
+    assert result.name == account_name
+    assert result.location == "westus"
+    assert result.type == "Microsoft.Storage/storageAccounts"
+    assert result.properties is not None
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.properties.metadata is not None
+    assert result.properties.metadata.created_by == "admin@example.com"
+    assert result.properties.metadata.tags == {"department": "engineering"}
+
+
+@pytest.mark.asyncio
+async def test_storage_accounts_create_or_update(client):
+    """Test creating or updating a storage account with shared metadata."""
+    resource_group_name = "test-rg"
+    account_name = "account1"
+
+    storage_resource = StorageAccount(
+        location="westus",
+        properties=StorageAccountProperties(
+            metadata=SharedMetadata(
+                created_by="admin@example.com",
+                tags={"department": "engineering"},
+            ),
+        ),
+    )
+
+    poller = await client.storage_accounts.begin_create_or_update(
+        resource_group_name=resource_group_name,
+        account_name=account_name,
+        resource=storage_resource,
+    )
+
+    result = await poller.result()
+    assert result is not None
+    assert isinstance(result, StorageAccount)
+    assert result.location == "westus"
+    assert result.properties is not None
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.properties.metadata is not None
+    assert result.properties.metadata.created_by == "admin@example.com"
+    assert result.properties.metadata.tags == {"department": "engineering"}

package/generator/test/azure/mock_api_tests/asynctests/test_payload_multipart_async.py

@@ -184,3 +184,33 @@ async def test_optional_parts(client: MultiPartClient):
             profile_image=open(str(JPG), "rb"),
         )
     )
+
+
+@pytest.mark.asyncio
+async def test_file_upload_file_specific_content_type(client: MultiPartClient):
+    await client.form_data.file.upload_file_specific_content_type(
+        models.UploadFileSpecificContentTypeRequest(
+            file=("image.png", open(str(PNG), "rb"), "image/png"),
+        )
+    )
+
+
+@pytest.mark.asyncio
+async def test_file_upload_file_required_filename(client: MultiPartClient):
+    await client.form_data.file.upload_file_required_filename(
+        models.UploadFileRequiredFilenameRequest(
+            file=("image.png", open(str(PNG), "rb"), "image/png"),
+        )
+    )
+
+
+@pytest.mark.asyncio
+async def test_file_upload_file_array(client: MultiPartClient):
+    await client.form_data.file.upload_file_array(
+        models.UploadFileArrayRequest(
+            files=[
+                ("image.png", open(str(PNG), "rb"), "image/png"),
+                ("image.png", open(str(PNG), "rb"), "image/png"),
+            ],
+        )
+    )

package/generator/test/azure/mock_api_tests/test_azure_arm_operationtemplates.py

@@ -156,6 +156,15 @@ def test_optional_body_provider_post_with_body(client):
     assert result.status == "Changed to requested allowance"
 
 
+def test_lro_begin_export_array(client):
+    result = client.lro.begin_export_array(
+        body=models.ExportRequest(format="csv"),
+    ).result()
+    assert len(result) == 2
+    assert result[0].content == "order1,product1,1"
+    assert result[1].content == "order2,product2,2"
+
+
 def test_lro_paging_begin_post_paging_lro(client):
     result = client.lro_paging.begin_post_paging_lro(
         resource_group_name=RESOURCE_GROUP_NAME,

package/generator/test/azure/mock_api_tests/test_azure_client_generator_core_client_initialization.py

@@ -3,15 +3,14 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from specs.azure.clientgenerator.core.clientinitialization import (
+from specs.azure.clientgenerator.core.clientinitialization.default import (
     HeaderParamClient,
     MultipleParamsClient,
     MixedParamsClient,
     PathParamClient,
     ParamAliasClient,
-    ParentClient,
 )
-from specs.azure.clientgenerator.core.clientinitialization.models import Input
+from specs.azure.clientgenerator.core.clientinitialization.default.models import Input
 
 
 def test_header_param_client():

package/generator/test/azure/mock_api_tests/test_azure_core_page.py

@@ -58,3 +58,14 @@ def test_list_with_parameterized_next_link(client: PageClient):
     assert result[0].name == "User1"
     assert result[1].id == 2
     assert result[1].name == "User2"
+
+
+def test_list_with_relative_next_link(client: PageClient):
+    result = list(client.with_relative_next_link())
+    assert len(result) == 2
+    assert result[0].id == 1
+    assert result[0].name == "User1"
+    assert result[0].etag == "11bdc430-65e8-45ad-81d9-8ffa60d55b59"
+    assert result[1].id == 2
+    assert result[1].name == "User2"
+    assert result[1].etag == "11bdc430-65e8-45ad-81d9-8ffa60d55b59"

package/generator/test/azure/mock_api_tests/test_azure_resource_manager_multi_service_older_versions.py

@@ -0,0 +1,107 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+import pytest
+from azure.resourcemanager.multiserviceolderversions.combined import CombinedClient
+from azure.resourcemanager.multiserviceolderversions.combined.models import (
+    VirtualMachine,
+    Disk,
+    VirtualMachineProperties,
+    DiskProperties,
+)
+
+
+@pytest.fixture
+def client(credential, authentication_policy):
+    """Create a Combined client for testing."""
+    return CombinedClient(
+        credential=credential,
+        subscription_id="00000000-0000-0000-0000-000000000000",
+        base_url="http://localhost:3000",
+        authentication_policy=authentication_policy,
+        polling_interval=0.1,
+    )
+
+
+def test_virtual_machines_get(client):
+    """Test getting a virtual machine."""
+    resource_group_name = "test-rg"
+    vm_name = "vm-old1"
+
+    result = client.virtual_machines.get(resource_group_name=resource_group_name, vm_name=vm_name)
+
+    assert result is not None
+    assert isinstance(result, VirtualMachine)
+    assert result.name == vm_name
+    assert result.location == "eastus"
+    assert result.properties is not None
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.properties.size == "Standard_D2s_v3"
+
+
+def test_virtual_machines_create_or_update(client):
+    """Test creating or updating a virtual machine."""
+    resource_group_name = "test-rg"
+    vm_name = "vm-old1"
+
+    vm_resource = VirtualMachine(
+        location="eastus",
+        properties=VirtualMachineProperties(size="Standard_D2s_v3"),
+    )
+
+    poller = client.virtual_machines.begin_create_or_update(
+        resource_group_name=resource_group_name,
+        vm_name=vm_name,
+        resource=vm_resource,
+    )
+
+    result = poller.result()
+    assert result is not None
+    assert isinstance(result, VirtualMachine)
+    assert result.location == "eastus"
+    assert result.properties is not None
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.properties.size == "Standard_D2s_v3"
+
+
+def test_disks_get(client):
+    """Test getting a disk."""
+    resource_group_name = "test-rg"
+    disk_name = "disk-old1"
+
+    result = client.disks.get(resource_group_name=resource_group_name, disk_name=disk_name)
+
+    assert result is not None
+    assert isinstance(result, Disk)
+    assert result.name == disk_name
+    assert result.location == "eastus"
+    assert result.properties is not None
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.properties.disk_size_gb == 128
+
+
+def test_disks_create_or_update(client):
+    """Test creating or updating a disk."""
+    resource_group_name = "test-rg"
+    disk_name = "disk-old1"
+
+    disk_resource = Disk(
+        location="eastus",
+        properties=DiskProperties(disk_size_gb=128),
+    )
+
+    poller = client.disks.begin_create_or_update(
+        resource_group_name=resource_group_name,
+        disk_name=disk_name,
+        resource=disk_resource,
+    )
+
+    result = poller.result()
+    assert result is not None
+    assert isinstance(result, Disk)
+    assert result.location == "eastus"
+    assert result.properties is not None
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.properties.disk_size_gb == 128

package/generator/test/azure/mock_api_tests/test_azure_resource_manager_multi_service_shared_models.py

@@ -0,0 +1,128 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+import pytest
+from azure.resourcemanager.multiservicesharedmodels.combined import CombinedClient
+from azure.resourcemanager.multiservicesharedmodels.combined.models import (
+    VirtualMachine,
+    VirtualMachineProperties,
+    StorageAccount,
+    StorageAccountProperties,
+    SharedMetadata,
+)
+
+
+@pytest.fixture
+def client(credential, authentication_policy):
+    """Create a Combined client for testing."""
+    return CombinedClient(
+        credential=credential,
+        subscription_id="00000000-0000-0000-0000-000000000000",
+        base_url="http://localhost:3000",
+        authentication_policy=authentication_policy,
+        polling_interval=0.1,
+    )
+
+
+def test_virtual_machines_get(client):
+    """Test getting a virtual machine with shared metadata."""
+    resource_group_name = "test-rg"
+    vm_name = "vm-shared1"
+
+    result = client.virtual_machines.get(resource_group_name=resource_group_name, vm_name=vm_name)
+
+    assert result is not None
+    assert isinstance(result, VirtualMachine)
+    assert result.name == vm_name
+    assert result.location == "eastus"
+    assert result.type == "Microsoft.Compute/virtualMachinesShared"
+    assert result.properties is not None
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.properties.metadata is not None
+    assert result.properties.metadata.created_by == "user@example.com"
+    assert result.properties.metadata.tags == {"environment": "production"}
+
+
+def test_virtual_machines_create_or_update(client):
+    """Test creating or updating a virtual machine with shared metadata."""
+    resource_group_name = "test-rg"
+    vm_name = "vm-shared1"
+
+    vm_resource = VirtualMachine(
+        location="eastus",
+        properties=VirtualMachineProperties(
+            metadata=SharedMetadata(
+                created_by="user@example.com",
+                tags={"environment": "production"},
+            ),
+        ),
+    )
+
+    poller = client.virtual_machines.begin_create_or_update(
+        resource_group_name=resource_group_name,
+        vm_name=vm_name,
+        resource=vm_resource,
+    )
+
+    result = poller.result()
+    assert result is not None
+    assert isinstance(result, VirtualMachine)
+    assert result.location == "eastus"
+    assert result.properties is not None
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.properties.metadata is not None
+    assert result.properties.metadata.created_by == "user@example.com"
+    assert result.properties.metadata.tags == {"environment": "production"}
+
+
+def test_storage_accounts_get(client):
+    """Test getting a storage account with shared metadata."""
+    resource_group_name = "test-rg"
+    account_name = "account1"
+
+    result = client.storage_accounts.get(resource_group_name=resource_group_name, account_name=account_name)
+
+    assert result is not None
+    assert isinstance(result, StorageAccount)
+    assert result.name == account_name
+    assert result.location == "westus"
+    assert result.type == "Microsoft.Storage/storageAccounts"
+    assert result.properties is not None
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.properties.metadata is not None
+    assert result.properties.metadata.created_by == "admin@example.com"
+    assert result.properties.metadata.tags == {"department": "engineering"}
+
+
+def test_storage_accounts_create_or_update(client):
+    """Test creating or updating a storage account with shared metadata."""
+    resource_group_name = "test-rg"
+    account_name = "account1"
+
+    storage_resource = StorageAccount(
+        location="westus",
+        properties=StorageAccountProperties(
+            metadata=SharedMetadata(
+                created_by="admin@example.com",
+                tags={"department": "engineering"},
+            ),
+        ),
+    )
+
+    poller = client.storage_accounts.begin_create_or_update(
+        resource_group_name=resource_group_name,
+        account_name=account_name,
+        resource=storage_resource,
+    )
+
+    result = poller.result()
+    assert result is not None
+    assert isinstance(result, StorageAccount)
+    assert result.location == "westus"
+    assert result.properties is not None
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.properties.metadata is not None
+    assert result.properties.metadata.created_by == "admin@example.com"
+    assert result.properties.metadata.tags == {"department": "engineering"}

package/generator/test/azure/mock_api_tests/test_clear_output_folder.py

@@ -12,3 +12,12 @@ def test_clear_output_folder():
     folder = GENERATED_PATH / "authentication-api-key/authentication/apikey/_operations"
     assert folder.exists(), "Operations folder should exist"
     assert not (folder / "to_be_deleted.py").exists(), "File to_be_deleted.py should be deleted after regeneration"
+
+    if (GENERATED_PATH / "generation-subdir").exists():
+        assert (GENERATED_PATH / "generation-subdir/generated_tests").exists()
+        assert not (GENERATED_PATH / "generation-subdir/generated_tests/to_be_deleted.py").exists()
+
+        assert (GENERATED_PATH / "generation-subdir/generation/subdir/_generated").exists()
+        assert not (GENERATED_PATH / "generation-subdir/generation/subdir/_generated/to_be_deleted.py").exists()
+
+        assert (GENERATED_PATH / "generation-subdir/generation/subdir/to_be_kept.py").exists()