@typespec/http-client-python 0.28.0 → 0.28.2

package/eng/scripts/Build-Packages.ps1

@@ -77,7 +77,7 @@ finally {
 }
 
 if ($PublishType -eq "internal") {
-    $feedUrl = "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js-test-autorest/npm/registry"
+    $feedUrl = "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js/npm/registry"
 
     $overrides = @{
         "@typespec/http-client-python" = "$feedUrl/@typespec/http-client-python/-/http-client-python-$emitterVersion.tgz"

package/eng/scripts/setup/package_manager.py

@@ -25,7 +25,7 @@ def _check_command_available(command: str) -> bool:
     try:
         subprocess.run([command, "--version"], capture_output=True, check=True)
         return True
-    except (subprocess.CalledProcessError, FileNotFoundError):
+    except (subprocess.CalledProcessError, FileNotFoundError, PermissionError):
         return False
 
 
@@ -50,7 +50,7 @@ def detect_package_manager() -> str:
     try:
         subprocess.run([sys.executable, "-m", "pip", "--version"], capture_output=True, check=True)
         return "python -m pip"
-    except (subprocess.CalledProcessError, FileNotFoundError):
+    except (subprocess.CalledProcessError, FileNotFoundError, PermissionError):
         pass
 
     raise PackageManagerNotFoundError("No suitable package manager found. Please install either uv or pip.")

package/generator/build/lib/pygen/codegen/models/operation.py

@@ -449,21 +449,22 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
                     file_import.add_import("json", ImportType.STDLIB)
             if self.enable_import_deserialize_xml:
                 file_import.add_submodule_import(relative_path, "_deserialize_xml", ImportType.LOCAL)
-            elif self.need_deserialize:
+            if any(
+                r.type
+                and not isinstance(r.type, BinaryIteratorType)
+                and not xml_serializable(str(r.default_content_type))
+                for r in self.responses
+            ):
                 file_import.add_submodule_import(relative_path, "_deserialize", ImportType.LOCAL)
             if self.default_error_deserialization(serialize_namespace) or self.non_default_errors:
-                xml_non_default_errors = any(
-                    xml_serializable(str(e.default_content_type)) for e in self.non_default_errors
-                )
                 try:
                     default_error = next(e for e in self.exceptions if "default" in e.status_codes and e.type)
                 except StopIteration:
                     default_error = None
-                if xml_non_default_errors or (
-                    default_error and xml_serializable(str(default_error.default_content_type))
-                ):
+                all_errors = list(self.non_default_errors) + ([default_error] if default_error else [])
+                if any(xml_serializable(str(e.default_content_type)) for e in all_errors):
                     file_import.add_submodule_import(relative_path, "_failsafe_deserialize_xml", ImportType.LOCAL)
-                else:
+                if any(not xml_serializable(str(e.default_content_type)) for e in all_errors):
                     file_import.add_submodule_import(relative_path, "_failsafe_deserialize", ImportType.LOCAL)
         return file_import
 

package/generator/build/lib/pygen/codegen/models/parameter.py

@@ -109,10 +109,16 @@ class _ParameterBase(BaseModel, abc.ABC):  # pylint: disable=too-many-instance-a
         if type_description:
             base_description = add_to_description(base_description, type_description)
         if self.optional and isinstance(self.type, ConstantType):
-            base_description = add_to_description(
-                base_description,
-                f"Known values are {self.get_declaration()} and None.",
-            )
+            if self.is_api_version:
+                base_description = add_to_description(
+                    base_description,
+                    f"Known values are {self.get_declaration()}.",
+                )
+            else:
+                base_description = add_to_description(
+                    base_description,
+                    f"Known values are {self.get_declaration()} and None.",
+                )
         if not (self.optional or self.client_default_value):
             base_description = add_to_description(base_description, "Required.")
         if self.client_default_value is not None:

package/generator/pygen/codegen/models/operation.py

@@ -449,21 +449,22 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
                     file_import.add_import("json", ImportType.STDLIB)
             if self.enable_import_deserialize_xml:
                 file_import.add_submodule_import(relative_path, "_deserialize_xml", ImportType.LOCAL)
-            elif self.need_deserialize:
+            if any(
+                r.type
+                and not isinstance(r.type, BinaryIteratorType)
+                and not xml_serializable(str(r.default_content_type))
+                for r in self.responses
+            ):
                 file_import.add_submodule_import(relative_path, "_deserialize", ImportType.LOCAL)
             if self.default_error_deserialization(serialize_namespace) or self.non_default_errors:
-                xml_non_default_errors = any(
-                    xml_serializable(str(e.default_content_type)) for e in self.non_default_errors
-                )
                 try:
                     default_error = next(e for e in self.exceptions if "default" in e.status_codes and e.type)
                 except StopIteration:
                     default_error = None
-                if xml_non_default_errors or (
-                    default_error and xml_serializable(str(default_error.default_content_type))
-                ):
+                all_errors = list(self.non_default_errors) + ([default_error] if default_error else [])
+                if any(xml_serializable(str(e.default_content_type)) for e in all_errors):
                     file_import.add_submodule_import(relative_path, "_failsafe_deserialize_xml", ImportType.LOCAL)
-                else:
+                if any(not xml_serializable(str(e.default_content_type)) for e in all_errors):
                     file_import.add_submodule_import(relative_path, "_failsafe_deserialize", ImportType.LOCAL)
         return file_import
 

package/generator/pygen/codegen/models/parameter.py

@@ -109,10 +109,16 @@ class _ParameterBase(BaseModel, abc.ABC):  # pylint: disable=too-many-instance-a
         if type_description:
             base_description = add_to_description(base_description, type_description)
         if self.optional and isinstance(self.type, ConstantType):
-            base_description = add_to_description(
-                base_description,
-                f"Known values are {self.get_declaration()} and None.",
-            )
+            if self.is_api_version:
+                base_description = add_to_description(
+                    base_description,
+                    f"Known values are {self.get_declaration()}.",
+                )
+            else:
+                base_description = add_to_description(
+                    base_description,
+                    f"Known values are {self.get_declaration()} and None.",
+                )
         if not (self.optional or self.client_default_value):
             base_description = add_to_description(base_description, "Required.")
         if self.client_default_value is not None:

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

@@ -16,17 +16,17 @@ async def client():
 
 @pytest.mark.asyncio
 async def test_client(client: NamingClient):
-    await client.client(models.ClientNameModel(client_name=True))
+    await client.property.client(models.ClientNameModel(client_name=True))
 
 
 @pytest.mark.asyncio
 async def test_language(client: NamingClient):
-    await client.language(models.LanguageClientNameModel(python_name=True))
+    await client.property.language(models.LanguageClientNameModel(python_name=True))
 
 
 @pytest.mark.asyncio
 async def test_compatible_with_encoded_name(client: NamingClient):
-    await client.compatible_with_encoded_name(models.ClientNameAndJsonEncodedNameModel(client_name=True))
+    await client.property.compatible_with_encoded_name(models.ClientNameAndJsonEncodedNameModel(client_name=True))
 
 
 @pytest.mark.asyncio
@@ -41,12 +41,12 @@ async def test_parameter(client: NamingClient):
 
 @pytest.mark.asyncio
 async def test_header_request(client: NamingClient):
-    await client.request(client_name="true")
+    await client.header.request(client_name="true")
 
 
 @pytest.mark.asyncio
 async def test_header_response(client: NamingClient):
-    assert (await client.response(cls=lambda x, y, z: z))["default-name"] == "true"
+    assert (await client.header.response(cls=lambda x, y, z: z))["default-name"] == "true"
 
 
 @pytest.mark.asyncio

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

@@ -38,6 +38,7 @@ async def test_structure_multiclient():
     await client_b.renamed_six()
 
 
+@pytest.mark.skip(reason="will reopen the cases after upgrade `@azure-tools/typespec-client-generator-core` to 0.67.0")
 @pytest.mark.asyncio
 async def test_structure_renamed_operation():
     client = RenamedOperationClient(endpoint="http://localhost:3000", client=ClientType.RENAMED_OPERATION)
@@ -45,18 +46,19 @@ async def test_structure_renamed_operation():
     await client.renamed_three()
     await client.renamed_five()
 
-    await client.group.renamed_two()
-    await client.group.renamed_four()
-    await client.group.renamed_six()
+    await client.renamed_two()
+    await client.renamed_four()
+    await client.renamed_six()
 
 
+@pytest.mark.skip(reason="will reopen the cases after upgrade `@azure-tools/typespec-client-generator-core` to 0.67.0")
 @pytest.mark.asyncio
 async def test_structure_two_operation_group():
-    client = TwoOperationGroupClient(endpoint="http://localhost:3000", client=ClientType.RENAMED_OPERATION)
-    await client.group1.one()
-    await client.group1.three()
-    await client.group1.four()
-
-    await client.group2.two()
-    await client.group2.five()
-    await client.group2.six()
+    client = TwoOperationGroupClient(endpoint="http://localhost:3000", client=ClientType.TWO_OPERATION_GROUP)
+    await client.one()
+    await client.three()
+    await client.four()
+
+    await client.two()
+    await client.five()
+    await client.six()

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

@@ -8,22 +8,24 @@ from client.structure.clientoperationgroup.models import ClientType
 from client.structure.clientoperationgroup.aio import FirstClient, SecondClient
 
 
+@pytest.mark.skip(reason="will reopen the cases after upgrade `@azure-tools/typespec-client-generator-core` to 0.67.0")
 @pytest.mark.asyncio
 async def test_first_client_operations():
     client = FirstClient(endpoint="http://localhost:3000", client=ClientType.CLIENT_OPERATION_GROUP)
 
     await client.one()
 
-    await client.group3.two()
-    await client.group3.three()
+    await client.two()
+    await client.three()
 
-    await client.group4.four()
+    await client.four()
 
 
+@pytest.mark.skip(reason="will reopen the cases after upgrade `@azure-tools/typespec-client-generator-core` to 0.67.0")
 @pytest.mark.asyncio
 async def test_second_client_operations():
     client = SecondClient(endpoint="http://localhost:3000", client=ClientType.CLIENT_OPERATION_GROUP)
 
     await client.five()
 
-    await client.group5.six()
+    await client.six()

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

@@ -14,15 +14,15 @@ def client():
 
 
 def test_client(client: NamingClient):
-    client.client(models.ClientNameModel(client_name=True))
+    client.property.client(models.ClientNameModel(client_name=True))
 
 
 def test_language(client: NamingClient):
-    client.language(models.LanguageClientNameModel(python_name=True))
+    client.property.language(models.LanguageClientNameModel(python_name=True))
 
 
 def test_compatible_with_encoded_name(client: NamingClient):
-    client.compatible_with_encoded_name(models.ClientNameAndJsonEncodedNameModel(client_name=True))
+    client.property.compatible_with_encoded_name(models.ClientNameAndJsonEncodedNameModel(client_name=True))
 
 
 def test_operation(client: NamingClient):
@@ -34,11 +34,11 @@ def test_parameter(client: NamingClient):
 
 
 def test_header_request(client: NamingClient):
-    client.request(client_name="true")
+    client.header.request(client_name="true")
 
 
 def test_header_response(client: NamingClient):
-    assert client.response(cls=lambda x, y, z: z)["default-name"] == "true"
+    assert client.header.response(cls=lambda x, y, z: z)["default-name"] == "true"
 
 
 def test_model_client(client: NamingClient):

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

@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+import pytest
 from client.structure.service.models import ClientType
 from client.structure.service import ServiceClient
 from client.structure.multiclient import ClientAClient, ClientBClient
@@ -35,23 +36,25 @@ def test_structure_multiclient():
     client_b.renamed_six()
 
 
+@pytest.mark.skip(reason="will reopen the cases after upgrade `@azure-tools/typespec-client-generator-core` to 0.67.0")
 def test_structure_renamed_operation():
     client = RenamedOperationClient(endpoint="http://localhost:3000", client=ClientType.RENAMED_OPERATION)
     client.renamed_one()
     client.renamed_three()
     client.renamed_five()
 
-    client.group.renamed_two()
-    client.group.renamed_four()
-    client.group.renamed_six()
+    client.renamed_two()
+    client.renamed_four()
+    client.renamed_six()
 
 
+@pytest.mark.skip(reason="will reopen the cases after upgrade `@azure-tools/typespec-client-generator-core` to 0.67.0")
 def test_structure_two_operation_group():
     client = TwoOperationGroupClient(endpoint="http://localhost:3000", client=ClientType.TWO_OPERATION_GROUP)
-    client.group1.one()
-    client.group1.three()
-    client.group1.four()
+    client.one()
+    client.three()
+    client.four()
 
-    client.group2.two()
-    client.group2.five()
-    client.group2.six()
+    client.two()
+    client.five()
+    client.six()

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

@@ -3,24 +3,27 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+import pytest
 from client.structure.clientoperationgroup.models import ClientType
 from client.structure.clientoperationgroup import FirstClient, SecondClient
 
 
+@pytest.mark.skip(reason="will reopen the cases after upgrade `@azure-tools/typespec-client-generator-core` to 0.67.0")
 def test_first_client_operations():
     client = FirstClient(endpoint="http://localhost:3000", client=ClientType.CLIENT_OPERATION_GROUP)
 
     client.one()
 
-    client.group3.two()
-    client.group3.three()
+    client.two()
+    client.three()
 
-    client.group4.four()
+    client.four()
 
 
+@pytest.mark.skip(reason="will reopen the cases after upgrade `@azure-tools/typespec-client-generator-core` to 0.67.0")
 def test_second_client_operations():
     client = SecondClient(endpoint="http://localhost:3000", client=ClientType.CLIENT_OPERATION_GROUP)
 
     client.five()
 
-    client.group5.six()
+    client.six()

package/generator/test/azure/requirements.txt

@@ -40,7 +40,6 @@ 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

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

@@ -5,6 +5,7 @@
 # --------------------------------------------------------------------------
 import pytest
 from payload.pageable.aio import PageableClient
+from payload.pageable.serverdrivenpagination.alternateinitialverb.models import Filter
 
 
 @pytest.fixture
@@ -125,3 +126,9 @@ async def test_xml_pagination_list_with_continuation(client: PageableClient):
 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_alternate_initial_verb_post(client: PageableClient):
+    result = [p async for p in client.server_driven_pagination.alternate_initial_verb.post(Filter(filter="foo eq bar"))]
+    assert_result(result)

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

@@ -138,6 +138,7 @@ async def test_model_with_datetime(client: XmlClient):
     result = await client.model_with_datetime_value.get()
     assert result.rfc3339 == model.rfc3339
     assert result.rfc7231 == model.rfc7231
+    await client.model_with_datetime_value.put(model)
 
 
 @pytest.mark.asyncio

package/generator/test/generic_mock_api_tests/test_payload_pageable.py

@@ -5,6 +5,7 @@
 # --------------------------------------------------------------------------
 import pytest
 from payload.pageable import PageableClient
+from payload.pageable.serverdrivenpagination.alternateinitialverb.models import Filter
 
 
 @pytest.fixture
@@ -91,3 +92,8 @@ def test_xml_pagination_list_with_continuation(client: PageableClient):
 def test_xml_pagination_list_with_next_link(client: PageableClient):
     result = list(client.xml_pagination.list_with_next_link())
     assert_result(result)
+
+
+def test_alternate_initial_verb_post(client: PageableClient):
+    result = list(client.server_driven_pagination.alternate_initial_verb.post(Filter(filter="foo eq bar")))
+    assert_result(result)

package/generator/test/generic_mock_api_tests/test_payload_xml.py

@@ -124,6 +124,7 @@ def test_model_with_datetime(client: XmlClient):
     result = client.model_with_datetime_value.get()
     assert result.rfc3339 == model.rfc3339
     assert result.rfc7231 == model.rfc7231
+    client.model_with_datetime_value.put(model)
 
 
 def test_xml_error_value(client: XmlClient, core_library):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.28.0",
+  "version": "0.28.2",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",
@@ -54,11 +54,11 @@
     "emitter"
   ],
   "peerDependencies": {
-    "@azure-tools/typespec-autorest": ">=0.66.0 <1.0.0",
-    "@azure-tools/typespec-azure-core": ">=0.66.0 <1.0.0",
+    "@azure-tools/typespec-autorest": ">=0.66.1 <1.0.0",
+    "@azure-tools/typespec-azure-core": ">=0.66.1 <1.0.0",
     "@azure-tools/typespec-azure-resource-manager": ">=0.66.0 <1.0.0",
-    "@azure-tools/typespec-azure-rulesets": ">=0.65.1 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.66.1 <1.0.0",
+    "@azure-tools/typespec-azure-rulesets": ">=0.66.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.66.4 <1.0.0",
     "@typespec/compiler": "^1.10.0",
     "@typespec/http": "^1.10.0",
     "@typespec/openapi": "^1.10.0",
@@ -77,12 +77,12 @@
     "tsx": "^4.21.0"
   },
   "devDependencies": {
-    "@azure-tools/typespec-autorest": "~0.66.0",
-    "@azure-tools/typespec-azure-core": "~0.66.0",
+    "@azure-tools/typespec-autorest": "~0.66.1",
+    "@azure-tools/typespec-azure-core": "~0.66.1",
     "@azure-tools/typespec-azure-resource-manager": "~0.66.0",
-    "@azure-tools/typespec-azure-rulesets": "~0.65.1",
-    "@azure-tools/typespec-client-generator-core": "~0.66.1",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.38",
+    "@azure-tools/typespec-azure-rulesets": "~0.66.0",
+    "@azure-tools/typespec-client-generator-core": "~0.66.4",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.39-dev.4",
     "@typespec/compiler": "^1.10.0",
     "@typespec/http": "^1.10.0",
     "@typespec/openapi": "^1.10.0",
@@ -90,11 +90,11 @@
     "@typespec/versioning": "~0.80.0",
     "@typespec/events": "~0.80.0",
     "@typespec/spector": "0.1.0-alpha.24",
-    "@typespec/spec-api": "0.1.0-alpha.13",
+    "@typespec/spec-api": "0.1.0-alpha.14-dev.1",
     "@typespec/sse": "~0.80.0",
     "@typespec/streams": "~0.80.0",
     "@typespec/xml": "~0.80.0",
-    "@typespec/http-specs": "0.1.0-alpha.34",
+    "@typespec/http-specs": "0.1.0-alpha.35",
     "@types/js-yaml": "~4.0.5",
     "@types/node": "~25.0.2",
     "@types/semver": "7.5.8",

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

@@ -1,111 +0,0 @@
-# -------------------------------------------------------------------------
-# 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