@typespec/http-client-python 0.26.3 → 0.27.1

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_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

@@ -7,7 +7,9 @@ azure-mgmt-core==1.6.0
 -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 +39,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
@@ -80,6 +84,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

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

@@ -117,3 +117,12 @@ 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_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_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

@@ -105,3 +105,11 @@ 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_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/requirements.txt

@@ -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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.26.3",
+  "version": "0.27.1",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",
@@ -54,20 +54,20 @@
     "emitter"
   ],
   "peerDependencies": {
-    "@azure-tools/typespec-autorest": ">=0.64.1 <1.0.0",
-    "@azure-tools/typespec-azure-core": ">=0.64.0 <1.0.0",
-    "@azure-tools/typespec-azure-resource-manager": ">=0.64.1 <1.0.0",
-    "@azure-tools/typespec-azure-rulesets": ">=0.64.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.64.5 <1.0.0",
-    "@typespec/compiler": "^1.8.0",
-    "@typespec/http": "^1.8.0",
-    "@typespec/openapi": "^1.8.0",
-    "@typespec/rest": ">=0.78.0 <1.0.0",
-    "@typespec/versioning": ">=0.78.0 <1.0.0",
-    "@typespec/events": ">=0.78.0 <1.0.0",
-    "@typespec/sse": ">=0.78.0 <1.0.0",
-    "@typespec/streams": ">=0.78.0 <1.0.0",
-    "@typespec/xml": ">=0.78.0 <1.0.0"
+    "@azure-tools/typespec-autorest": ">=0.65.0 <1.0.0",
+    "@azure-tools/typespec-azure-core": ">=0.65.0 <1.0.0",
+    "@azure-tools/typespec-azure-resource-manager": ">=0.65.0 <1.0.0",
+    "@azure-tools/typespec-azure-rulesets": ">=0.65.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.65.0 <1.0.0",
+    "@typespec/compiler": "^1.9.0",
+    "@typespec/http": "^1.9.0",
+    "@typespec/openapi": "^1.9.0",
+    "@typespec/rest": ">=0.79.0 <1.0.0",
+    "@typespec/versioning": ">=0.79.0 <1.0.0",
+    "@typespec/events": ">=0.79.0 <1.0.0",
+    "@typespec/sse": ">=0.79.0 <1.0.0",
+    "@typespec/streams": ">=0.79.0 <1.0.0",
+    "@typespec/xml": ">=0.79.0 <1.0.0"
   },
   "dependencies": {
     "js-yaml": "~4.1.0",
@@ -77,24 +77,24 @@
     "tsx": "~4.19.1"
   },
   "devDependencies": {
-    "@azure-tools/typespec-autorest": "~0.64.1",
-    "@azure-tools/typespec-azure-core": "~0.64.0",
-    "@azure-tools/typespec-azure-resource-manager": "~0.64.1",
-    "@azure-tools/typespec-azure-rulesets": "~0.64.0",
-    "@azure-tools/typespec-client-generator-core": "~0.64.5",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.36",
-    "@typespec/compiler": "^1.8.0",
-    "@typespec/http": "^1.8.0",
-    "@typespec/openapi": "^1.8.0",
-    "@typespec/rest": "~0.78.0",
-    "@typespec/versioning": "~0.78.0",
-    "@typespec/events": "~0.78.0",
-    "@typespec/spector": "0.1.0-alpha.22",
+    "@azure-tools/typespec-autorest": "~0.65.0",
+    "@azure-tools/typespec-azure-core": "~0.65.0",
+    "@azure-tools/typespec-azure-resource-manager": "~0.65.0",
+    "@azure-tools/typespec-azure-rulesets": "~0.65.0",
+    "@azure-tools/typespec-client-generator-core": "~0.65.0",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.37",
+    "@typespec/compiler": "^1.9.0",
+    "@typespec/http": "^1.9.0",
+    "@typespec/openapi": "^1.9.0",
+    "@typespec/rest": "~0.79.0",
+    "@typespec/versioning": "~0.79.0",
+    "@typespec/events": "~0.79.0",
+    "@typespec/spector": "0.1.0-alpha.23",
     "@typespec/spec-api": "0.1.0-alpha.12",
-    "@typespec/sse": "~0.78.0",
-    "@typespec/streams": "~0.78.0",
-    "@typespec/xml": "~0.78.0",
-    "@typespec/http-specs": "0.1.0-alpha.32-dev.1",
+    "@typespec/sse": "~0.79.0",
+    "@typespec/streams": "~0.79.0",
+    "@typespec/xml": "~0.79.0",
+    "@typespec/http-specs": "0.1.0-alpha.32",
     "@types/js-yaml": "~4.0.5",
     "@types/node": "~24.1.0",
     "@types/semver": "7.5.8",