@typespec/http-client-python 0.15.0 → 0.15.1

package/eng/scripts/ci/regenerate.ts

@@ -21,6 +21,14 @@ const argv = parseArgs({
   },
 });
 
+// Add this near the top with other constants
+const SKIP_SPECS = [
+  "type/union/discriminated",
+  "client-operation-group",
+  "azure/client-generator-core/api-version",
+  "azure/client-generator-core/hierarchy-building",
+];
+
 // Get the directory of the current file
 const PLUGIN_DIR = argv.values.pluginDir
   ? resolve(argv.values.pluginDir)
@@ -316,14 +324,8 @@ async function getSubdirectories(baseDir: string, flags: RegenerateFlags): Promi
 
         const mainTspRelativePath = toPosix(relative(baseDir, mainTspPath));
 
-        // after support discriminated union, remove this check
-        if (mainTspRelativePath.includes("type/union/discriminated")) return;
-
-        // after fix test generation for nested operation group, remove this check
-        if (mainTspRelativePath.includes("client-operation-group")) return;
-
-        // after https://github.com/Azure/autorest.python/issues/3043 fixed, remove this check
-        if (mainTspRelativePath.includes("azure/client-generator-core/api-version")) return;
+        // Replace the individual skip checks with:
+        if (SKIP_SPECS.some((skipSpec) => mainTspRelativePath.includes(skipSpec))) return;
 
         const hasMainTsp = await promises
           .access(mainTspPath)

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

@@ -69,6 +69,9 @@ class OptionsDict(MutableMapping):
                     data = data[2:]
                 elif data.startswith("."):
                     data = data[1:]
+                # Remove trailing slashes
+                if data.endswith("/") or data.endswith("\\"):
+                    data = data[:-1]
             return data
         return self._get_default(key)
 

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

@@ -1032,7 +1032,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                             is_operation_file=True, skip_quote=True, serialize_namespace=self.serialize_namespace
                         )
                         if self.code_model.options["models-mode"] == "dpg":
-                            retval.append(f"        error = _failsafe_deserialize({type_annotation},  response.json())")
+                            retval.append(f"        error = _failsafe_deserialize({type_annotation},  response)")
                         else:
                             retval.append(
                                 f"        error = self._deserialize.failsafe_deserialize({type_annotation}, "
@@ -1068,10 +1068,10 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                     if self.code_model.options["models-mode"] == "dpg":
                         if xml_serializable(str(e.default_content_type)):
                             retval.append(
-                                f"        error = _failsafe_deserialize_xml({type_annotation},  response.text())"
+                                f"        error = _failsafe_deserialize_xml({type_annotation}, response)"
                             )
                         else:
-                            retval.append(f"        error = _failsafe_deserialize({type_annotation},  response.json())")
+                            retval.append(f"        error = _failsafe_deserialize({type_annotation}, response)")
                     else:
                         retval.append(
                             f"        error = self._deserialize.failsafe_deserialize({type_annotation}, "
@@ -1087,7 +1087,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                 retval.append("    else:")
             if self.code_model.options["models-mode"] == "dpg":
                 retval.append(
-                    f"{indent}error = _failsafe_deserialize({default_error_deserialization},  response.json())"
+                    f"{indent}error = _failsafe_deserialize({default_error_deserialization}, response)"
                 )
             else:
                 retval.append(

package/generator/build/lib/pygen/codegen/templates/model_base.py.jinja2

@@ -25,6 +25,7 @@ from {{ code_model.core_library }}.exceptions import DeserializationError
 from {{ code_model.core_library }}{{ "" if code_model.is_azure_flavor else ".utils" }} import CaseInsensitiveEnumMeta
 from {{ code_model.core_library }}.{{ "" if code_model.is_azure_flavor else "runtime." }}pipeline import PipelineResponse
 from {{ code_model.core_library }}.serialization import _Null
+from {{ code_model.core_library }}.rest import HttpResponse
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -935,13 +936,13 @@ def _deserialize(
 
 def _failsafe_deserialize(
   deserializer: typing.Any,
-  value: typing.Any,
+  response: HttpResponse,
   module: typing.Optional[str] = None,
   rf: typing.Optional["_RestField"] = None,
   format: typing.Optional[str] = None,
 ) -> typing.Any:
   try:
-      return _deserialize(deserializer, value, module, rf, format)
+      return _deserialize(deserializer, response.json(), module, rf, format)
   except DeserializationError:
       _LOGGER.warning(
           "Ran into a deserialization error. Ignoring since this is failsafe deserialization",
@@ -952,10 +953,10 @@ def _failsafe_deserialize(
 
 def _failsafe_deserialize_xml(
   deserializer: typing.Any,
-  value: typing.Any,
+  response: HttpResponse, 
 ) -> typing.Any:
   try:
-      return _deserialize_xml(deserializer, value)
+      return _deserialize_xml(deserializer, response.text())
   except DeserializationError:
       _LOGGER.warning(
           "Ran into a deserialization error. Ignoring since this is failsafe deserialization",

package/generator/build/lib/pygen/codegen/templates/packaging_templates/pyproject.toml.jinja2

@@ -5,7 +5,7 @@
 {% endif %}
 
 [build-system]
-requires = ["setuptools>=61.0.0", "wheel"]  # Requires 61.0.0 for dynamic version
+requires = ["setuptools>=77.0.3", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -15,7 +15,7 @@ authors = [
   { name = "{{ code_model.company_name }}"{% if code_model.is_azure_flavor %}, email = "azpysdkhelp@microsoft.com"{% endif %} },
 ]
 description = "{{ code_model.company_name }} {% if code_model.is_azure_flavor and not options.get('package-pprint-name').startswith('Azure ') %}Azure {% endif %}{{ options.get('package-pprint-name') }} Client Library for Python"
-license = {text = "MIT License"}
+license = "MIT"
 classifiers = [
     "Development Status :: {{ dev_status }}",
     "Programming Language :: Python",
@@ -24,7 +24,6 @@ classifiers = [
     {% for version in range(min_version, max_version + 1) %}
     "Programming Language :: Python :: 3.{{ version }}",
     {% endfor %}
-    "License :: OSI Approved :: MIT License",
 ]
 requires-python = ">={{ MIN_PYTHON_VERSION }}"
 {% else %}
@@ -92,6 +91,7 @@ readme = {file = ["README.md"], content-type = "text/markdown"}
 exclude = [
     "tests*",
     "samples*",
+    "doc*",
     {% for pkgutil_name in pkgutil_names %}
     "{{ pkgutil_name }}",
     {% endfor %}

package/generator/pygen/__init__.py

@@ -69,6 +69,9 @@ class OptionsDict(MutableMapping):
                     data = data[2:]
                 elif data.startswith("."):
                     data = data[1:]
+                # Remove trailing slashes
+                if data.endswith("/") or data.endswith("\\"):
+                    data = data[:-1]
             return data
         return self._get_default(key)
 

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

@@ -1032,7 +1032,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                             is_operation_file=True, skip_quote=True, serialize_namespace=self.serialize_namespace
                         )
                         if self.code_model.options["models-mode"] == "dpg":
-                            retval.append(f"        error = _failsafe_deserialize({type_annotation},  response.json())")
+                            retval.append(f"        error = _failsafe_deserialize({type_annotation},  response)")
                         else:
                             retval.append(
                                 f"        error = self._deserialize.failsafe_deserialize({type_annotation}, "
@@ -1068,10 +1068,10 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                     if self.code_model.options["models-mode"] == "dpg":
                         if xml_serializable(str(e.default_content_type)):
                             retval.append(
-                                f"        error = _failsafe_deserialize_xml({type_annotation},  response.text())"
+                                f"        error = _failsafe_deserialize_xml({type_annotation}, response)"
                             )
                         else:
-                            retval.append(f"        error = _failsafe_deserialize({type_annotation},  response.json())")
+                            retval.append(f"        error = _failsafe_deserialize({type_annotation}, response)")
                     else:
                         retval.append(
                             f"        error = self._deserialize.failsafe_deserialize({type_annotation}, "
@@ -1087,7 +1087,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                 retval.append("    else:")
             if self.code_model.options["models-mode"] == "dpg":
                 retval.append(
-                    f"{indent}error = _failsafe_deserialize({default_error_deserialization},  response.json())"
+                    f"{indent}error = _failsafe_deserialize({default_error_deserialization}, response)"
                 )
             else:
                 retval.append(

package/generator/pygen/codegen/templates/model_base.py.jinja2

@@ -25,6 +25,7 @@ from {{ code_model.core_library }}.exceptions import DeserializationError
 from {{ code_model.core_library }}{{ "" if code_model.is_azure_flavor else ".utils" }} import CaseInsensitiveEnumMeta
 from {{ code_model.core_library }}.{{ "" if code_model.is_azure_flavor else "runtime." }}pipeline import PipelineResponse
 from {{ code_model.core_library }}.serialization import _Null
+from {{ code_model.core_library }}.rest import HttpResponse
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -935,13 +936,13 @@ def _deserialize(
 
 def _failsafe_deserialize(
   deserializer: typing.Any,
-  value: typing.Any,
+  response: HttpResponse,
   module: typing.Optional[str] = None,
   rf: typing.Optional["_RestField"] = None,
   format: typing.Optional[str] = None,
 ) -> typing.Any:
   try:
-      return _deserialize(deserializer, value, module, rf, format)
+      return _deserialize(deserializer, response.json(), module, rf, format)
   except DeserializationError:
       _LOGGER.warning(
           "Ran into a deserialization error. Ignoring since this is failsafe deserialization",
@@ -952,10 +953,10 @@ def _failsafe_deserialize(
 
 def _failsafe_deserialize_xml(
   deserializer: typing.Any,
-  value: typing.Any,
+  response: HttpResponse, 
 ) -> typing.Any:
   try:
-      return _deserialize_xml(deserializer, value)
+      return _deserialize_xml(deserializer, response.text())
   except DeserializationError:
       _LOGGER.warning(
           "Ran into a deserialization error. Ignoring since this is failsafe deserialization",

package/generator/pygen/codegen/templates/packaging_templates/pyproject.toml.jinja2

@@ -5,7 +5,7 @@
 {% endif %}
 
 [build-system]
-requires = ["setuptools>=61.0.0", "wheel"]  # Requires 61.0.0 for dynamic version
+requires = ["setuptools>=77.0.3", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -15,7 +15,7 @@ authors = [
   { name = "{{ code_model.company_name }}"{% if code_model.is_azure_flavor %}, email = "azpysdkhelp@microsoft.com"{% endif %} },
 ]
 description = "{{ code_model.company_name }} {% if code_model.is_azure_flavor and not options.get('package-pprint-name').startswith('Azure ') %}Azure {% endif %}{{ options.get('package-pprint-name') }} Client Library for Python"
-license = {text = "MIT License"}
+license = "MIT"
 classifiers = [
     "Development Status :: {{ dev_status }}",
     "Programming Language :: Python",
@@ -24,7 +24,6 @@ classifiers = [
     {% for version in range(min_version, max_version + 1) %}
     "Programming Language :: Python :: 3.{{ version }}",
     {% endfor %}
-    "License :: OSI Approved :: MIT License",
 ]
 requires-python = ">={{ MIN_PYTHON_VERSION }}"
 {% else %}
@@ -92,6 +91,7 @@ readme = {file = ["README.md"], content-type = "text/markdown"}
 exclude = [
     "tests*",
     "samples*",
+    "doc*",
     {% for pkgutil_name in pkgutil_names %}
     "{{ pkgutil_name }}",
     {% endfor %}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.15.0",
+  "version": "0.15.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.58.0 <1.0.0",
-    "@azure-tools/typespec-azure-core": ">=0.58.0 <1.0.0",
-    "@azure-tools/typespec-azure-resource-manager": ">=0.58.0 <1.0.0",
-    "@azure-tools/typespec-azure-rulesets": ">=0.58.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.58.0 <1.0.0",
-    "@typespec/compiler": "^1.2.1",
-    "@typespec/http": "^1.2.1",
-    "@typespec/openapi": "^1.2.1",
-    "@typespec/rest": ">=0.72.1 <1.0.0",
-    "@typespec/versioning": ">=0.72.1 <1.0.0",
-    "@typespec/events": ">=0.72.1 <1.0.0",
-    "@typespec/sse": ">=0.72.1 <1.0.0",
-    "@typespec/streams": ">=0.72.1 <1.0.0",
-    "@typespec/xml": ">=0.72.1 <1.0.0"
+    "@azure-tools/typespec-autorest": ">=0.59.0 <1.0.0",
+    "@azure-tools/typespec-azure-core": ">=0.59.0 <1.0.0",
+    "@azure-tools/typespec-azure-resource-manager": ">=0.59.0 <1.0.0",
+    "@azure-tools/typespec-azure-rulesets": ">=0.59.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.59.0 <1.0.0",
+    "@typespec/compiler": "^1.3.0",
+    "@typespec/http": "^1.3.0",
+    "@typespec/openapi": "^1.3.0",
+    "@typespec/rest": ">=0.73.0 <1.0.0",
+    "@typespec/versioning": ">=0.73.0 <1.0.0",
+    "@typespec/events": ">=0.73.0 <1.0.0",
+    "@typespec/sse": ">=0.73.0 <1.0.0",
+    "@typespec/streams": ">=0.73.0 <1.0.0",
+    "@typespec/xml": ">=0.73.0 <1.0.0"
   },
   "dependencies": {
     "js-yaml": "~4.1.0",
@@ -77,32 +77,32 @@
     "tsx": "~4.19.1"
   },
   "devDependencies": {
-    "@azure-tools/typespec-autorest": "~0.58.0",
-    "@azure-tools/typespec-azure-core": "~0.58.0",
-    "@azure-tools/typespec-azure-resource-manager": "~0.58.0",
-    "@azure-tools/typespec-azure-rulesets": "~0.58.0",
-    "@azure-tools/typespec-client-generator-core": "~0.58.0",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.23",
-    "@typespec/compiler": "^1.2.1",
-    "@typespec/http": "^1.2.1",
-    "@typespec/openapi": "^1.2.1",
-    "@typespec/rest": "~0.72.1",
-    "@typespec/versioning": "~0.72.1",
-    "@typespec/events": "~0.72.1",
-    "@typespec/spector": "0.1.0-alpha.16",
-    "@typespec/spec-api": "0.1.0-alpha.7",
-    "@typespec/sse": "~0.72.1",
-    "@typespec/streams": "~0.72.1",
-    "@typespec/xml": "~0.72.1",
-    "@typespec/http-specs": "0.1.0-alpha.24",
+    "@azure-tools/typespec-autorest": "~0.59.0",
+    "@azure-tools/typespec-azure-core": "~0.59.0",
+    "@azure-tools/typespec-azure-resource-manager": "~0.59.0",
+    "@azure-tools/typespec-azure-rulesets": "~0.59.0",
+    "@azure-tools/typespec-client-generator-core": "~0.59.0",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.25",
+    "@typespec/compiler": "^1.3.0",
+    "@typespec/http": "^1.3.0",
+    "@typespec/openapi": "^1.3.0",
+    "@typespec/rest": "~0.73.0",
+    "@typespec/versioning": "~0.73.0",
+    "@typespec/events": "~0.73.0",
+    "@typespec/spector": "0.1.0-alpha.17",
+    "@typespec/spec-api": "0.1.0-alpha.8",
+    "@typespec/sse": "~0.73.0",
+    "@typespec/streams": "~0.73.0",
+    "@typespec/xml": "~0.73.0",
+    "@typespec/http-specs": "0.1.0-alpha.25",
     "@types/js-yaml": "~4.0.5",
-    "@types/node": "~22.13.14",
+    "@types/node": "~24.1.0",
     "@types/semver": "7.5.8",
     "c8": "^10.1.3",
     "chalk": "5.3.0",
     "rimraf": "~6.0.1",
     "typescript": "~5.8.2",
     "typescript-eslint": "^8.21.0",
-    "vitest": "^3.0.5"
+    "vitest": "^3.1.2"
   }
 }