@autorest/python 6.38.0 → 6.38.2

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

@@ -46,7 +46,7 @@ class OptionsDict(MutableMapping):
         self._data = options.copy() if options else {}
         self._validate_combinations()
 
-    def __getitem__(self, key: str) -> Any: # pylint: disable=too-many-return-statements
+    def __getitem__(self, key: str) -> Any:  # pylint: disable=too-many-return-statements
         if key == "head-as-boolean" and self.get("azure-arm"):
             # override to always true if azure-arm is set
             return True
@@ -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)
 
@@ -106,7 +109,12 @@ class OptionsDict(MutableMapping):
         if key == "combine-operation-files":
             return self.get("version-tolerant")
         if key == "package-pprint-name":
-            return " ".join([i.capitalize() for i in str(self.get("package-name", "")).split("-")])
+            package_names = self.get("package-name", "").split("-")
+            return (
+                (package_names[-1].capitalize() + " Management")
+                if self.get("azure-arm")
+                else " ".join([i.capitalize() for i in package_names])
+            )
         if key == "builders-visibility":
             # Default to public if low-level client is not set, otherwise embedded
             return "embedded" if not self.get("low-level-client") else "public"

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

@@ -149,9 +149,12 @@ class JinjaSerializer(ReaderAndWriter):
                     self._serialize_and_write_package_files()
 
                 # write apiview-properties.json
-                if self.code_model.options.get("emit-cross-language-definition-file"):
+                if (
+                    self.code_model.options.get("emit-cross-language-definition-file")
+                    and not self.code_model.options["multiapi"]
+                ):
                     self.write_file(
-                        generation_path / Path("apiview-properties.json"),
+                        self._root_of_sdk / Path("apiview-properties.json"),
                         general_serializer.serialize_cross_language_definition_file(),
                     )
 
@@ -165,7 +168,7 @@ class JinjaSerializer(ReaderAndWriter):
                 # add _metadata.json
                 if self.code_model.metadata:
                     self.write_file(
-                        Path("./_metadata.json"),
+                        self._root_of_sdk / "_metadata.json",
                         json.dumps(self.code_model.metadata, indent=2),
                     )
             elif client_namespace_type.clients:
@@ -216,11 +219,17 @@ class JinjaSerializer(ReaderAndWriter):
                     general_serializer.serialize_pkgutil_init_file(),
                 )
 
-    def _serialize_and_write_package_files(self) -> None:
+    # path where README.md is
+    @property
+    def _root_of_sdk(self) -> Path:
         root_of_sdk = Path(".")
         if self.code_model.options["no-namespace-folders"]:
             compensation = Path("../" * (self.code_model.namespace.count(".") + 1))
             root_of_sdk = root_of_sdk / compensation
+        return root_of_sdk
+
+    def _serialize_and_write_package_files(self) -> None:
+        root_of_sdk = self._root_of_sdk
         if self.code_model.options["package-mode"] in VALID_PACKAGE_MODE:
             env = Environment(
                 loader=PackageLoader("pygen.codegen", "templates/packaging_templates"),
@@ -520,14 +529,14 @@ class JinjaSerializer(ReaderAndWriter):
         namespace_config = get_namespace_config(self.code_model.namespace, self.code_model.options["multiapi"])
         num_of_namespace = namespace_config.count(".") + 1
         num_of_package_namespace = (
-            get_namespace_from_package_name(self.code_model.options.get("namespace", "")).count(".") + 1
+            get_namespace_from_package_name(self.code_model.options.get("package-name", "")).count(".") + 1
         )
         if num_of_namespace > num_of_package_namespace:
             return Path("/".join(namespace_config.split(".")[num_of_package_namespace:]))
         return Path("")
 
     def _serialize_and_write_sample(self, env: Environment):
-        out_path = Path("./generated_samples")
+        out_path = self._root_of_sdk / "generated_samples"
         for client in self.code_model.clients:
             for op_group in client.operation_groups:
                 for operation in op_group.operations:
@@ -561,7 +570,7 @@ class JinjaSerializer(ReaderAndWriter):
 
     def _serialize_and_write_test(self, env: Environment):
         self.code_model.for_test = True
-        out_path = Path("./generated_tests")
+        out_path = self._root_of_sdk / "generated_tests"
         general_serializer = TestGeneralSerializer(code_model=self.code_model, env=env)
         self.write_file(out_path / "conftest.py", general_serializer.serialize_conftest())
         if not self.code_model.options["azure-arm"]:

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}, "
@@ -1067,11 +1067,9 @@ 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())"
-                            )
+                            retval.append(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}, "
@@ -1086,9 +1084,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
             if builder.non_default_errors:
                 retval.append("    else:")
             if self.code_model.options["models-mode"] == "dpg":
-                retval.append(
-                    f"{indent}error = _failsafe_deserialize({default_error_deserialization},  response.json())"
-                )
+                retval.append(f"{indent}error = _failsafe_deserialize({default_error_deserialization}, response)")
             else:
                 retval.append(
                     f"{indent}error = self._deserialize.failsafe_deserialize({default_error_deserialization}, "

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

@@ -70,9 +70,11 @@ class GeneralSerializer(BaseSerializer):
             # If parsing the pyproject.toml fails, we assume the it does not exist or is incorrectly formatted.
             return result
 
-        # Keep azure-sdk-build configuration
+        # Keep "azure-sdk-build" and "packaging" configuration
         if "tool" in loaded_pyproject_toml and "azure-sdk-build" in loaded_pyproject_toml["tool"]:
             result["KEEP_FIELDS"]["tool.azure-sdk-build"] = loaded_pyproject_toml["tool"]["azure-sdk-build"]
+        if "packaging" in loaded_pyproject_toml:
+            result["KEEP_FIELDS"]["packaging"] = loaded_pyproject_toml["packaging"]
 
         # Process dependencies
         if "project" in loaded_pyproject_toml:

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/CHANGELOG.md.jinja2

@@ -2,5 +2,6 @@
 
 ## 1.0.0b1 (1970-01-01)
 
-- Initial version
+### Other Changes
 
+  - Initial version

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]
@@ -14,8 +14,12 @@ name = "{{ options.get('package-name')|lower }}"
 authors = [
   { name = "{{ code_model.company_name }}"{% if code_model.is_azure_flavor %}, email = "azpysdkhelp@microsoft.com"{% endif %} },
 ]
+{% if options.get("azure-arm") %}
+description = "Microsoft Azure {{ options.get('package-pprint-name') }} Client Library for Python"
+{% else %}
 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"}
+{% endif %}
+license = "MIT"
 classifiers = [
     "Development Status :: {{ dev_status }}",
     "Programming Language :: Python",
@@ -24,7 +28,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 %}
@@ -74,7 +77,7 @@ version = "{{ options.get("package-version", "unknown") }}"
 {% if code_model.is_azure_flavor %}
 
 [project.urls]
-repository = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk"
+repository = "https://github.com/Azure/azure-sdk-for-python"
 {% endif %}
 
 [tool.setuptools.dynamic]
@@ -85,13 +88,14 @@ version = {attr = "{{ code_model.namespace|lower }}._version.VERSION"}
 version = {attr = "{{ options.get('package-name')|lower|replace('-', '.') }}._version.VERSION"}
     {% endif %}
 {% endif %}
-readme = {file = ["README.md"], content-type = "text/markdown"}
+readme = {file = ["README.md", "CHANGELOG.md"], content-type = "text/markdown"}
 {% if options.get('package-mode') %}
 
 [tool.setuptools.packages.find]
 exclude = [
     "tests*",
     "samples*",
+    "doc*",
     {% for pkgutil_name in pkgutil_names %}
     "{{ pkgutil_name }}",
     {% endfor %}

package/generator/pygen/__init__.py

@@ -46,7 +46,7 @@ class OptionsDict(MutableMapping):
         self._data = options.copy() if options else {}
         self._validate_combinations()
 
-    def __getitem__(self, key: str) -> Any: # pylint: disable=too-many-return-statements
+    def __getitem__(self, key: str) -> Any:  # pylint: disable=too-many-return-statements
         if key == "head-as-boolean" and self.get("azure-arm"):
             # override to always true if azure-arm is set
             return True
@@ -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)
 
@@ -106,7 +109,12 @@ class OptionsDict(MutableMapping):
         if key == "combine-operation-files":
             return self.get("version-tolerant")
         if key == "package-pprint-name":
-            return " ".join([i.capitalize() for i in str(self.get("package-name", "")).split("-")])
+            package_names = self.get("package-name", "").split("-")
+            return (
+                (package_names[-1].capitalize() + " Management")
+                if self.get("azure-arm")
+                else " ".join([i.capitalize() for i in package_names])
+            )
         if key == "builders-visibility":
             # Default to public if low-level client is not set, otherwise embedded
             return "embedded" if not self.get("low-level-client") else "public"

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

@@ -149,9 +149,12 @@ class JinjaSerializer(ReaderAndWriter):
                     self._serialize_and_write_package_files()
 
                 # write apiview-properties.json
-                if self.code_model.options.get("emit-cross-language-definition-file"):
+                if (
+                    self.code_model.options.get("emit-cross-language-definition-file")
+                    and not self.code_model.options["multiapi"]
+                ):
                     self.write_file(
-                        generation_path / Path("apiview-properties.json"),
+                        self._root_of_sdk / Path("apiview-properties.json"),
                         general_serializer.serialize_cross_language_definition_file(),
                     )
 
@@ -165,7 +168,7 @@ class JinjaSerializer(ReaderAndWriter):
                 # add _metadata.json
                 if self.code_model.metadata:
                     self.write_file(
-                        Path("./_metadata.json"),
+                        self._root_of_sdk / "_metadata.json",
                         json.dumps(self.code_model.metadata, indent=2),
                     )
             elif client_namespace_type.clients:
@@ -216,11 +219,17 @@ class JinjaSerializer(ReaderAndWriter):
                     general_serializer.serialize_pkgutil_init_file(),
                 )
 
-    def _serialize_and_write_package_files(self) -> None:
+    # path where README.md is
+    @property
+    def _root_of_sdk(self) -> Path:
         root_of_sdk = Path(".")
         if self.code_model.options["no-namespace-folders"]:
             compensation = Path("../" * (self.code_model.namespace.count(".") + 1))
             root_of_sdk = root_of_sdk / compensation
+        return root_of_sdk
+
+    def _serialize_and_write_package_files(self) -> None:
+        root_of_sdk = self._root_of_sdk
         if self.code_model.options["package-mode"] in VALID_PACKAGE_MODE:
             env = Environment(
                 loader=PackageLoader("pygen.codegen", "templates/packaging_templates"),
@@ -520,14 +529,14 @@ class JinjaSerializer(ReaderAndWriter):
         namespace_config = get_namespace_config(self.code_model.namespace, self.code_model.options["multiapi"])
         num_of_namespace = namespace_config.count(".") + 1
         num_of_package_namespace = (
-            get_namespace_from_package_name(self.code_model.options.get("namespace", "")).count(".") + 1
+            get_namespace_from_package_name(self.code_model.options.get("package-name", "")).count(".") + 1
         )
         if num_of_namespace > num_of_package_namespace:
             return Path("/".join(namespace_config.split(".")[num_of_package_namespace:]))
         return Path("")
 
     def _serialize_and_write_sample(self, env: Environment):
-        out_path = Path("./generated_samples")
+        out_path = self._root_of_sdk / "generated_samples"
         for client in self.code_model.clients:
             for op_group in client.operation_groups:
                 for operation in op_group.operations:
@@ -561,7 +570,7 @@ class JinjaSerializer(ReaderAndWriter):
 
     def _serialize_and_write_test(self, env: Environment):
         self.code_model.for_test = True
-        out_path = Path("./generated_tests")
+        out_path = self._root_of_sdk / "generated_tests"
         general_serializer = TestGeneralSerializer(code_model=self.code_model, env=env)
         self.write_file(out_path / "conftest.py", general_serializer.serialize_conftest())
         if not self.code_model.options["azure-arm"]:

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}, "
@@ -1067,11 +1067,9 @@ 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())"
-                            )
+                            retval.append(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}, "
@@ -1086,9 +1084,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
             if builder.non_default_errors:
                 retval.append("    else:")
             if self.code_model.options["models-mode"] == "dpg":
-                retval.append(
-                    f"{indent}error = _failsafe_deserialize({default_error_deserialization},  response.json())"
-                )
+                retval.append(f"{indent}error = _failsafe_deserialize({default_error_deserialization}, response)")
             else:
                 retval.append(
                     f"{indent}error = self._deserialize.failsafe_deserialize({default_error_deserialization}, "

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

@@ -70,9 +70,11 @@ class GeneralSerializer(BaseSerializer):
             # If parsing the pyproject.toml fails, we assume the it does not exist or is incorrectly formatted.
             return result
 
-        # Keep azure-sdk-build configuration
+        # Keep "azure-sdk-build" and "packaging" configuration
         if "tool" in loaded_pyproject_toml and "azure-sdk-build" in loaded_pyproject_toml["tool"]:
             result["KEEP_FIELDS"]["tool.azure-sdk-build"] = loaded_pyproject_toml["tool"]["azure-sdk-build"]
+        if "packaging" in loaded_pyproject_toml:
+            result["KEEP_FIELDS"]["packaging"] = loaded_pyproject_toml["packaging"]
 
         # Process dependencies
         if "project" in loaded_pyproject_toml:

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/CHANGELOG.md.jinja2

@@ -2,5 +2,6 @@
 
 ## 1.0.0b1 (1970-01-01)
 
-- Initial version
+### Other Changes
 
+  - Initial version

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]
@@ -14,8 +14,12 @@ name = "{{ options.get('package-name')|lower }}"
 authors = [
   { name = "{{ code_model.company_name }}"{% if code_model.is_azure_flavor %}, email = "azpysdkhelp@microsoft.com"{% endif %} },
 ]
+{% if options.get("azure-arm") %}
+description = "Microsoft Azure {{ options.get('package-pprint-name') }} Client Library for Python"
+{% else %}
 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"}
+{% endif %}
+license = "MIT"
 classifiers = [
     "Development Status :: {{ dev_status }}",
     "Programming Language :: Python",
@@ -24,7 +28,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 %}
@@ -74,7 +77,7 @@ version = "{{ options.get("package-version", "unknown") }}"
 {% if code_model.is_azure_flavor %}
 
 [project.urls]
-repository = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk"
+repository = "https://github.com/Azure/azure-sdk-for-python"
 {% endif %}
 
 [tool.setuptools.dynamic]
@@ -85,13 +88,14 @@ version = {attr = "{{ code_model.namespace|lower }}._version.VERSION"}
 version = {attr = "{{ options.get('package-name')|lower|replace('-', '.') }}._version.VERSION"}
     {% endif %}
 {% endif %}
-readme = {file = ["README.md"], content-type = "text/markdown"}
+readme = {file = ["README.md", "CHANGELOG.md"], content-type = "text/markdown"}
 {% if options.get('package-mode') %}
 
 [tool.setuptools.packages.find]
 exclude = [
     "tests*",
     "samples*",
+    "doc*",
     {% for pkgutil_name in pkgutil_names %}
     "{{ pkgutil_name }}",
     {% endfor %}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.38.0",
+  "version": "6.38.2",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {
@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md",
   "dependencies": {
-    "@typespec/http-client-python": "~0.15.0",
+    "@typespec/http-client-python": "~0.15.2",
     "@autorest/system-requirements": "~1.0.2",
     "fs-extra": "~11.2.0",
     "tsx": "~4.19.1"