@typespec/http-client-python 0.29.2 → 0.30.0

package/eng/scripts/ci/dev_requirements.txt

@@ -5,8 +5,8 @@ tox-uv
 mypy==1.19.1
 colorama==0.4.6
 debugpy==1.8.2
-pytest==8.3.2
+pytest==9.0.3
 coverage==7.6.1
-black==26.3.1
+black==24.4.0
 ptvsd==4.3.2
 types-PyYAML==6.0.12.8

package/eng/scripts/ci/run_pylint.py

@@ -47,6 +47,15 @@ def _single_dir_pylint(mod):
     ]
     if is_azure:
         pylint_args.append("--load-plugins=pylint_guidelines_checker")
+    # Per-package suppressions for generated code where pylint's ignore-paths
+    # is not honored (pylint 4.x + recursive + plugin). Keep the scope as
+    # narrow as possible: only this package, only the offending check.
+    per_package_disables = {
+        "azure-client-generator-core-exact-name": ["client-incorrect-naming-convention"],
+    }
+    extra_disables = per_package_disables.get(mod.name)
+    if extra_disables:
+        pylint_args.append("--disable={}".format(",".join(extra_disables)))
     pylint_args.append(str(inner_class.absolute()))
     try:
         check_call(pylint_args)

package/eng/scripts/setup/package_manager.py

@@ -100,10 +100,20 @@ def install_packages(packages: list, venv_context=None, package_manager: str = N
 
     try:
         if cwd:
-            subprocess.check_call(install_cmd + packages, cwd=cwd)
+            result = subprocess.run(install_cmd + packages, cwd=cwd, capture_output=True, text=True)
         else:
-            subprocess.check_call(install_cmd + packages)
-    except subprocess.CalledProcessError as e:
+            result = subprocess.run(install_cmd + packages, capture_output=True, text=True)
+        if result.returncode != 0:
+            error_output = (result.stderr or "") + (result.stdout or "")
+            error_msg = f"Failed to install packages with {package_manager}: command exited with code {result.returncode}\n{error_output}"
+            if "401" in error_output or "Unauthorized" in error_output:
+                error_msg += (
+                    "\n\nReceived a 401 Unauthorized error from the Azure feed. "
+                    "A pip dependency may not yet be cached. To fix this, follow the authentication steps at: "
+                    "https://github.com/Azure/azure-sdk-for-python/blob/main/CONTRIBUTING.md#authentication-for-upstream-pull-through"
+                )
+            raise RuntimeError(error_msg)
+    except OSError as e:
         raise RuntimeError(f"Failed to install packages with {package_manager}: {e}")
 
 

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

@@ -91,11 +91,16 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
         self.has_etag: bool = self.yaml_data.get("hasEtag", False)
         self.cross_language_definition_id: Optional[str] = self.yaml_data.get("crossLanguageDefinitionId")
 
+    @property
+    def exact_name_params(self) -> set[str]:
+        """Return the set of client names for parameters with isExactName."""
+        return {p.client_name for p in self.parameters.method if p.is_exact_name}
+
     @property
     def stream_value(self) -> Union[str, bool]:
         return (
             f'kwargs.pop("stream", {self.has_stream_response})'
-            if self.expose_stream_keyword and self.has_response_body
+            if self.expose_stream_keyword and self.has_response_body and "stream" not in self.exact_name_params
             else self.has_stream_response
         )
 

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

@@ -87,6 +87,7 @@ class _ParameterBase(BaseModel, abc.ABC):  # pylint: disable=too-many-instance-a
         self.default_to_unset_sentinel: bool = self.yaml_data.get("defaultToUnsetSentinel", False)
         self.hide_in_method: bool = self.yaml_data.get("hideInMethod", False)
         self.is_continuation_token: bool = bool(self.yaml_data.get("isContinuationToken"))
+        self.is_exact_name: bool = self.yaml_data.get("isExactName", False)
 
     def get_declaration(self, value: Any = None) -> Any:
         return self.type.get_declaration(value)

package/generator/build/lib/pygen/codegen/serializers/builder_serializer.py

@@ -627,7 +627,8 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
         return ""
 
     def pop_kwargs_from_signature(self, builder: OperationType) -> list[str]:
-        kwargs_to_pop = builder.parameters.kwargs_to_pop
+        exact_names = builder.exact_name_params
+        kwargs_to_pop = [k for k in builder.parameters.kwargs_to_pop if k.client_name not in exact_names]
         kwargs = self.parameter_serializer.pop_kwargs_from_signature(
             kwargs_to_pop,
             check_kwarg_dict=True,
@@ -645,7 +646,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
             body_parameter=builder.parameters.body_parameter if builder.parameters.has_body else None,
         )
         for p in builder.parameters.parameters:
-            if p.hide_in_operation_signature and not p.is_continuation_token:
+            if p.hide_in_operation_signature and not p.is_continuation_token and p.client_name not in exact_names:
                 kwargs.append(f'{p.client_name} = kwargs.pop("{p.client_name}", None)')
         cls_annotation = builder.cls_type_annotation(
             async_mode=self.async_mode, serialize_namespace=self.serialize_namespace

package/generator/build/lib/pygen/preprocess/__init__.py

@@ -264,9 +264,10 @@ class PreProcessPlugin(YamlUpdatePlugin):
         for type in yaml_data:
             for property in type.get("properties", []):
                 property["description"] = update_description(property.get("description", ""))
-                property["clientName"] = self.pad_reserved_words(
-                    property["clientName"].lower(), PadType.PROPERTY, property
-                )
+                if not property.get("isExactName", False):
+                    property["clientName"] = self.pad_reserved_words(
+                        property["clientName"].lower(), PadType.PROPERTY, property
+                    )
                 add_redefined_builtin_info(property["clientName"], property)
             if type.get("name"):
                 pad_type = PadType.MODEL if type["type"] == "model" else PadType.ENUM_CLASS
@@ -362,14 +363,25 @@ class PreProcessPlugin(YamlUpdatePlugin):
 
     def update_parameter(self, yaml_data: dict[str, Any]) -> None:
         yaml_data["description"] = update_description(yaml_data.get("description", ""))
-        if not (yaml_data["location"] == "header" and yaml_data["clientName"] in ("content_type", "accept")):
+        if not yaml_data.get("isExactName", False) and not (
+            yaml_data["location"] == "header" and yaml_data["clientName"] in ("content_type", "accept")
+        ):
             yaml_data["clientName"] = self.pad_reserved_words(
                 yaml_data["clientName"].lower(), PadType.PARAMETER, yaml_data
             )
         if yaml_data.get("propertyToParameterName"):
             # need to create a new one with padded values (but NOT keys, since keys are wire names)
+            # build a lookup of exact-name properties from the body type's properties
+            exact_name_props = set()
+            for prop in yaml_data.get("type", {}).get("properties", []):
+                if prop.get("isExactName", False):
+                    exact_name_props.add(prop.get("wireName", ""))
             yaml_data["propertyToParameterName"] = {
-                prop: self.pad_reserved_words(param_name, PadType.PARAMETER, yaml_data).lower()
+                prop: (
+                    param_name
+                    if prop in exact_name_props
+                    else self.pad_reserved_words(param_name, PadType.PARAMETER, yaml_data).lower()
+                )
                 for prop, param_name in yaml_data["propertyToParameterName"].items()
             }
         wire_name_lower = (yaml_data.get("wireName") or "").lower()

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

@@ -91,11 +91,16 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
         self.has_etag: bool = self.yaml_data.get("hasEtag", False)
         self.cross_language_definition_id: Optional[str] = self.yaml_data.get("crossLanguageDefinitionId")
 
+    @property
+    def exact_name_params(self) -> set[str]:
+        """Return the set of client names for parameters with isExactName."""
+        return {p.client_name for p in self.parameters.method if p.is_exact_name}
+
     @property
     def stream_value(self) -> Union[str, bool]:
         return (
             f'kwargs.pop("stream", {self.has_stream_response})'
-            if self.expose_stream_keyword and self.has_response_body
+            if self.expose_stream_keyword and self.has_response_body and "stream" not in self.exact_name_params
             else self.has_stream_response
         )
 

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

@@ -87,6 +87,7 @@ class _ParameterBase(BaseModel, abc.ABC):  # pylint: disable=too-many-instance-a
         self.default_to_unset_sentinel: bool = self.yaml_data.get("defaultToUnsetSentinel", False)
         self.hide_in_method: bool = self.yaml_data.get("hideInMethod", False)
         self.is_continuation_token: bool = bool(self.yaml_data.get("isContinuationToken"))
+        self.is_exact_name: bool = self.yaml_data.get("isExactName", False)
 
     def get_declaration(self, value: Any = None) -> Any:
         return self.type.get_declaration(value)

package/generator/pygen/codegen/serializers/builder_serializer.py

@@ -627,7 +627,8 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
         return ""
 
     def pop_kwargs_from_signature(self, builder: OperationType) -> list[str]:
-        kwargs_to_pop = builder.parameters.kwargs_to_pop
+        exact_names = builder.exact_name_params
+        kwargs_to_pop = [k for k in builder.parameters.kwargs_to_pop if k.client_name not in exact_names]
         kwargs = self.parameter_serializer.pop_kwargs_from_signature(
             kwargs_to_pop,
             check_kwarg_dict=True,
@@ -645,7 +646,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
             body_parameter=builder.parameters.body_parameter if builder.parameters.has_body else None,
         )
         for p in builder.parameters.parameters:
-            if p.hide_in_operation_signature and not p.is_continuation_token:
+            if p.hide_in_operation_signature and not p.is_continuation_token and p.client_name not in exact_names:
                 kwargs.append(f'{p.client_name} = kwargs.pop("{p.client_name}", None)')
         cls_annotation = builder.cls_type_annotation(
             async_mode=self.async_mode, serialize_namespace=self.serialize_namespace

package/generator/pygen/preprocess/__init__.py

@@ -264,9 +264,10 @@ class PreProcessPlugin(YamlUpdatePlugin):
         for type in yaml_data:
             for property in type.get("properties", []):
                 property["description"] = update_description(property.get("description", ""))
-                property["clientName"] = self.pad_reserved_words(
-                    property["clientName"].lower(), PadType.PROPERTY, property
-                )
+                if not property.get("isExactName", False):
+                    property["clientName"] = self.pad_reserved_words(
+                        property["clientName"].lower(), PadType.PROPERTY, property
+                    )
                 add_redefined_builtin_info(property["clientName"], property)
             if type.get("name"):
                 pad_type = PadType.MODEL if type["type"] == "model" else PadType.ENUM_CLASS
@@ -362,14 +363,25 @@ class PreProcessPlugin(YamlUpdatePlugin):
 
     def update_parameter(self, yaml_data: dict[str, Any]) -> None:
         yaml_data["description"] = update_description(yaml_data.get("description", ""))
-        if not (yaml_data["location"] == "header" and yaml_data["clientName"] in ("content_type", "accept")):
+        if not yaml_data.get("isExactName", False) and not (
+            yaml_data["location"] == "header" and yaml_data["clientName"] in ("content_type", "accept")
+        ):
             yaml_data["clientName"] = self.pad_reserved_words(
                 yaml_data["clientName"].lower(), PadType.PARAMETER, yaml_data
             )
         if yaml_data.get("propertyToParameterName"):
             # need to create a new one with padded values (but NOT keys, since keys are wire names)
+            # build a lookup of exact-name properties from the body type's properties
+            exact_name_props = set()
+            for prop in yaml_data.get("type", {}).get("properties", []):
+                if prop.get("isExactName", False):
+                    exact_name_props.add(prop.get("wireName", ""))
             yaml_data["propertyToParameterName"] = {
-                prop: self.pad_reserved_words(param_name, PadType.PARAMETER, yaml_data).lower()
+                prop: (
+                    param_name
+                    if prop in exact_name_props
+                    else self.pad_reserved_words(param_name, PadType.PARAMETER, yaml_data).lower()
+                )
                 for prop, param_name in yaml_data["propertyToParameterName"].items()
             }
         wire_name_lower = (yaml_data.get("wireName") or "").lower()

package/generator/pygen.egg-info/PKG-INFO

@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: License :: OSI Approved :: MIT License
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: black==26.3.1
+Requires-Dist: black==24.4.0
 Requires-Dist: docutils>=0.20.1
 Requires-Dist: Jinja2==3.1.6
 Requires-Dist: PyYAML==6.0.1

package/generator/pygen.egg-info/requires.txt

@@ -1,4 +1,4 @@
-black==26.3.1
+black==24.4.0
 docutils>=0.20.1
 Jinja2==3.1.6
 PyYAML==6.0.1

package/generator/setup.py

@@ -46,7 +46,7 @@ setup(
         ]
     ),
     install_requires=[
-        "black==26.3.1",
+        "black==24.4.0",
         "docutils>=0.20.1",
         "Jinja2==3.1.6",
         "PyYAML==6.0.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.29.2",
+  "version": "0.30.0",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",
@@ -64,7 +64,7 @@
     "@azure-tools/typespec-azure-core": ">=0.68.0 <1.0.0",
     "@azure-tools/typespec-azure-resource-manager": ">=0.68.0 <1.0.0",
     "@azure-tools/typespec-azure-rulesets": ">=0.68.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.68.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.68.2 <1.0.0",
     "@typespec/compiler": "^1.12.0",
     "@typespec/http": "^1.12.0",
     "@typespec/openapi": "^1.12.0",
@@ -102,8 +102,8 @@
     "@azure-tools/typespec-azure-core": "~0.68.0",
     "@azure-tools/typespec-azure-resource-manager": "~0.68.0",
     "@azure-tools/typespec-azure-rulesets": "~0.68.0",
-    "@azure-tools/typespec-client-generator-core": "~0.68.0",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.40",
+    "@azure-tools/typespec-client-generator-core": "~0.68.2",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.41-dev.1",
     "@typespec/compiler": "^1.12.0",
     "@typespec/http": "^1.12.0",
     "@typespec/openapi": "^1.12.0",