@typespec/http-client-python 0.27.2 → 0.28.0

package/generator/test/unittests/test_model_base_xml_serialization.py

@@ -4,7 +4,7 @@
 # ------------------------------------
 import xml.etree.ElementTree as ET
 
-from typing import Literal
+from typing import Literal, Optional
 
 from specialwords._utils.model_base import (
     _get_element,
@@ -165,7 +165,7 @@ class TestXmlDeserialization:
             _xml = {"name": "Data"}
 
         result = _deserialize_xml(XmlModel, basic_xml)
-        assert result.age is None
+        assert result.age == []
 
     def test_list_wrapped_items_name_basic_types(self):
         """Test XML list and wrap, items is basic type and there is itemsName."""
@@ -515,6 +515,248 @@ class TestXmlDeserialization:
         assert isinstance(result.filter, CorrelationFilter)
         assert result.filter.correlation_id == 12
 
+    def test_enumeration_results(self):
+        """Test deserializing an Azure Blob Storage EnumerationResults XML payload."""
+        xml_payload = '<?xml version="1.0" encoding="utf-8"?><EnumerationResults ServiceEndpoint="https://service.blob.core.windows.net/" ContainerName="my-container-108f32e8"><Delimiter>/</Delimiter><Blobs /><NextMarker /></EnumerationResults>'
+
+        class EnumerationResults(Model):
+            service_endpoint: str = rest_field(
+                name="ServiceEndpoint", xml={"name": "ServiceEndpoint", "attribute": True}
+            )
+            container_name: str = rest_field(name="ContainerName", xml={"name": "ContainerName", "attribute": True})
+            delimiter: str = rest_field(name="Delimiter", xml={"name": "Delimiter"})
+            blobs: list[str] = rest_field(name="Blobs", xml={"name": "Blobs"})
+            next_marker: str = rest_field(name="NextMarker", xml={"name": "NextMarker"})
+
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+            _xml = {"name": "EnumerationResults"}
+
+        result = _deserialize_xml(EnumerationResults, xml_payload)
+
+        assert result.service_endpoint == "https://service.blob.core.windows.net/"
+        assert result.container_name == "my-container-108f32e8"
+        assert result.delimiter == "/"
+        assert result.blobs == []
+        assert result.next_marker == ""
+
+    def test_enumeration_results_nested_empty_list(self):
+        """Test deserializing XML where a container element holds a nested empty list (e.g. Blobs/BlobPrefixes)."""
+        xml_payload = '<?xml version="1.0" encoding="utf-8"?><EnumerationResults ServiceEndpoint="https://service.blob.core.windows.net/" ContainerName="my-container"><Delimiter>/</Delimiter><Blobs><BlobPrefixes /></Blobs><NextMarker /></EnumerationResults>'
+
+        class BlobPrefix(Model):
+            name: str = rest_field(name="Name", xml={"name": "Name"})
+
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+            _xml = {"name": "BlobPrefix"}
+
+        class BlobsSegment(Model):
+            blob_prefixes: list[BlobPrefix] = rest_field(
+                name="BlobPrefixes", xml={"name": "BlobPrefixes", "itemsName": "BlobPrefix"}
+            )
+
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+            _xml = {"name": "Blobs"}
+
+        class EnumerationResults(Model):
+            service_endpoint: str = rest_field(
+                name="ServiceEndpoint", xml={"name": "ServiceEndpoint", "attribute": True}
+            )
+            container_name: str = rest_field(name="ContainerName", xml={"name": "ContainerName", "attribute": True})
+            delimiter: str = rest_field(name="Delimiter", xml={"name": "Delimiter"})
+            blobs: BlobsSegment = rest_field(name="Blobs", xml={"name": "Blobs"})
+            next_marker: str = rest_field(name="NextMarker", xml={"name": "NextMarker"})
+
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+            _xml = {"name": "EnumerationResults"}
+
+        result = _deserialize_xml(EnumerationResults, xml_payload)
+
+        assert result.service_endpoint == "https://service.blob.core.windows.net/"
+        assert result.container_name == "my-container"
+        assert result.delimiter == "/"
+        assert result.blobs.blob_prefixes == []
+        assert result.next_marker == ""
+
+    def test_enumeration_results_azure_sdk_pattern(self):
+        """Test the real Azure SDK model pattern where BlobsSegment has two unwrapped list fields."""
+        # Both blob_prefixes and blob_items are unwrapped lists (items appear directly in <Blobs>).
+        # With <Blobs />, no matching children are found so both are None.
+        xml_payload = '<?xml version="1.0" encoding="utf-8"?><EnumerationResults ServiceEndpoint="https://service.blob.core.windows.net/" ContainerName="my-container"><Delimiter>/</Delimiter><Blobs /><NextMarker /></EnumerationResults>'
+
+        class BlobPrefix(Model):
+            name: str = rest_field(name="Name", xml={"name": "Name"})
+
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+            _xml = {"name": "BlobPrefix"}
+
+        class BlobItem(Model):
+            name: str = rest_field(name="Name", xml={"name": "Name"})
+
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+            _xml = {"name": "Blob"}
+
+        class BlobsSegment(Model):
+            blob_prefixes: list[BlobPrefix] = rest_field(
+                name="blob_prefixes", xml={"name": "BlobPrefix", "unwrapped": True}
+            )
+            blob_items: list[BlobItem] = rest_field(name="blob_items", xml={"name": "Blob", "unwrapped": True})
+
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+            _xml = {"name": "Blobs"}
+
+        class EnumerationResults(Model):
+            service_endpoint: str = rest_field(
+                name="ServiceEndpoint", xml={"name": "ServiceEndpoint", "attribute": True}
+            )
+            container_name: str = rest_field(name="ContainerName", xml={"name": "ContainerName", "attribute": True})
+            delimiter: str = rest_field(name="Delimiter", xml={"name": "Delimiter"})
+            blobs: BlobsSegment = rest_field(name="Blobs", xml={"name": "Blobs"})
+            next_marker: str = rest_field(name="NextMarker", xml={"name": "NextMarker"})
+
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+            _xml = {"name": "EnumerationResults"}
+
+        result = _deserialize_xml(EnumerationResults, xml_payload)
+
+        assert result.service_endpoint == "https://service.blob.core.windows.net/"
+        assert result.container_name == "my-container"
+        assert result.delimiter == "/"
+        assert isinstance(result.blobs, BlobsSegment)
+        # With <Blobs />, no <BlobPrefix> or <Blob> children exist → unwrapped non-optional lists default to []
+        assert result.blobs.blob_prefixes == []
+        assert result.blobs.blob_items == []
+        assert result.next_marker == ""
+
+    def test_enumeration_results_azure_sdk_pattern_optional(self):
+        """Test the Azure SDK pattern where unwrapped list fields are Optional[list[X]].
+
+        When the type is Optional[list[X]], empty unwrapped lists should stay None
+        (the element is absent, and None is a valid value for the optional type).
+        """
+        xml_payload = '<?xml version="1.0" encoding="utf-8"?><EnumerationResults ServiceEndpoint="https://service.blob.core.windows.net/" ContainerName="my-container"><Delimiter>/</Delimiter><Blobs /><NextMarker /></EnumerationResults>'
+
+        class BlobPrefix(Model):
+            name: str = rest_field(name="Name", xml={"name": "Name"})
+
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+            _xml = {"name": "BlobPrefix"}
+
+        class BlobItem(Model):
+            name: str = rest_field(name="Name", xml={"name": "Name"})
+
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+            _xml = {"name": "Blob"}
+
+        class BlobsSegment(Model):
+            blob_prefixes: Optional[list[BlobPrefix]] = rest_field(
+                name="blob_prefixes", xml={"name": "BlobPrefix", "unwrapped": True}
+            )
+            blob_items: Optional[list[BlobItem]] = rest_field(
+                name="blob_items", xml={"name": "Blob", "unwrapped": True}
+            )
+
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+            _xml = {"name": "Blobs"}
+
+        class EnumerationResults(Model):
+            service_endpoint: str = rest_field(
+                name="ServiceEndpoint", xml={"name": "ServiceEndpoint", "attribute": True}
+            )
+            container_name: str = rest_field(name="ContainerName", xml={"name": "ContainerName", "attribute": True})
+            delimiter: str = rest_field(name="Delimiter", xml={"name": "Delimiter"})
+            blobs: BlobsSegment = rest_field(name="Blobs", xml={"name": "Blobs"})
+            next_marker: str = rest_field(name="NextMarker", xml={"name": "NextMarker"})
+
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+            _xml = {"name": "EnumerationResults"}
+
+        result = _deserialize_xml(EnumerationResults, xml_payload)
+
+        assert result.service_endpoint == "https://service.blob.core.windows.net/"
+        assert result.container_name == "my-container"
+        assert result.delimiter == "/"
+        assert isinstance(result.blobs, BlobsSegment)
+        # With <Blobs />, no <BlobPrefix> or <Blob> children exist → Optional lists stay None
+        assert result.blobs.blob_prefixes is None
+        assert result.blobs.blob_items is None
+        assert result.next_marker == ""
+
+    def test_enumeration_results_blobs_unwrapped(self):
+        """Test what happens when the blobs field itself is declared with unwrapped=True."""
+        # When a non-list model field uses unwrapped=True, the matching XML elements are collected
+        # as a list and stored as-is (the field receives a list of ET.Element objects).
+        xml_payload = '<?xml version="1.0" encoding="utf-8"?><EnumerationResults ServiceEndpoint="https://service.blob.core.windows.net/" ContainerName="my-container"><Delimiter>/</Delimiter><Blobs /><NextMarker /></EnumerationResults>'
+
+        class BlobPrefix(Model):
+            name: str = rest_field(name="Name", xml={"name": "Name"})
+
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+            _xml = {"name": "BlobPrefix"}
+
+        class BlobsSegment(Model):
+            blob_prefixes: list[BlobPrefix] = rest_field(
+                name="BlobPrefixes", xml={"name": "BlobPrefixes", "itemsName": "BlobPrefix"}
+            )
+
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+            _xml = {"name": "Blobs"}
+
+        class EnumerationResults(Model):
+            service_endpoint: str = rest_field(
+                name="ServiceEndpoint", xml={"name": "ServiceEndpoint", "attribute": True}
+            )
+            container_name: str = rest_field(name="ContainerName", xml={"name": "ContainerName", "attribute": True})
+            delimiter: str = rest_field(name="Delimiter", xml={"name": "Delimiter"})
+            # unwrapped=True on a model-typed field: the deserialization collects matching XML
+            # elements as a list (rather than deserializing them into the model).
+            blobs: BlobsSegment = rest_field(name="Blobs", xml={"name": "Blobs", "unwrapped": True})
+            next_marker: str = rest_field(name="NextMarker", xml={"name": "NextMarker"})
+
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+            _xml = {"name": "EnumerationResults"}
+
+        result = _deserialize_xml(EnumerationResults, xml_payload)
+
+        assert result.service_endpoint == "https://service.blob.core.windows.net/"
+        assert result.container_name == "my-container"
+        assert result.delimiter == "/"
+        # unwrapped=True on a model field collects matching elements; <Blobs /> is found so it
+        # returns a list containing the raw ET.Element instead of a deserialized BlobsSegment.
+        assert isinstance(result.blobs, list)
+        assert len(result.blobs) == 1
+        assert isinstance(result.blobs[0], ET.Element)
+        assert result.next_marker == ""
+
 
 class TestXmlSerialization:
     def test_basic(self):

package/generator/test/unittests/test_name_converter.py

@@ -33,11 +33,3 @@ def test_escaped_reserved_words():
     }
     for name in expected_conversion_parameter:
         assert pad_reserved_words(name, pad_type=PadType.PARAMETER) == expected_conversion_parameter[name]
-
-    expected_conversion_enum = {
-        "self": "self",
-        "mro": "mro_enum",
-        "continuation_token": "continuation_token",
-    }
-    for name in expected_conversion_enum:
-        assert pad_reserved_words(name, pad_type=PadType.ENUM_VALUE) == expected_conversion_enum[name]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.27.2",
+  "version": "0.28.0",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",
@@ -54,20 +54,20 @@
     "emitter"
   ],
   "peerDependencies": {
-    "@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.3 <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"
+    "@azure-tools/typespec-autorest": ">=0.66.0 <1.0.0",
+    "@azure-tools/typespec-azure-core": ">=0.66.0 <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",
+    "@typespec/compiler": "^1.10.0",
+    "@typespec/http": "^1.10.0",
+    "@typespec/openapi": "^1.10.0",
+    "@typespec/rest": ">=0.80.0 <1.0.0",
+    "@typespec/versioning": ">=0.80.0 <1.0.0",
+    "@typespec/events": ">=0.80.0 <1.0.0",
+    "@typespec/sse": ">=0.80.0 <1.0.0",
+    "@typespec/streams": ">=0.80.0 <1.0.0",
+    "@typespec/xml": ">=0.80.0 <1.0.0"
   },
   "dependencies": {
     "js-yaml": "~4.1.0",
@@ -77,24 +77,24 @@
     "tsx": "^4.21.0"
   },
   "devDependencies": {
-    "@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.3",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.38-dev.2",
-    "@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.79.0",
-    "@typespec/streams": "~0.79.0",
-    "@typespec/xml": "~0.79.0",
-    "@typespec/http-specs": "0.1.0-alpha.33-dev.2",
+    "@azure-tools/typespec-autorest": "~0.66.0",
+    "@azure-tools/typespec-azure-core": "~0.66.0",
+    "@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",
+    "@typespec/compiler": "^1.10.0",
+    "@typespec/http": "^1.10.0",
+    "@typespec/openapi": "^1.10.0",
+    "@typespec/rest": "~0.80.0",
+    "@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/sse": "~0.80.0",
+    "@typespec/streams": "~0.80.0",
+    "@typespec/xml": "~0.80.0",
+    "@typespec/http-specs": "0.1.0-alpha.34",
     "@types/js-yaml": "~4.0.5",
     "@types/node": "~25.0.2",
     "@types/semver": "7.5.8",