@typespec/http-client-python 0.23.1 → 0.24.0

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

@@ -0,0 +1,104 @@
+# -------------------------------------------------------------------------
+# 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.core.exceptions import HttpResponseError
+from azure.resourcemanager.multiservice.combined import CombinedClient
+from azure.resourcemanager.multiservice.combined.models import VirtualMachine, Disk
+
+
+@pytest.fixture
+def client(credential, authentication_policy):
+    """Create a Combined client for testing."""
+    return CombinedClient(
+        credential=credential,  # Will use mock server, no real auth needed
+        subscription_id="00000000-0000-0000-0000-000000000000",
+        base_url="http://localhost:3000",
+        authentication_policy=authentication_policy,
+        polling_interval=0.1,  # Speed up tests by reducing polling interval
+    )
+
+
+def test_virtual_machines_get(client):
+    resource_group_name = "test-rg"
+    vm_name = "vm1"
+
+    with pytest.raises(HttpResponseError):
+        client.virtual_machines.get(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            api_version="av1",  # invalid api version shall raise error
+        )
+
+    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
+
+
+def test_virtual_machines_create_or_update(client):
+    resource_group_name = "test-rg"
+    vm_name = "vm1"
+
+    vm_resource = VirtualMachine(location="eastus", properties={})
+
+    with pytest.raises(HttpResponseError):
+        client.virtual_machines.begin_create_or_update(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            resource=vm_resource,
+            api_version="av1",  # invalid api version shall raise error
+        ).result()
+
+    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"
+
+
+def test_disks_get(client):
+    resource_group_name = "test-rg"
+    disk_name = "disk1"
+    with pytest.raises(HttpResponseError):
+        client.disks.get(
+            resource_group_name=resource_group_name,
+            disk_name=disk_name,
+            api_version="av1",  # invalid api version shall raise error
+        )
+
+    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
+
+
+def test_disks_create_or_update(client):
+    resource_group_name = "test-rg"
+    disk_name = "disk1"
+
+    disk_resource = Disk(location="eastus", properties={})
+
+    with pytest.raises(HttpResponseError):
+        client.disks.begin_create_or_update(
+            resource_group_name=resource_group_name,
+            disk_name=disk_name,
+            resource=disk_resource,
+            api_version="av1",  # invalid api version shall raise error
+        ).result()
+
+    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"

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

@@ -0,0 +1,29 @@
+# -------------------------------------------------------------------------
+# 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.core.exceptions import HttpResponseError
+from service.multiservice import CombinedClient
+from service.multiservice.models import VersionsA, VersionsB
+
+
+@pytest.fixture
+def client():
+    """Fixture that creates a CombinedClient for testing."""
+    return CombinedClient(endpoint="http://localhost:3000")
+
+
+def test_service_multi_service_foo(client):
+    with pytest.raises(HttpResponseError):
+        client.foo.test(api_version=VersionsA.AV1)
+
+    client.foo.test()
+
+
+def test_service_multi_service_bar(client):
+    with pytest.raises(HttpResponseError):
+        client.bar.test(api_version=VersionsB.BV1)
+
+    client.bar.test()

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

@@ -35,3 +35,20 @@ def test_model(client: SpecialWordsClient, special_words):
 
 def test_model_properties(client: SpecialWordsClient):
     client.model_properties.same_as_model(models.SameAsModel(same_as_model="ok"))
+
+
+def test_model_properties_dict_methods(client: SpecialWordsClient):
+    client.model_properties.dict_methods(
+        body=models.DictMethods(
+            keys_property="ok",
+            items_property="ok",
+            values_property="ok",
+            popitem_property="ok",
+            clear_property="ok",
+            update_property="ok",
+            setdefault_property="ok",
+            pop_property="ok",
+            get_property="ok",
+            copy_property="ok",
+        )
+    )

package/generator/test/azure/requirements.txt

@@ -13,7 +13,11 @@ azure-mgmt-core==1.6.0
 -e ./generated/azure-client-generator-core-hierarchy-building
 -e ./generated/azure-client-generator-core-usage
 -e ./generated/azure-client-generator-core-override
--e ./generated/azure-client-generator-core-client-location
+-e ./generated/azure-client-generator-core-client-location-move-method-parameter-to-client
+-e ./generated/azure-client-generator-core-client-location-move-to-existing-sub-client
+-e ./generated/azure-client-generator-core-client-location-move-to-new-sub-client
+-e ./generated/azure-client-generator-core-client-location-move-to-root-client
+-e ./generated/azure-client-generator-core-client-default-value
 -e ./generated/azure-client-generator-core-alternate-type
 -e ./generated/azure-client-generator-core-next-link-verb
 -e ./generated/azure-core-basic
@@ -32,6 +36,7 @@ azure-mgmt-core==1.6.0
 -e ./generated/azure-resource-manager-operation-templates
 -e ./generated/azure-resource-manager-resources
 -e ./generated/azure-resource-manager-method-subscription-id
+-e ./generated/azure-resource-manager-multi-service
 -e ./generated/azure-versioning-previewversion
 -e ./generated/client-namespace
 -e ./generated/azure-payload-pageable
@@ -45,6 +50,7 @@ azure-mgmt-core==1.6.0
 -e ./generated/client-structure-twooperationgroup
 -e ./generated/resiliency-srv-driven1
 -e ./generated/resiliency-srv-driven2
+-e ./generated/service-multi-service
 
 # common test case
 -e ./generated/authentication-api-key
@@ -59,6 +65,7 @@ azure-mgmt-core==1.6.0
 -e ./generated/parameters-basic
 -e ./generated/parameters-collection-format
 -e ./generated/parameters-path
+-e ./generated/parameters-query
 -e ./generated/parameters-spread
 -e ./generated/serialization-encoded-name-json
 -e ./generated/server-endpoint-not-defined
@@ -85,6 +92,7 @@ azure-mgmt-core==1.6.0
 -e ./generated/typetest-property-additionalproperties
 -e ./generated/typetest-scalar
 -e ./generated/typetest-union
+-e ./generated/typetest-discriminatedunion
 -e ./generated/typetest-model-empty
 -e ./generated/headasbooleantrue
 -e ./generated/headasbooleanfalse

package/generator/test/generic_mock_api_tests/asynctests/test_parameters_query_async.py

@@ -0,0 +1,18 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+import pytest
+from parameters.query.aio import QueryClient
+
+
+@pytest.fixture
+async def client():
+    async with QueryClient() as client:
+        yield client
+
+
+@pytest.mark.asyncio
+async def test_constant(client: QueryClient):
+    await client.constant.post()

package/generator/test/generic_mock_api_tests/test_parameters_query.py

@@ -0,0 +1,17 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+import pytest
+from parameters.query import QueryClient
+
+
+@pytest.fixture
+def client():
+    with QueryClient() as client:
+        yield client
+
+
+def test_constant(client: QueryClient):
+    client.constant.post()

package/generator/test/generic_mock_api_tests/test_typetest_scalar.py

@@ -51,8 +51,3 @@ def test_decimal128_verify(client: ScalarClient):
 def test_decimal_verify(client: ScalarClient):
     prepare = client.decimal_verify.prepare_verify()
     client.decimal_verify.verify(reduce(lambda x, y: x + y, prepare))
-
-
-# open this test case after adopt new version of http-specs for https://github.com/microsoft/typespec/pull/8807
-# def test_constant_query(client: ScalarClient):
-#     client.constant_query.post()

package/generator/test/generic_mock_api_tests/test_typetest_union_discriminated.py

@@ -0,0 +1,290 @@
+# -------------------------------------------------------------------------
+# 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 typetest.discriminatedunion import DiscriminatedClient
+from typetest.discriminatedunion import models
+
+
+@pytest.fixture
+def client():
+    with DiscriminatedClient() as client:
+        yield client
+
+
+@pytest.fixture
+def cat_body():
+    """Cat model for testing."""
+    return models.Cat(name="Whiskers", meow=True)
+
+
+@pytest.fixture
+def dog_body():
+    """Dog model for testing."""
+    return models.Dog(name="Rex", bark=False)
+
+
+# Tests for No Envelope / Default (inline discriminator with "kind")
+@pytest.mark.skip(reason="After completely support discriminated unions, enable these tests")
+class TestNoEnvelopeDefault:
+    """Test discriminated union with inline discriminator (no envelope)."""
+
+    def test_get_default_cat(self, client: DiscriminatedClient, cat_body: models.Cat):
+        """Test getting cat with default (no query param or kind=cat).
+
+        Expected response:
+        {
+            "kind": "cat",
+            "name": "Whiskers",
+            "meow": true
+        }
+        """
+        result = client.no_envelope.default.get()
+        assert result == cat_body
+        assert isinstance(result, models.Cat)
+
+    def test_get_with_kind_cat(self, client: DiscriminatedClient, cat_body: models.Cat):
+        """Test getting cat with kind=cat query parameter.
+
+        Expected response:
+        {
+            "kind": "cat",
+            "name": "Whiskers",
+            "meow": true
+        }
+        """
+        result = client.no_envelope.default.get(kind="cat")
+        assert result == cat_body
+        assert isinstance(result, models.Cat)
+
+    def test_get_with_kind_dog(self, client: DiscriminatedClient, dog_body: models.Dog):
+        """Test getting dog with kind=dog query parameter.
+
+        Expected response:
+        {
+            "kind": "dog",
+            "name": "Rex",
+            "bark": false
+        }
+        """
+        result = client.no_envelope.default.get(kind="dog")
+        assert result == dog_body
+        assert isinstance(result, models.Dog)
+
+    def test_put_cat(self, client: DiscriminatedClient, cat_body: models.Cat):
+        """Test sending cat with inline discriminator.
+
+        Expected request:
+        {
+            "kind": "cat",
+            "name": "Whiskers",
+            "meow": true
+        }
+        """
+        result = client.no_envelope.default.put(cat_body)
+        assert result == cat_body
+        assert isinstance(result, models.Cat)
+
+
+# Tests for No Envelope / Custom Discriminator (inline with custom "type" property)
+@pytest.mark.skip(reason="After completely support discriminated unions, enable these tests")
+class TestNoEnvelopeCustomDiscriminator:
+    """Test discriminated union with inline discriminator and custom discriminator property name."""
+
+    def test_get_default_cat(self, client: DiscriminatedClient, cat_body: models.Cat):
+        """Test getting cat with default (no query param or type=cat).
+
+        Expected response:
+        {
+            "type": "cat",
+            "name": "Whiskers",
+            "meow": true
+        }
+        """
+        result = client.no_envelope.custom_discriminator.get()
+        assert result == cat_body
+        assert isinstance(result, models.Cat)
+
+    def test_get_with_type_cat(self, client: DiscriminatedClient, cat_body: models.Cat):
+        """Test getting cat with type=cat query parameter.
+
+        Expected response:
+        {
+            "type": "cat",
+            "name": "Whiskers",
+            "meow": true
+        }
+        """
+        result = client.no_envelope.custom_discriminator.get(type="cat")
+        assert result == cat_body
+        assert isinstance(result, models.Cat)
+
+    def test_get_with_type_dog(self, client: DiscriminatedClient, dog_body: models.Dog):
+        """Test getting dog with type=dog query parameter.
+
+        Expected response:
+        {
+            "type": "dog",
+            "name": "Rex",
+            "bark": false
+        }
+        """
+        result = client.no_envelope.custom_discriminator.get(type="dog")
+        assert result == dog_body
+        assert isinstance(result, models.Dog)
+
+    def test_put_cat(self, client: DiscriminatedClient, cat_body: models.Cat):
+        """Test sending cat with inline custom discriminator.
+
+        Expected request:
+        {
+            "type": "cat",
+            "name": "Whiskers",
+            "meow": true
+        }
+        """
+        result = client.no_envelope.custom_discriminator.put(cat_body)
+        assert result == cat_body
+        assert isinstance(result, models.Cat)
+
+
+# Tests for Envelope / Object / Default (envelope with "kind" and "value")
+@pytest.mark.skip(reason="After completely support discriminated unions, enable these tests")
+class TestEnvelopeObjectDefault:
+    """Test discriminated union with default envelope serialization."""
+
+    def test_get_default_cat(self, client: DiscriminatedClient, cat_body: models.Cat):
+        """Test getting cat with default (no query param or kind=cat).
+
+        Expected response:
+        {
+            "kind": "cat",
+            "value": {
+                "name": "Whiskers",
+                "meow": true
+            }
+        }
+        """
+        result = client.envelope.object.default.get()
+        assert result == cat_body
+        assert isinstance(result, models.Cat)
+
+    def test_get_with_kind_cat(self, client: DiscriminatedClient, cat_body: models.Cat):
+        """Test getting cat with kind=cat query parameter.
+
+        Expected response:
+        {
+            "kind": "cat",
+            "value": {
+                "name": "Whiskers",
+                "meow": true
+            }
+        }
+        """
+        result = client.envelope.object.default.get(kind="cat")
+        assert result == cat_body
+        assert isinstance(result, models.Cat)
+
+    def test_get_with_kind_dog(self, client: DiscriminatedClient, dog_body: models.Dog):
+        """Test getting dog with kind=dog query parameter.
+
+        Expected response:
+        {
+            "kind": "dog",
+            "value": {
+                "name": "Rex",
+                "bark": false
+            }
+        }
+        """
+        result = client.envelope.object.default.get(kind="dog")
+        assert result == dog_body
+        assert isinstance(result, models.Dog)
+
+    def test_put_cat(self, client: DiscriminatedClient, cat_body: models.Cat):
+        """Test sending cat with envelope serialization.
+
+        Expected request:
+        {
+            "kind": "cat",
+            "value": {
+                "name": "Whiskers",
+                "meow": true
+            }
+        }
+        """
+        result = client.envelope.object.default.put(cat_body)
+        assert result == cat_body
+        assert isinstance(result, models.Cat)
+
+
+# Tests for Envelope / Object / Custom Properties (envelope with custom "petType" and "petData")
+@pytest.mark.skip(reason="After completely support discriminated unions, enable these tests")
+class TestEnvelopeObjectCustomProperties:
+    """Test discriminated union with custom property names in envelope."""
+
+    def test_get_default_cat(self, client: DiscriminatedClient, cat_body: models.Cat):
+        """Test getting cat with default (no query param or petType=cat).
+
+        Expected response:
+        {
+            "petType": "cat",
+            "petData": {
+                "name": "Whiskers",
+                "meow": true
+            }
+        }
+        """
+        result = client.envelope.object.custom_properties.get()
+        assert result == cat_body
+        assert isinstance(result, models.Cat)
+
+    def test_get_with_pet_type_cat(self, client: DiscriminatedClient, cat_body: models.Cat):
+        """Test getting cat with petType=cat query parameter.
+
+        Expected response:
+        {
+            "petType": "cat",
+            "petData": {
+                "name": "Whiskers",
+                "meow": true
+            }
+        }
+        """
+        result = client.envelope.object.custom_properties.get(pet_type="cat")
+        assert result == cat_body
+        assert isinstance(result, models.Cat)
+
+    def test_get_with_pet_type_dog(self, client: DiscriminatedClient, dog_body: models.Dog):
+        """Test getting dog with petType=dog query parameter.
+
+        Expected response:
+        {
+            "petType": "dog",
+            "petData": {
+                "name": "Rex",
+                "bark": false
+            }
+        }
+        """
+        result = client.envelope.object.custom_properties.get(pet_type="dog")
+        assert result == dog_body
+        assert isinstance(result, models.Dog)
+
+    def test_put_cat(self, client: DiscriminatedClient, cat_body: models.Cat):
+        """Test sending cat with custom property names in envelope.
+
+        Expected request:
+        {
+            "petType": "cat",
+            "petData": {
+                "name": "Whiskers",
+                "meow": true
+            }
+        }
+        """
+        result = client.envelope.object.custom_properties.put(cat_body)
+        assert result == cat_body
+        assert isinstance(result, models.Cat)

package/generator/test/unbranded/requirements.txt

@@ -14,6 +14,7 @@
 -e ./generated/parameters-basic
 -e ./generated/parameters-collection-format
 -e ./generated/parameters-path
+-e ./generated/parameters-query
 -e ./generated/parameters-spread
 -e ./generated/serialization-encoded-name-json
 -e ./generated/server-endpoint-not-defined
@@ -40,6 +41,7 @@
 -e ./generated/typetest-property-additionalproperties
 -e ./generated/typetest-scalar
 -e ./generated/typetest-union
+-e ./generated/typetest-discriminatedunion
 -e ./generated/typetest-model-empty
 -e ./generated/headasbooleantrue
 -e ./generated/headasbooleanfalse

package/generator/test/unittests/test_model_base_serialization.py

@@ -332,6 +332,72 @@ def test_property_is_a_type():
     assert fishery.fish.species == fishery.fish["species"] == fishery["fish"]["species"] == "Salmon"
 
 
+def test_model_initialization():
+    class DatetimeModel(Model):
+        datetime_value: datetime.datetime = rest_field(name="datetimeValue")
+
+        @overload
+        def __init__(self, *, datetime_value: datetime.datetime): ...
+
+        @overload
+        def __init__(self, mapping: Mapping[str, Any], /): ...
+
+        def __init__(self, *args, **kwargs):
+            super().__init__(*args, **kwargs)
+
+    val_str = "9999-12-31T23:59:59.999000Z"
+    val = isodate.parse_datetime(val_str)
+
+    # when initialize model with dict, the dict value is shall be serialized value
+    model1 = DatetimeModel({"datetimeValue": val_str})
+    assert model1["datetimeValue"] == val_str
+    assert model1.datetime_value == val
+
+    # when initialize model with keyword args, the value is deserialized value
+    model2 = DatetimeModel(datetime_value=val)
+    assert model2["datetimeValue"] == val_str
+    assert model2.datetime_value == val
+
+    # what if we initialize with dict but the dict has deserialized value? this case show what happens.
+    # Since we always serialize the value before initializing the model from dict, we could still get correct result
+    model3 = DatetimeModel({"datetimeValue": val})
+    assert model3["datetimeValue"] == val_str
+    assert model3.datetime_value == val
+
+
+def test_model_dict_prop_initialization():
+    class DatetimeModel(Model):
+        dict_prop: dict[str, datetime.datetime] = rest_field(name="dictProp")
+
+        @overload
+        def __init__(self, *, dict_prop: dict[str, datetime.datetime]): ...
+
+        @overload
+        def __init__(self, mapping: Mapping[str, Any], /): ...
+
+        def __init__(self, *args, **kwargs):
+            super().__init__(*args, **kwargs)
+
+    val_str = "9999-12-31T23:59:59.999000Z"
+    val = isodate.parse_datetime(val_str)
+
+    # when initialize model with dict, the dict value is shall be serialized value
+    model1 = DatetimeModel({"dictProp": {"key1": val_str}})
+    assert model1["dictProp"] == {"key1": val_str}
+    assert model1.dict_prop == {"key1": val}
+
+    # when initialize model with keyword args, the value is deserialized value
+    model2 = DatetimeModel(dict_prop={"key1": val})
+    assert model2["dictProp"] == {"key1": val_str}
+    assert model2.dict_prop == {"key1": val}
+
+    # what if we initialize with dict but the dict has deserialized value? this case show what happens.
+    # Since we always serialize the value before initializing the model from dict, we could still get correct result
+    model3 = DatetimeModel({"dictProp": {"key1": val}})
+    assert model3["dictProp"] == {"key1": val_str}
+    assert model3.dict_prop == {"key1": val}
+
+
 def test_datetime_deserialization():
     class DatetimeModel(Model):
         datetime_value: datetime.datetime = rest_field(name="datetimeValue")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",
@@ -58,7 +58,7 @@
     "@azure-tools/typespec-azure-core": ">=0.63.0 <1.0.0",
     "@azure-tools/typespec-azure-resource-manager": ">=0.63.0 <1.0.0",
     "@azure-tools/typespec-azure-rulesets": ">=0.63.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.63.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.63.4 <1.0.0",
     "@typespec/compiler": "^1.7.0",
     "@typespec/http": "^1.7.0",
     "@typespec/openapi": "^1.7.0",
@@ -81,8 +81,8 @@
     "@azure-tools/typespec-azure-core": "~0.63.0",
     "@azure-tools/typespec-azure-resource-manager": "~0.63.0",
     "@azure-tools/typespec-azure-rulesets": "~0.63.0",
-    "@azure-tools/typespec-client-generator-core": "~0.63.0",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.33",
+    "@azure-tools/typespec-client-generator-core": "~0.63.4",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.35-dev.8",
     "@typespec/compiler": "^1.7.0",
     "@typespec/http": "^1.7.0",
     "@typespec/openapi": "^1.7.0",
@@ -94,7 +94,7 @@
     "@typespec/sse": "~0.77.0",
     "@typespec/streams": "~0.77.0",
     "@typespec/xml": "~0.77.0",
-    "@typespec/http-specs": "0.1.0-alpha.29",
+    "@typespec/http-specs": "0.1.0-alpha.30-dev.1",
     "@types/js-yaml": "~4.0.5",
     "@types/node": "~24.1.0",
     "@types/semver": "7.5.8",