@typespec/http-client-python 0.37.2 → 0.38.0

package/generator/pygen/preprocess/__init__.py

@@ -54,13 +54,14 @@ def add_overload(yaml_data: dict[str, Any], body_type: dict[str, Any], for_flatt
     if yaml_data.get("initialOperation"):
         overload["initialOperation"] = yaml_data["initialOperation"]
 
+    # Reattach shared type objects before filtering parameters so positional
+    # alignment with the original operation is preserved.
+    for overload_p, original_p in zip(overload["parameters"], yaml_data["parameters"]):
+        overload_p["type"] = original_p["type"]
     if for_flatten_params:
         overload["bodyParameter"]["flattened"] = True
     else:
         overload["parameters"] = [p for p in overload["parameters"] if not p.get("inFlattenedBody")]
-    # for yaml sync, we need to make sure all of the responses, parameters, and exceptions' types have the same yaml id
-    for overload_p, original_p in zip(overload["parameters"], yaml_data["parameters"]):
-        overload_p["type"] = original_p["type"]
     update_overload_section(overload, yaml_data, "responses")
     update_overload_section(overload, yaml_data, "exceptions")
 
@@ -95,12 +96,14 @@ def add_overloads_for_body_param(yaml_data: dict[str, Any], skip_single_body_jso
     raw-JSON overload is kept, matching pre-TypedDict behavior).
     """
     body_parameter = yaml_data["bodyParameter"]
+    body_types = body_parameter["type"].get("types", [])
     if not (
         body_parameter["type"]["type"] == "combined"
-        and len(yaml_data["bodyParameter"]["type"]["types"]) > len(yaml_data["overloads"])
+        and len(body_types) > 1
+        and len(body_types) > len(yaml_data["overloads"])
     ):
         return
-    for body_type in body_parameter["type"]["types"]:
+    for body_type in body_types:
         if any(o for o in yaml_data["overloads"] if id(o["bodyParameter"]["type"]) == id(body_type)):
             continue
         if body_type.get("type") == "model" and body_type.get("base") == "json":
@@ -262,9 +265,6 @@ def _process_operation_etag_headers(
     if_match_candidates: list[dict[str, Any]] = []
     if_none_match_candidates: list[dict[str, Any]] = []
     for p in operation["parameters"]:
-        wire_name_lower = get_wire_name_lower(p)
-        if p["location"] == "header" and wire_name_lower == "client-request-id":
-            client["requestIdHeaderName"] = wire_name_lower
         if version_tolerant and p["location"] == "header":
             role = _get_etag_role(p)
             if role == "ifMatch":
@@ -273,7 +273,6 @@ def _process_operation_etag_headers(
                 if_none_match_candidates.append(p)
 
     property_if_match, property_if_none_match = _resolve_etag_pair(if_match_candidates, if_none_match_candidates)
-
     if property_if_match and property_if_none_match:
         etag_params = {id(property_if_match), id(property_if_none_match)}
         operation["parameters"] = [item for item in operation["parameters"] if id(item) not in etag_params] + [
@@ -284,6 +283,21 @@ def _process_operation_etag_headers(
         client["hasEtag"] = True
 
 
+def _process_operation_group_etag_headers(
+    operation_groups: list[dict[str, Any]],
+    client: dict[str, Any],
+    version_tolerant: bool,
+) -> None:
+    for operation_group in operation_groups:
+        for operation in operation_group.get("operations", []):
+            _process_operation_etag_headers(operation, client, version_tolerant)
+        _process_operation_group_etag_headers(
+            operation_group.get("operationGroups", []),
+            client,
+            version_tolerant,
+        )
+
+
 def headers_convert(yaml_data: dict[str, Any], replace_data: Any) -> None:
     if isinstance(replace_data, dict):
         for k, v in replace_data.items():
@@ -605,9 +619,16 @@ class PreProcessPlugin(YamlUpdatePlugin):
         if prop_name.endswith("Client"):
             prop_name = prop_name[: len(prop_name) - len("Client")]
         yaml_data["builderPadName"] = to_snake_case(prop_name)
-        for og in yaml_data.get("operationGroups", []):
-            for o in og["operations"]:
-                _process_operation_etag_headers(o, yaml_data, self.version_tolerant)
+        for operation_group in yaml_data.get("operationGroups", []):
+            for operation in operation_group.get("operations", []):
+                for parameter in operation["parameters"]:
+                    if parameter["location"] == "header" and get_wire_name_lower(parameter) == "client-request-id":
+                        yaml_data["requestIdHeaderName"] = "client-request-id"
+        _process_operation_group_etag_headers(
+            yaml_data.get("operationGroups", []),
+            yaml_data,
+            self.version_tolerant,
+        )
 
         # add client signature cloud_setting for arm
         if self.azure_arm and yaml_data["parameters"]:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.37.2",
+  "version": "0.38.0",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",
@@ -70,7 +70,7 @@
     "@azure-tools/typespec-azure-core": ">=0.72.0 <1.0.0",
     "@azure-tools/typespec-azure-resource-manager": ">=0.72.0 <1.0.0",
     "@azure-tools/typespec-azure-rulesets": ">=0.72.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.72.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.72.1 <1.0.0",
     "@typespec/compiler": "^1.16.0",
     "@typespec/http": "^1.16.0",
     "@typespec/openapi": "^1.16.0",
@@ -108,7 +108,7 @@
     "@azure-tools/typespec-azure-core": "~0.72.0",
     "@azure-tools/typespec-azure-resource-manager": "~0.72.0",
     "@azure-tools/typespec-azure-rulesets": "~0.72.0",
-    "@azure-tools/typespec-client-generator-core": "~0.72.0",
+    "@azure-tools/typespec-client-generator-core": "~0.72.1",
     "@azure-tools/azure-http-specs": "0.1.0-alpha.45",
     "@typespec/compiler": "^1.16.0",
     "@typespec/http": "^1.16.0",
@@ -121,7 +121,7 @@
     "@typespec/sse": "~0.86.0",
     "@typespec/streams": "~0.86.0",
     "@typespec/xml": "~0.86.0",
-    "@typespec/http-specs": "0.1.0-alpha.42",
+    "@typespec/http-specs": "0.1.0-alpha.43",
     "@types/js-yaml": "~4.0.5",
     "@types/node": "~25.0.2",
     "@types/semver": "7.5.8",