@typespec/http-client-python 0.27.0 → 0.27.2

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

@@ -169,3 +169,30 @@ def test_optional_parts(client: MultiPartClient):
             profile_image=open(str(JPG), "rb"),
         )
     )
+
+
+def test_file_upload_file_specific_content_type(client: MultiPartClient):
+    client.form_data.file.upload_file_specific_content_type(
+        models.UploadFileSpecificContentTypeRequest(
+            file=("image.png", open(str(PNG), "rb"), "image/png"),
+        )
+    )
+
+
+def test_file_upload_file_required_filename(client: MultiPartClient):
+    client.form_data.file.upload_file_required_filename(
+        models.UploadFileRequiredFilenameRequest(
+            file=("image.png", open(str(PNG), "rb"), "image/png"),
+        )
+    )
+
+
+def test_file_upload_file_array(client: MultiPartClient):
+    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/requirements.txt

@@ -2,12 +2,15 @@
 -e ../../
 azure-mgmt-core==1.6.0
 
+# === common azure dependencies across repos ===
 # only for azure
 -e ./generated/azure-client-generator-core-access
 -e ./generated/azure-client-generator-core-api-version-header
 -e ./generated/azure-client-generator-core-api-version-path
 -e ./generated/azure-client-generator-core-api-version-query
--e ./generated/azure-client-generator-core-client-initialization
+-e ./generated/azure-client-generator-core-client-initialization-default
+-e ./generated/azure-client-generator-core-client-initialization-individually
+-e ./generated/azure-client-generator-core-client-initialization-individuallyparent
 -e ./generated/azure-client-generator-core-deserialize-empty-string-as-null
 -e ./generated/azure-client-generator-core-flatten-property
 -e ./generated/azure-client-generator-core-hierarchy-building
@@ -37,6 +40,8 @@ azure-mgmt-core==1.6.0
 -e ./generated/azure-resource-manager-resources
 -e ./generated/azure-resource-manager-method-subscription-id
 -e ./generated/azure-resource-manager-multi-service
+-e ./generated/azure-resource-manager-multi-service-older-versions
+-e ./generated/azure-resource-manager-multi-service-shared-models
 -e ./generated/azure-versioning-previewversion
 -e ./generated/client-namespace
 -e ./generated/azure-payload-pageable
@@ -51,8 +56,9 @@ azure-mgmt-core==1.6.0
 -e ./generated/resiliency-srv-driven1
 -e ./generated/resiliency-srv-driven2
 -e ./generated/service-multi-service
+# === end common azure dependencies across repos ===
 
-# common test case
+# === common test dependencies across repos ===
 -e ./generated/authentication-api-key
 -e ./generated/authentication-http-custom
 -e ./generated/authentication-noauth-union
@@ -80,6 +86,7 @@ azure-mgmt-core==1.6.0
 -e ./generated/typetest-dictionary
 -e ./generated/typetest-enum-extensible
 -e ./generated/typetest-enum-fixed
+# -e ./generated/typetest-file
 -e ./generated/typetest-model-enumdiscriminator
 -e ./generated/typetest-model-nesteddiscriminator
 -e ./generated/typetest-model-notdiscriminated
@@ -116,3 +123,4 @@ azure-mgmt-core==1.6.0
 -e ./generated/versioning-renamedfrom
 -e ./generated/versioning-returntypechangedfrom
 -e ./generated/versioning-typechangedfrom
+# === end common test dependencies across repos ===

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

@@ -13,7 +13,6 @@ from encode.bytes.models import (
     Base64urlArrayBytesProperty,
 )
 
-
 FILE_FOLDER = Path(__file__).parent.parent
 
 
@@ -98,6 +97,12 @@ async def test_header(client: BytesClient):
     )
 
 
+@pytest.fixture
+def png_data() -> bytes:
+    with open(str(FILE_FOLDER / "data/image.png"), "rb") as file_in:
+        return file_in.read()
+
+
 @pytest.mark.asyncio
 async def test_request_body(client: BytesClient, png_data: bytes):
     await client.request_body.default(

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

@@ -115,8 +115,13 @@ async def test_list_without_continuation(client: PageableClient):
     assert_result(result)
 
 
-# after https://github.com/microsoft/typespec/pull/9455 released, we could enable this test again
-# @pytest.mark.asyncio
-# async def test_xml_pagination_list_with_next_link(client: PageableClient):
-#     result = [p async for p in client.xml_pagination.list_with_next_link()]
-#     assert_result(result)
+@pytest.mark.asyncio
+async def test_xml_pagination_list_with_continuation(client: PageableClient):
+    result = [p async for p in client.xml_pagination.list_with_continuation()]
+    assert_result(result)
+
+
+@pytest.mark.asyncio
+async def test_xml_pagination_list_with_next_link(client: PageableClient):
+    result = [p async for p in client.xml_pagination.list_with_next_link()]
+    assert_result(result)

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

@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+import datetime
 import pytest
 from payload.xml.aio import XmlClient
 from payload.xml.models import (
@@ -18,6 +19,8 @@ from payload.xml.models import (
     ModelWithText,
     ModelWithDictionary,
     ModelWithEncodedNames,
+    ModelWithEnum,
+    ModelWithDatetime,
 )
 
 
@@ -117,3 +120,30 @@ async def test_model_with_encoded_names(client: XmlClient):
     model = ModelWithEncodedNames(model_data=SimpleModel(name="foo", age=123), colors=["red", "green", "blue"])
     assert await client.model_with_encoded_names_value.get() == model
     await client.model_with_encoded_names_value.put(model)
+
+
+@pytest.mark.asyncio
+async def test_model_with_enum(client: XmlClient):
+    model = ModelWithEnum(status="success")
+    assert await client.model_with_enum_value.get() == model
+    await client.model_with_enum_value.put(model)
+
+
+@pytest.mark.asyncio
+async def test_model_with_datetime(client: XmlClient):
+    model = ModelWithDatetime(
+        rfc3339=datetime.datetime(2022, 8, 26, 18, 38, 0, tzinfo=datetime.timezone.utc),
+        rfc7231=datetime.datetime(2022, 8, 26, 14, 38, 0, tzinfo=datetime.timezone.utc),
+    )
+    result = await client.model_with_datetime_value.get()
+    assert result.rfc3339 == model.rfc3339
+    assert result.rfc7231 == model.rfc7231
+
+
+@pytest.mark.asyncio
+async def test_xml_error_value(client: XmlClient, core_library):
+    with pytest.raises(core_library.exceptions.HttpResponseError) as ex:
+        await client.xml_error_value.get()
+    assert ex.value.status_code == 400
+    assert ex.value.model.message == "Something went wrong"
+    assert ex.value.model.code == 400

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

@@ -0,0 +1,59 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+# after we support Http.File case, enable these tests again
+
+
+# import json
+
+# import pytest
+# from typetest.file.aio import FileClient
+
+
+# @pytest.fixture
+# async def client():
+#     async with FileClient(endpoint="http://localhost:3000") as client:
+#         yield client
+
+
+# @pytest.mark.asyncio
+# async def test_upload_file_specific_content_type(client: FileClient, png_data: bytes):
+#     await client.body.upload_file_specific_content_type(png_data)
+
+
+# # Do not support this case for now
+# # @pytest.mark.asyncio
+# # async def test_upload_file_json_content_type(client: FileClient):
+# #     await client.body.upload_file_json_content_type(json.dumps({"message": "test file content"}).encode())
+
+
+# # although result is expected but actually there is deserialization issue
+# # @pytest.mark.asyncio
+# # async def test_download_file_json_content_type(client: FileClient):
+# #     result = await client.body.download_file_json_content_type()
+# #     assert result == {"message": "test file content"}
+
+
+# @pytest.mark.asyncio
+# async def test_download_file_specific_content_type(client: FileClient, png_data: bytes):
+#     result = b"".join([d async for d in (await client.body.download_file_specific_content_type())])
+#     assert result == png_data
+
+
+# @pytest.mark.asyncio
+# async def test_download_file_multiple_content_types(client: FileClient, png_data: bytes):
+#     result = b"".join([d async for d in (await client.body.download_file_multiple_content_types())])
+#     assert result == png_data
+
+
+# @pytest.mark.asyncio
+# async def test_upload_file_default_content_type(client: FileClient, png_data: bytes):
+#     await client.body.upload_file_default_content_type(png_data, content_type="image/png")
+
+
+# @pytest.mark.asyncio
+# async def test_download_file_default_content_type(client: FileClient, png_data: bytes):
+#     result = b"".join([d async for d in (await client.body.download_file_default_content_type())])
+#     assert result == png_data

package/generator/test/generic_mock_api_tests/test_encode_bytes.py

@@ -95,6 +95,12 @@ def test_header(client: BytesClient):
     )
 
 
+@pytest.fixture
+def png_data() -> bytes:
+    with open(str(FILE_FOLDER / "data/image.png"), "rb") as file_in:
+        return file_in.read()
+
+
 def test_request_body(client: BytesClient, png_data: bytes):
     client.request_body.default(
         value=png_data,

package/generator/test/generic_mock_api_tests/test_payload_pageable.py

@@ -83,7 +83,11 @@ def test_list_without_continuation(client: PageableClient):
     assert_result(result)
 
 
-# # after https://github.com/microsoft/typespec/pull/9455 released, we could enable this test again
-# def test_xml_pagination_list_with_next_link(client: PageableClient):
-#     result = list(client.xml_pagination.list_with_next_link())
-#     assert_result(result)
+def test_xml_pagination_list_with_continuation(client: PageableClient):
+    result = list(client.xml_pagination.list_with_continuation())
+    assert_result(result)
+
+
+def test_xml_pagination_list_with_next_link(client: PageableClient):
+    result = list(client.xml_pagination.list_with_next_link())
+    assert_result(result)

package/generator/test/generic_mock_api_tests/test_payload_xml.py

@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+import datetime
 import pytest
 from payload.xml import XmlClient
 from payload.xml.models import (
@@ -18,6 +19,8 @@ from payload.xml.models import (
     ModelWithText,
     ModelWithDictionary,
     ModelWithEncodedNames,
+    ModelWithEnum,
+    ModelWithDatetime,
 )
 
 
@@ -105,3 +108,27 @@ def test_model_with_encoded_names(client: XmlClient):
     model = ModelWithEncodedNames(model_data=SimpleModel(name="foo", age=123), colors=["red", "green", "blue"])
     assert client.model_with_encoded_names_value.get() == model
     client.model_with_encoded_names_value.put(model)
+
+
+def test_model_with_enum(client: XmlClient):
+    model = ModelWithEnum(status="success")
+    assert client.model_with_enum_value.get() == model
+    client.model_with_enum_value.put(model)
+
+
+def test_model_with_datetime(client: XmlClient):
+    model = ModelWithDatetime(
+        rfc3339=datetime.datetime(2022, 8, 26, 18, 38, 0, tzinfo=datetime.timezone.utc),
+        rfc7231=datetime.datetime(2022, 8, 26, 14, 38, 0, tzinfo=datetime.timezone.utc),
+    )
+    result = client.model_with_datetime_value.get()
+    assert result.rfc3339 == model.rfc3339
+    assert result.rfc7231 == model.rfc7231
+
+
+def test_xml_error_value(client: XmlClient, core_library):
+    with pytest.raises(core_library.exceptions.HttpResponseError) as ex:
+        client.xml_error_value.get()
+    assert ex.value.status_code == 400
+    assert ex.value.model.message == "Something went wrong"
+    assert ex.value.model.code == 400

package/generator/test/generic_mock_api_tests/test_typetest_file.py

@@ -0,0 +1,52 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+
+# after we support Http.File case, enable these tests again
+
+# import json
+
+# import pytest
+# from typetest.file import FileClient
+
+
+# @pytest.fixture
+# def client():
+#     with FileClient(endpoint="http://localhost:3000") as client:
+#         yield client
+
+
+# def test_upload_file_specific_content_type(client: FileClient, png_data: bytes):
+#     client.body.upload_file_specific_content_type(png_data)
+
+
+# # Do not support this case for now
+# # def test_upload_file_json_content_type(client: FileClient):
+# #     client.body.upload_file_json_content_type(json.dumps({"message": "test file content"}).encode())
+
+
+# # although result is expected but actually there is deserialization issue
+# # def test_download_file_json_content_type(client: FileClient):
+# #     result = client.body.download_file_json_content_type()
+# #     assert result == {"message": "test file content"}
+
+
+# def test_download_file_specific_content_type(client: FileClient, png_data: bytes):
+#     result = b"".join(client.body.download_file_specific_content_type())
+#     assert result == png_data
+
+
+# def test_download_file_multiple_content_types(client: FileClient, png_data: bytes):
+#     result = b"".join(client.body.download_file_multiple_content_types())
+#     assert result == png_data
+
+
+# def test_upload_file_default_content_type(client: FileClient, png_data: bytes):
+#     client.body.upload_file_default_content_type(png_data, content_type="image/png")
+
+
+# def test_download_file_default_content_type(client: FileClient, png_data: bytes):
+#     result = b"".join(client.body.download_file_default_content_type())
+#     assert result == png_data

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

@@ -8,6 +8,7 @@ import pytest
 from payload.multipart import models
 from payload.multipart.aio import MultiPartClient
 from payload.multipart.formdata.httpparts.nonstring.models import FloatRequest
+from payload.multipart.formdata.file import models as file_models
 
 JPG = Path(__file__).parent.parent / "data/image.jpg"
 PNG = Path(__file__).parent.parent / "data/image.png"
@@ -185,3 +186,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(
+        file_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(
+        file_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(
+        file_models.UploadFileArrayRequest(
+            files=[
+                ("image.png", open(str(PNG), "rb"), "image/png"),
+                ("image.png", open(str(PNG), "rb"), "image/png"),
+            ],
+        )
+    )

package/generator/test/unbranded/mock_api_tests/test_payload_multipart.py

@@ -7,6 +7,7 @@ from pathlib import Path
 import pytest
 from payload.multipart import MultiPartClient, models
 from payload.multipart.formdata.httpparts.nonstring.models import FloatRequest
+from payload.multipart.formdata.file import models as file_models
 
 JPG = Path(__file__).parent / "data/image.jpg"
 PNG = Path(__file__).parent / "data/image.png"
@@ -170,3 +171,30 @@ def test_optional_parts(client: MultiPartClient):
             profile_image=open(str(JPG), "rb"),
         )
     )
+
+
+def test_file_upload_file_specific_content_type(client: MultiPartClient):
+    client.form_data.file.upload_file_specific_content_type(
+        file_models.UploadFileSpecificContentTypeRequest(
+            file=("image.png", open(str(PNG), "rb"), "image/png"),
+        )
+    )
+
+
+def test_file_upload_file_required_filename(client: MultiPartClient):
+    client.form_data.file.upload_file_required_filename(
+        file_models.UploadFileRequiredFilenameRequest(
+            file=("image.png", open(str(PNG), "rb"), "image/png"),
+        )
+    )
+
+
+def test_file_upload_file_array(client: MultiPartClient):
+    client.form_data.file.upload_file_array(
+        file_models.UploadFileArrayRequest(
+            files=[
+                ("image.png", open(str(PNG), "rb"), "image/png"),
+                ("image.png", open(str(PNG), "rb"), "image/png"),
+            ],
+        )
+    )

package/generator/test/unbranded/mock_api_tests/test_unbranded.py

@@ -54,11 +54,12 @@ def test_sensitive_word():
     check_folder = (Path(os.path.dirname(__file__)) / "../generated").resolve()
     assert [] == check_sensitive_word(check_folder, "azure")
     # after update spector, it shall also equal to []
-    assert sorted(
-        [
-            "authentication-oauth2",
-            "authentication-noauth-union",
-            "authentication-union",
-            "setuppy-authentication-union",
-        ]
-    ) == sorted(check_sensitive_word(check_folder, "microsoft"))
+    expected = [
+        "authentication-oauth2",
+        "authentication-noauth-union",
+        "authentication-union",
+        "setuppy-authentication-union",
+    ]
+    if (check_folder / "generation-subdir").exists():
+        expected.append("generation-subdir")
+    assert sorted(expected) == sorted(check_sensitive_word(check_folder, "microsoft"))

package/generator/test/unbranded/requirements.txt

@@ -1,7 +1,7 @@
 -r ../dev_requirements.txt
 -e ../../
 
-# common test case
+# === common test dependencies across repos ===
 -e ./generated/authentication-api-key
 -e ./generated/authentication-http-custom
 -e ./generated/authentication-noauth-union
@@ -29,6 +29,7 @@
 -e ./generated/typetest-dictionary
 -e ./generated/typetest-enum-extensible
 -e ./generated/typetest-enum-fixed
+# -e ./generated/typetest-file
 -e ./generated/typetest-model-enumdiscriminator
 -e ./generated/typetest-model-nesteddiscriminator
 -e ./generated/typetest-model-notdiscriminated
@@ -65,3 +66,4 @@
 -e ./generated/versioning-renamedfrom
 -e ./generated/versioning-returntypechangedfrom
 -e ./generated/versioning-typechangedfrom
+# === end common test dependencies across repos ===

package/generator/test/unittests/test_model_base_serialization.py

@@ -4743,3 +4743,164 @@ def test_dictionary_set_datetime():
     assert dict_ref1 is dict_ref2
     assert isinstance(dict_ref1["start"], datetime)
     assert isinstance(dict_ref2["start"], datetime)
+
+
+def test_eq_same_model_instances():
+    """Two model instances with the same data should be equal."""
+    model1 = BasicResource(
+        platform_update_domain_count=5,
+        platform_fault_domain_count=3,
+        virtual_machines=[],
+    )
+    model2 = BasicResource(
+        platform_update_domain_count=5,
+        platform_fault_domain_count=3,
+        virtual_machines=[],
+    )
+    assert model1 == model2
+
+
+def test_eq_different_model_data():
+    """Two model instances with different data should not be equal."""
+    model1 = BasicResource(
+        platform_update_domain_count=5,
+        platform_fault_domain_count=3,
+        virtual_machines=[],
+    )
+    model2 = BasicResource(
+        platform_update_domain_count=10,
+        platform_fault_domain_count=3,
+        virtual_machines=[],
+    )
+    assert model1 != model2
+
+
+def test_eq_model_constructed_from_dict():
+    """A model created via kwargs and a model created from a dict should be equal."""
+    dict_response = {
+        "platformUpdateDomainCount": 5,
+        "platformFaultDomainCount": 3,
+        "virtualMachines": [],
+    }
+    model_from_kwargs = BasicResource(
+        platform_update_domain_count=5,
+        platform_fault_domain_count=3,
+        virtual_machines=[],
+    )
+    model_from_dict = BasicResource(dict_response)
+    assert model_from_kwargs == model_from_dict
+
+
+def test_eq_model_equal_to_plain_dict():
+    """A model should be equal to a plain dict with matching data (backward compat)."""
+    dict_response = {
+        "platformUpdateDomainCount": 5,
+        "platformFaultDomainCount": 3,
+        "virtualMachines": [],
+    }
+    model = BasicResource(
+        platform_update_domain_count=5,
+        platform_fault_domain_count=3,
+        virtual_machines=[],
+    )
+    assert model == dict_response
+
+
+def test_eq_model_not_equal_to_non_model_types():
+    """A model should not be equal to strings, ints, None, or lists."""
+    model = BasicResource(
+        platform_update_domain_count=5,
+        platform_fault_domain_count=3,
+        virtual_machines=[],
+    )
+    assert model != "some string"
+    assert model != 42
+    assert model != None  # noqa: E711
+    assert model != []
+    assert model != True  # noqa: E712
+
+
+def test_eq_different_model_types_same_data():
+    """Two different model types with the same underlying _data should be equal
+    since isinstance checks against _MyMutableMapping, not the specific subclass."""
+    model1 = Pet(name="test", species="dog")
+
+    class AnotherModel(Model):
+        name: str = rest_field()
+        species: str = rest_field()
+
+        @overload
+        def __init__(self, *, name: str, species: str): ...
+
+        @overload
+        def __init__(self, mapping: Mapping[str, Any], /): ...
+
+        def __init__(self, *args, **kwargs):
+            super().__init__(*args, **kwargs)
+
+    model2 = AnotherModel(name="test", species="dog")
+    assert model1 == model2
+
+
+def test_ne_is_inverse_of_eq():
+    """__ne__ should return the inverse of __eq__."""
+    model1 = BasicResource(
+        platform_update_domain_count=5,
+        platform_fault_domain_count=3,
+        virtual_machines=[],
+    )
+    model2 = BasicResource(
+        platform_update_domain_count=5,
+        platform_fault_domain_count=3,
+        virtual_machines=[],
+    )
+    model3 = BasicResource(
+        platform_update_domain_count=10,
+        platform_fault_domain_count=3,
+        virtual_machines=[],
+    )
+    assert not (model1 != model2)
+    assert model1 != model3
+
+
+def test_eq_nested_models():
+    """Two models with identical nested model children should be equal."""
+    model1 = OptionalModel(
+        optional_str="hello",
+        optional_time=datetime.time(11, 34, 56),
+        optional_dict={
+            "buddy": Pet(name="Buddy", species="Dog"),
+        },
+        optional_myself=OptionalModel(optional_str="inner"),
+    )
+    model2 = OptionalModel(
+        optional_str="hello",
+        optional_time=datetime.time(11, 34, 56),
+        optional_dict={
+            "buddy": Pet(name="Buddy", species="Dog"),
+        },
+        optional_myself=OptionalModel(optional_str="inner"),
+    )
+    assert model1 == model2
+
+    # Change the nested model's data — they should no longer be equal
+    model2_different_inner = OptionalModel(
+        optional_str="hello",
+        optional_time=datetime.time(11, 34, 56),
+        optional_dict={
+            "buddy": Pet(name="Buddy", species="Dog"),
+        },
+        optional_myself=OptionalModel(optional_str="different"),
+    )
+    assert model1 != model2_different_inner
+
+    # Change the nested Pet — they should no longer be equal
+    model2_different_pet = OptionalModel(
+        optional_str="hello",
+        optional_time=datetime.time(11, 34, 56),
+        optional_dict={
+            "buddy": Pet(name="Max", species="Cat"),
+        },
+        optional_myself=OptionalModel(optional_str="inner"),
+    )
+    assert model1 != model2_different_pet