@autorest/python 6.49.1 → 6.50.0

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

@@ -247,7 +247,7 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
 
     def imports(self, async_mode: bool, **kwargs) -> FileImport:
         file_import = FileImport(self.code_model)
-        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR)
         if self.code_model.options["azure-arm"]:
             file_import.add_submodule_import("azure.mgmt.core", self.pipeline_class(async_mode), ImportType.SDKCORE)
         else:
@@ -307,20 +307,20 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
                 "rest",
                 "AsyncHttpResponse",
                 ImportType.SDKCORE,
-                TypingSection.CONDITIONAL,
+                TypingSection.REGULAR,
             )
         else:
             file_import.add_submodule_import(
                 "rest",
                 "HttpResponse",
                 ImportType.SDKCORE,
-                TypingSection.CONDITIONAL,
+                TypingSection.REGULAR,
             )
         file_import.add_submodule_import(
             "rest",
             "HttpRequest",
             ImportType.SDKCORE,
-            TypingSection.CONDITIONAL,
+            TypingSection.REGULAR,
         )
         serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)
         for og in self.operation_groups:
@@ -401,7 +401,7 @@ class Config(_ClientConfigBase[ConfigGlobalParameterList]):
             "policies",
             ImportType.SDKCORE,
         )
-        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR)
         if self.code_model.options.get("package-version"):
             serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)
             file_import.add_submodule_import(

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

@@ -213,6 +213,6 @@ class KeyCredentialType(CredentialType[KeyCredentialPolicyType]):
             "credentials",
             self.policy.credential_name,
             ImportType.SDKCORE,
-            typing_section=TypingSection.CONDITIONAL,
+            typing_section=TypingSection.REGULAR,
         )
         return file_import

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

@@ -241,7 +241,7 @@ class EnumType(BaseType):
         file_import = FileImport(self.code_model)
         file_import.merge(self.value_type.imports(**kwargs))
         if self.code_model.options["models-mode"]:
-            file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.CONDITIONAL)
+            file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.REGULAR)
 
             serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)
             relative_path = self.code_model.get_relative_import_path(serialize_namespace, self.client_namespace)

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

@@ -23,9 +23,8 @@ class ImportType(str, Enum):
 
 
 class TypingSection(str, Enum):
-    REGULAR = "regular"  # this import is always a typing import
-    CONDITIONAL = "conditional"  # is a typing import when we're dealing with files that py2 will use, else regular
-    TYPING = "typing"  # never a typing import
+    REGULAR = "regular"  # this import is always a regular import
+    TYPING = "typing"  # this import goes under TYPE_CHECKING
 
 
 class MsrestImportType(Enum):

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

@@ -138,7 +138,7 @@ class LROOperationBase(OperationBase[LROResponseType]):
                 "_deserialize",
                 ImportType.LOCAL,
             )
-        file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.REGULAR)
         file_import.add_submodule_import("typing", "cast", ImportType.STDLIB)
         return file_import
 

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

@@ -270,7 +270,7 @@ class JSONModelType(ModelType):
 
     def imports(self, **kwargs: Any) -> FileImport:
         file_import = FileImport(self.code_model)
-        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR)
         file_import.define_mutable_mapping_type()
         if self.is_xml:
             file_import.add_submodule_import("xml.etree", "ElementTree", ImportType.STDLIB, alias="ET")
@@ -351,7 +351,7 @@ class MsrestModelType(GeneratedModelType):
 
     def imports(self, **kwargs: Any) -> FileImport:
         file_import = super().imports(**kwargs)
-        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR)
         return file_import
 
 

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

@@ -296,11 +296,11 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
 
         serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)
         file_import = FileImport(self.code_model)
-        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR)
 
         response_types = [r.type_annotation(async_mode=async_mode, **kwargs) for r in self.responses if r.type]
         if len(set(response_types)) > 1:
-            file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.CONDITIONAL)
+            file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.REGULAR)
         if self.added_on:
             serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)
             file_import.add_submodule_import(
@@ -406,9 +406,9 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
             ImportType.SDKCORE,
         )
         file_import.add_submodule_import("rest", "HttpRequest", ImportType.SDKCORE)
-        file_import.add_submodule_import("typing", "Callable", ImportType.STDLIB, TypingSection.CONDITIONAL)
-        file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB, TypingSection.CONDITIONAL)
-        file_import.add_submodule_import("typing", "TypeVar", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Callable", ImportType.STDLIB, TypingSection.REGULAR)
+        file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB, TypingSection.REGULAR)
+        file_import.add_submodule_import("typing", "TypeVar", ImportType.STDLIB, TypingSection.REGULAR)
         if self.code_model.options["tracing"] and self.want_tracing and not async_mode:
             file_import.add_submodule_import(
                 "azure.core.tracing.decorator",

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

@@ -195,7 +195,7 @@ class OperationGroup(BaseModel):
             )
         if all(o.abstract for o in self.operations):
             return file_import
-        file_import.add_submodule_import("typing", "TypeVar", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "TypeVar", ImportType.STDLIB, TypingSection.REGULAR)
         file_import.define_mypy_type("T", "TypeVar('T')")
         type_value = "Optional[Callable[[PipelineResponse[HttpRequest, {}HttpResponse], T, dict[str, Any]], Any]]"
         file_import.define_mypy_type("ClsType", type_value.format(""), type_value.format("Async"))

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

@@ -150,11 +150,11 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
                 f"{self.code_model.core_library}.{default_paging_submodule}",
                 "AsyncItemPaged",
                 ImportType.SDKCORE,
-                TypingSection.CONDITIONAL,
+                TypingSection.REGULAR,
             )
         else:
             file_import.add_submodule_import(
-                f"{self.code_model.core_library}.paging", "ItemPaged", ImportType.SDKCORE, TypingSection.CONDITIONAL
+                f"{self.code_model.core_library}.paging", "ItemPaged", ImportType.SDKCORE, TypingSection.REGULAR
             )
         if (
             self.next_request_builder

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

@@ -139,7 +139,7 @@ class AnyType(PrimitiveType):
 
     def imports(self, **kwargs: Any) -> FileImport:
         file_import = FileImport(self.code_model)
-        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR)
         return file_import
 
     @property

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

@@ -120,7 +120,7 @@ class RequestBuilderBase(BaseBuilder[ParameterListType, Sequence["RequestBuilder
                 "case_insensitive_dict",
                 ImportType.SDKCORE,
             )
-        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, typing_section=TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, typing_section=TypingSection.REGULAR)
         file_import.add_msrest_import(
             serialize_namespace=kwargs.get("serialize_namespace", self.code_model.namespace),
             msrest_import_type=MsrestImportType.Serializer,

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

@@ -564,7 +564,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
     def make_pipeline_call(self, builder: OperationType) -> list[str]:
         retval = []
         type_ignore = self.async_mode and builder.group_name == ""  # is in a mixin
-        if builder.stream_value is True and not self.code_model.options["version-tolerant"]:
+        if builder.stream_value:
             retval.append("_decompress = kwargs.pop('decompress', True)")
         pylint_disable = " # pylint: disable=protected-access" if self.code_model.is_azure_flavor else ""
         retval.extend(
@@ -973,7 +973,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
             else:
                 stream_logic = False
                 if self.code_model.options["version-tolerant"]:
-                    deserialized = "response.iter_bytes()"
+                    deserialized = "response.iter_bytes() if _decompress else response.iter_raw()"
                 else:
                     deserialized = (
                         f"response.stream_download(self._client.{self.pipeline_name}, decompress=_decompress)"
@@ -1020,7 +1020,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
         if len(deserialize_code) > 0:
             if builder.expose_stream_keyword and stream_logic:
                 retval.append("if _stream:")
-                retval.append("    deserialized = response.iter_bytes()")
+                retval.append("    deserialized = response.iter_bytes() if _decompress else response.iter_raw()")
                 retval.append("else:")
                 retval.extend([f"    {dc}" for dc in deserialize_code])
             else:
@@ -1418,15 +1418,24 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
             access = (
                 "".join([f'.get("{i}", {{}})' for i in item_name_array[:-1]]) + f'.get("{item_name_array[-1]}", [])'
             )
-        list_of_elem_deserialized = ""
+        pylint_disable = ""
         if self.code_model.options["models-mode"] == "dpg":
             item_type = builder.item_type.type_annotation(
                 is_operation_file=True, serialize_namespace=self.serialize_namespace
             )
-            list_of_elem_deserialized = f"_deserialize({item_type}, deserialized{access})"
+            pylint_disable = (
+                "  # pylint: disable=protected-access" if getattr(builder.item_type, "internal", False) else ""
+            )
+            list_of_elem_deserialized = [
+                "_deserialize(",
+                f"{item_type},{pylint_disable}",
+                f"deserialized{access},",
+                ")",
+            ]
         else:
-            list_of_elem_deserialized = f"deserialized{access}"
-        retval.append(f"    list_of_elem = {list_of_elem_deserialized}")
+            list_of_elem_deserialized = [f"deserialized{access}"]
+        list_of_elem_deserialized_str = "\n    ".join(list_of_elem_deserialized)
+        retval.append(f"    list_of_elem = {list_of_elem_deserialized_str}")
         retval.append("    if cls:")
         retval.append("        list_of_elem = cls(list_of_elem) # type: ignore")
 

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

@@ -72,29 +72,8 @@ class FileImportSerializer:
         self.file_import = file_import
         self.async_mode = async_mode
 
-    def _get_imports_list(self, baseline_typing_section: TypingSection, add_conditional_typing: bool):
-        # If this is a python 3 file, our regular imports include the CONDITIONAL category
-        # If this is not a python 3 file, our typing imports include the CONDITIONAL category
-
-        # Get imports that already match the baseline_typing_section
-        result = list(self.file_import.get_imports_from_section(baseline_typing_section))
-
-        if add_conditional_typing:
-            # Get conditional imports and create new ImportModel instances with modified typing_section
-            conditional_imports = self.file_import.get_imports_from_section(TypingSection.CONDITIONAL)
-            for i in conditional_imports:
-                # Create a new ImportModel with the baseline_typing_section instead of CONDITIONAL
-                result.append(
-                    ImportModel(
-                        typing_section=baseline_typing_section,
-                        import_type=i.import_type,
-                        module_name=i.module_name,
-                        submodule_name=i.submodule_name,
-                        alias=i.alias,
-                        version_modules=i.version_modules,
-                    )
-                )
-        return result
+    def _get_imports_list(self, typing_section: TypingSection):
+        return list(self.file_import.get_imports_from_section(typing_section))
 
     def _add_type_checking_import(self):
         if any(self.file_import.get_imports_from_section(TypingSection.TYPING)):
@@ -117,19 +96,13 @@ class FileImportSerializer:
     def __str__(self) -> str:
         self._add_type_checking_import()
         regular_imports = ""
-        regular_imports_list = self._get_imports_list(
-            baseline_typing_section=TypingSection.REGULAR,
-            add_conditional_typing=True,
-        )
+        regular_imports_list = self._get_imports_list(TypingSection.REGULAR)
 
         if regular_imports_list:
             regular_imports = "\n\n".join(_get_import_clauses(regular_imports_list, "\n"))
 
         typing_imports = ""
-        typing_imports_list = self._get_imports_list(
-            baseline_typing_section=TypingSection.TYPING,
-            add_conditional_typing=False,
-        )
+        typing_imports_list = self._get_imports_list(TypingSection.TYPING)
         if typing_imports_list:
             typing_imports += "\n\nif TYPE_CHECKING:\n    "
             typing_imports += "\n\n    ".join(_get_import_clauses(typing_imports_list, "\n    "))

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

@@ -527,6 +527,8 @@ class _MyMutableMapping(MutableMapping[str, typing.Any]):
         return self._data.setdefault(key, default)
 
     def __eq__(self, other: typing.Any) -> bool:
+        if isinstance(other, _MyMutableMapping):
+            return self._data == other._data
         try:
             other_model = self.__class__(other)
         except Exception:
@@ -650,6 +652,9 @@ class Model(_MyMutableMapping):
                         if len(items) > 0:
                             existed_attr_keys.append(xml_name)
                             dict_to_pass[rf._rest_name] = _deserialize(rf._type, items)
+                        elif not rf._is_optional:
+                            existed_attr_keys.append(xml_name)
+                            dict_to_pass[rf._rest_name] = []
                         continue
 
                     # text element is primitive type
@@ -928,6 +933,8 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=too-many-retur
     # is it optional?
     try:
         if any(a is _NONE_TYPE for a in annotation.__args__):  # pyright: ignore
+            if rf:
+                rf._is_optional = True
             if len(annotation.__args__) <= 2:  # pyright: ignore
                 if_obj_deserializer = _get_deserialize_callable_from_annotation(
                     next(a for a in annotation.__args__ if a is not _NONE_TYPE), module, rf  # pyright: ignore
@@ -1020,16 +1027,20 @@ def _deserialize_with_callable(
                 return float(value.text) if value.text else None
             if deserializer is bool:
                 return value.text == "true" if value.text else None
+            if deserializer and deserializer in _DESERIALIZE_MAPPING.values():
+                return deserializer(value.text) if value.text else None
+            if deserializer and deserializer in _DESERIALIZE_MAPPING_WITHFORMAT.values():
+                return deserializer(value.text) if value.text else None
         if deserializer is None:
             return value
         if deserializer in [int, float, bool]:
             return deserializer(value)
         if isinstance(deserializer, CaseInsensitiveEnumMeta):
             try:
-                return deserializer(value)
+                return deserializer(value.text if isinstance(value, ET.Element) else value)
             except ValueError:
                 # for unknown value, return raw value
-                return value
+                return value.text if isinstance(value, ET.Element) else value
         if isinstance(deserializer, type) and issubclass(deserializer, Model):
             return deserializer._deserialize(value, [])
         return typing.cast(typing.Callable[[typing.Any], typing.Any], deserializer)(value)
@@ -1084,9 +1095,7 @@ def _failsafe_deserialize_xml(
       return None
 
 
-{% if code_model.has_padded_model_property %}
 # pylint: disable=too-many-instance-attributes
-{% endif %}
 class _RestField:
     def __init__(
         self,
@@ -1109,6 +1118,7 @@ class _RestField:
         self._is_discriminator = is_discriminator
         self._visibility = visibility
         self._is_model = False
+        self._is_optional = False
         self._default = default
         self._format = format
         self._is_multipart_file_input = is_multipart_file_input

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

@@ -4,6 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 """The preprocessing autorest plugin."""
+
 import copy
 from typing import Callable, Any, Optional
 
@@ -21,7 +22,6 @@ from ..utils import (
     get_body_type_for_description,
     JSON_REGEXP,
     KNOWN_TYPES,
-    update_enum_value,
 )
 
 
@@ -267,30 +267,18 @@ class PreProcessPlugin(YamlUpdatePlugin):
                 add_redefined_builtin_info(property["clientName"], property)
             if type.get("name"):
                 pad_type = PadType.MODEL if type["type"] == "model" else PadType.ENUM_CLASS
-                name = self.pad_reserved_words(type["name"], pad_type, type)
-                type["name"] = name[0].upper() + name[1:]
+                if type["type"] != "enumvalue":
+                    name = self.pad_reserved_words(type["name"], pad_type, type)
+                    type["name"] = name[0].upper() + name[1:]
                 type["description"] = update_description(type.get("description", ""), type["name"])
                 type["snakeCaseName"] = to_snake_case(type["name"])
             if type.get("values"):
-                # we're enums
-                values_to_add = []
+                # we're enums - enum values are UPPER_CASE so no padding needed for reserved words
                 for value in type["values"]:
-                    padded_name = self.pad_reserved_words(value["name"].lower(), PadType.ENUM_VALUE, value).upper()
-                    if self.version_tolerant:
-                        if padded_name[0] in "0123456789":
-                            padded_name = "ENUM_" + padded_name
-                            value["name"] = padded_name
-                    else:
-                        if value["name"] != padded_name:
-                            values_to_add.append(
-                                update_enum_value(
-                                    name=padded_name,
-                                    value=value["value"],
-                                    description=value["description"],
-                                    enum_type=value["enumType"],
-                                )
-                            )
-                type["values"].extend(values_to_add)
+                    upper_name = value["name"].upper()
+                    if upper_name[0] in "0123456789":
+                        upper_name = "ENUM_" + upper_name
+                        value["name"] = upper_name
 
         # add type for reference
         for v in HEADERS_CONVERT_IN_METHOD.values():

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

@@ -56,7 +56,6 @@ class PadType(str, Enum):
     ENUM_CLASS = "Enum"
     METHOD = "_method"
     PARAMETER = "_parameter"
-    ENUM_VALUE = "_enum"
     PROPERTY = "_property"
     OPERATION_GROUP = "Operations"
 
@@ -183,7 +182,6 @@ RESERVED_WORDS = {
     PadType.MODEL: ["enum", *_always_reserved],
     PadType.PROPERTY: ["self", *_always_reserved],
     PadType.ENUM_CLASS: ["enum", *_always_reserved],
-    PadType.ENUM_VALUE: ["mro", *_always_reserved],
     PadType.OPERATION_GROUP: [*_always_reserved],
 }
 

package/generator/component-detection-pip-report.json

@@ -4,11 +4,11 @@
   "install": [
     {
       "download_info": {
-        "url": "https://files.pythonhosted.org/packages/e1/c6/76dc613121b793286a3f91621d7b75a2b493e0390ddca50f11993eadf192/setuptools-82.0.0-py3-none-any.whl",
+        "url": "https://files.pythonhosted.org/packages/9d/76/f789f7a86709c6b087c5a2f52f911838cad707cc613162401badc665acfe/setuptools-82.0.1-py3-none-any.whl",
         "archive_info": {
-          "hash": "sha256=70b18734b607bd1da571d097d236cfcfacaf01de45717d59e6e04b96877532e0",
+          "hash": "sha256=a59e362652f08dcd477c78bb6e7bd9d80a7995bc73ce773050228a348ce2e5bb",
           "hashes": {
-            "sha256": "70b18734b607bd1da571d097d236cfcfacaf01de45717d59e6e04b96877532e0"
+            "sha256": "a59e362652f08dcd477c78bb6e7bd9d80a7995bc73ce773050228a348ce2e5bb"
           }
         }
       },
@@ -18,11 +18,11 @@
       "metadata": {
         "metadata_version": "2.4",
         "name": "setuptools",
-        "version": "82.0.0",
+        "version": "82.0.1",
         "dynamic": [
           "license-file"
         ],
-        "summary": "Easily download, build, install, upgrade, and uninstall Python packages",
+        "summary": "Most extensible Python build backend with support for C/C++ extension modules",
         "description": ".. |pypi-version| image:: https://img.shields.io/pypi/v/setuptools.svg\n   :target: https://pypi.org/project/setuptools\n\n.. |py-version| image:: https://img.shields.io/pypi/pyversions/setuptools.svg\n\n.. |test-badge| image:: https://github.com/pypa/setuptools/actions/workflows/main.yml/badge.svg\n   :target: https://github.com/pypa/setuptools/actions?query=workflow%3A%22tests%22\n   :alt: tests\n\n.. |ruff-badge| image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json\n   :target: https://github.com/astral-sh/ruff\n   :alt: Ruff\n\n.. |docs-badge| image:: https://img.shields.io/readthedocs/setuptools/latest.svg\n   :target: https://setuptools.pypa.io\n\n.. |skeleton-badge| image:: https://img.shields.io/badge/skeleton-2025-informational\n   :target: https://blog.jaraco.com/skeleton\n\n.. |codecov-badge| image:: https://img.shields.io/codecov/c/github/pypa/setuptools/master.svg?logo=codecov&logoColor=white\n   :target: https://codecov.io/gh/pypa/setuptools\n\n.. |tidelift-badge| image:: https://tidelift.com/badges/github/pypa/setuptools?style=flat\n   :target: https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=readme\n\n.. |discord-badge| image:: https://img.shields.io/discord/803025117553754132\n   :target: https://discord.com/channels/803025117553754132/815945031150993468\n   :alt: Discord\n\n|pypi-version| |py-version| |test-badge| |ruff-badge| |docs-badge| |skeleton-badge| |codecov-badge| |discord-badge|\n\nSee the `Quickstart <https://setuptools.pypa.io/en/latest/userguide/quickstart.html>`_\nand the `User's Guide <https://setuptools.pypa.io/en/latest/userguide/>`_ for\ninstructions on how to use Setuptools.\n\nQuestions and comments should be directed to `GitHub Discussions\n<https://github.com/pypa/setuptools/discussions>`_.\nBug reports and especially tested patches may be\nsubmitted directly to the `bug tracker\n<https://github.com/pypa/setuptools/issues>`_.\n\n\nCode of Conduct\n===============\n\nEveryone interacting in the setuptools project's codebases, issue trackers,\nchat rooms, and fora is expected to follow the\n`PSF Code of Conduct <https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md>`_.\n\n\nFor Enterprise\n==============\n\nAvailable as part of the Tidelift Subscription.\n\nSetuptools and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.\n\n`Learn more <https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=referral&utm_campaign=github>`_.\n",
         "description_content_type": "text/x-rst",
         "keywords": [
@@ -88,7 +88,6 @@
           "importlib_metadata>=6; python_version < \"3.10\" and extra == \"core\"",
           "tomli>=2.0.1; python_version < \"3.11\" and extra == \"core\"",
           "wheel>=0.43.0; extra == \"core\"",
-          "platformdirs>=4.2.2; extra == \"core\"",
           "jaraco.functools>=4; extra == \"core\"",
           "more_itertools; extra == \"core\"",
           "pytest-checkdocs>=2.4; extra == \"check\"",

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

@@ -247,7 +247,7 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
 
     def imports(self, async_mode: bool, **kwargs) -> FileImport:
         file_import = FileImport(self.code_model)
-        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR)
         if self.code_model.options["azure-arm"]:
             file_import.add_submodule_import("azure.mgmt.core", self.pipeline_class(async_mode), ImportType.SDKCORE)
         else:
@@ -307,20 +307,20 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
                 "rest",
                 "AsyncHttpResponse",
                 ImportType.SDKCORE,
-                TypingSection.CONDITIONAL,
+                TypingSection.REGULAR,
             )
         else:
             file_import.add_submodule_import(
                 "rest",
                 "HttpResponse",
                 ImportType.SDKCORE,
-                TypingSection.CONDITIONAL,
+                TypingSection.REGULAR,
             )
         file_import.add_submodule_import(
             "rest",
             "HttpRequest",
             ImportType.SDKCORE,
-            TypingSection.CONDITIONAL,
+            TypingSection.REGULAR,
         )
         serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)
         for og in self.operation_groups:
@@ -401,7 +401,7 @@ class Config(_ClientConfigBase[ConfigGlobalParameterList]):
             "policies",
             ImportType.SDKCORE,
         )
-        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR)
         if self.code_model.options.get("package-version"):
             serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)
             file_import.add_submodule_import(

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

@@ -213,6 +213,6 @@ class KeyCredentialType(CredentialType[KeyCredentialPolicyType]):
             "credentials",
             self.policy.credential_name,
             ImportType.SDKCORE,
-            typing_section=TypingSection.CONDITIONAL,
+            typing_section=TypingSection.REGULAR,
         )
         return file_import

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

@@ -241,7 +241,7 @@ class EnumType(BaseType):
         file_import = FileImport(self.code_model)
         file_import.merge(self.value_type.imports(**kwargs))
         if self.code_model.options["models-mode"]:
-            file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.CONDITIONAL)
+            file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.REGULAR)
 
             serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)
             relative_path = self.code_model.get_relative_import_path(serialize_namespace, self.client_namespace)

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

@@ -23,9 +23,8 @@ class ImportType(str, Enum):
 
 
 class TypingSection(str, Enum):
-    REGULAR = "regular"  # this import is always a typing import
-    CONDITIONAL = "conditional"  # is a typing import when we're dealing with files that py2 will use, else regular
-    TYPING = "typing"  # never a typing import
+    REGULAR = "regular"  # this import is always a regular import
+    TYPING = "typing"  # this import goes under TYPE_CHECKING
 
 
 class MsrestImportType(Enum):

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

@@ -138,7 +138,7 @@ class LROOperationBase(OperationBase[LROResponseType]):
                 "_deserialize",
                 ImportType.LOCAL,
             )
-        file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.REGULAR)
         file_import.add_submodule_import("typing", "cast", ImportType.STDLIB)
         return file_import
 

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

@@ -270,7 +270,7 @@ class JSONModelType(ModelType):
 
     def imports(self, **kwargs: Any) -> FileImport:
         file_import = FileImport(self.code_model)
-        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR)
         file_import.define_mutable_mapping_type()
         if self.is_xml:
             file_import.add_submodule_import("xml.etree", "ElementTree", ImportType.STDLIB, alias="ET")
@@ -351,7 +351,7 @@ class MsrestModelType(GeneratedModelType):
 
     def imports(self, **kwargs: Any) -> FileImport:
         file_import = super().imports(**kwargs)
-        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR)
         return file_import
 
 

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

@@ -296,11 +296,11 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
 
         serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)
         file_import = FileImport(self.code_model)
-        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR)
 
         response_types = [r.type_annotation(async_mode=async_mode, **kwargs) for r in self.responses if r.type]
         if len(set(response_types)) > 1:
-            file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.CONDITIONAL)
+            file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.REGULAR)
         if self.added_on:
             serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)
             file_import.add_submodule_import(
@@ -406,9 +406,9 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
             ImportType.SDKCORE,
         )
         file_import.add_submodule_import("rest", "HttpRequest", ImportType.SDKCORE)
-        file_import.add_submodule_import("typing", "Callable", ImportType.STDLIB, TypingSection.CONDITIONAL)
-        file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB, TypingSection.CONDITIONAL)
-        file_import.add_submodule_import("typing", "TypeVar", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Callable", ImportType.STDLIB, TypingSection.REGULAR)
+        file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB, TypingSection.REGULAR)
+        file_import.add_submodule_import("typing", "TypeVar", ImportType.STDLIB, TypingSection.REGULAR)
         if self.code_model.options["tracing"] and self.want_tracing and not async_mode:
             file_import.add_submodule_import(
                 "azure.core.tracing.decorator",

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

@@ -195,7 +195,7 @@ class OperationGroup(BaseModel):
             )
         if all(o.abstract for o in self.operations):
             return file_import
-        file_import.add_submodule_import("typing", "TypeVar", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "TypeVar", ImportType.STDLIB, TypingSection.REGULAR)
         file_import.define_mypy_type("T", "TypeVar('T')")
         type_value = "Optional[Callable[[PipelineResponse[HttpRequest, {}HttpResponse], T, dict[str, Any]], Any]]"
         file_import.define_mypy_type("ClsType", type_value.format(""), type_value.format("Async"))

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

@@ -150,11 +150,11 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
                 f"{self.code_model.core_library}.{default_paging_submodule}",
                 "AsyncItemPaged",
                 ImportType.SDKCORE,
-                TypingSection.CONDITIONAL,
+                TypingSection.REGULAR,
             )
         else:
             file_import.add_submodule_import(
-                f"{self.code_model.core_library}.paging", "ItemPaged", ImportType.SDKCORE, TypingSection.CONDITIONAL
+                f"{self.code_model.core_library}.paging", "ItemPaged", ImportType.SDKCORE, TypingSection.REGULAR
             )
         if (
             self.next_request_builder

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

@@ -139,7 +139,7 @@ class AnyType(PrimitiveType):
 
     def imports(self, **kwargs: Any) -> FileImport:
         file_import = FileImport(self.code_model)
-        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.REGULAR)
         return file_import
 
     @property

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

@@ -120,7 +120,7 @@ class RequestBuilderBase(BaseBuilder[ParameterListType, Sequence["RequestBuilder
                 "case_insensitive_dict",
                 ImportType.SDKCORE,
             )
-        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, typing_section=TypingSection.CONDITIONAL)
+        file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, typing_section=TypingSection.REGULAR)
         file_import.add_msrest_import(
             serialize_namespace=kwargs.get("serialize_namespace", self.code_model.namespace),
             msrest_import_type=MsrestImportType.Serializer,

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

@@ -564,7 +564,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
     def make_pipeline_call(self, builder: OperationType) -> list[str]:
         retval = []
         type_ignore = self.async_mode and builder.group_name == ""  # is in a mixin
-        if builder.stream_value is True and not self.code_model.options["version-tolerant"]:
+        if builder.stream_value:
             retval.append("_decompress = kwargs.pop('decompress', True)")
         pylint_disable = " # pylint: disable=protected-access" if self.code_model.is_azure_flavor else ""
         retval.extend(
@@ -973,7 +973,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
             else:
                 stream_logic = False
                 if self.code_model.options["version-tolerant"]:
-                    deserialized = "response.iter_bytes()"
+                    deserialized = "response.iter_bytes() if _decompress else response.iter_raw()"
                 else:
                     deserialized = (
                         f"response.stream_download(self._client.{self.pipeline_name}, decompress=_decompress)"
@@ -1020,7 +1020,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
         if len(deserialize_code) > 0:
             if builder.expose_stream_keyword and stream_logic:
                 retval.append("if _stream:")
-                retval.append("    deserialized = response.iter_bytes()")
+                retval.append("    deserialized = response.iter_bytes() if _decompress else response.iter_raw()")
                 retval.append("else:")
                 retval.extend([f"    {dc}" for dc in deserialize_code])
             else:
@@ -1418,15 +1418,24 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
             access = (
                 "".join([f'.get("{i}", {{}})' for i in item_name_array[:-1]]) + f'.get("{item_name_array[-1]}", [])'
             )
-        list_of_elem_deserialized = ""
+        pylint_disable = ""
         if self.code_model.options["models-mode"] == "dpg":
             item_type = builder.item_type.type_annotation(
                 is_operation_file=True, serialize_namespace=self.serialize_namespace
             )
-            list_of_elem_deserialized = f"_deserialize({item_type}, deserialized{access})"
+            pylint_disable = (
+                "  # pylint: disable=protected-access" if getattr(builder.item_type, "internal", False) else ""
+            )
+            list_of_elem_deserialized = [
+                "_deserialize(",
+                f"{item_type},{pylint_disable}",
+                f"deserialized{access},",
+                ")",
+            ]
         else:
-            list_of_elem_deserialized = f"deserialized{access}"
-        retval.append(f"    list_of_elem = {list_of_elem_deserialized}")
+            list_of_elem_deserialized = [f"deserialized{access}"]
+        list_of_elem_deserialized_str = "\n    ".join(list_of_elem_deserialized)
+        retval.append(f"    list_of_elem = {list_of_elem_deserialized_str}")
         retval.append("    if cls:")
         retval.append("        list_of_elem = cls(list_of_elem) # type: ignore")
 

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

@@ -72,29 +72,8 @@ class FileImportSerializer:
         self.file_import = file_import
         self.async_mode = async_mode
 
-    def _get_imports_list(self, baseline_typing_section: TypingSection, add_conditional_typing: bool):
-        # If this is a python 3 file, our regular imports include the CONDITIONAL category
-        # If this is not a python 3 file, our typing imports include the CONDITIONAL category
-
-        # Get imports that already match the baseline_typing_section
-        result = list(self.file_import.get_imports_from_section(baseline_typing_section))
-
-        if add_conditional_typing:
-            # Get conditional imports and create new ImportModel instances with modified typing_section
-            conditional_imports = self.file_import.get_imports_from_section(TypingSection.CONDITIONAL)
-            for i in conditional_imports:
-                # Create a new ImportModel with the baseline_typing_section instead of CONDITIONAL
-                result.append(
-                    ImportModel(
-                        typing_section=baseline_typing_section,
-                        import_type=i.import_type,
-                        module_name=i.module_name,
-                        submodule_name=i.submodule_name,
-                        alias=i.alias,
-                        version_modules=i.version_modules,
-                    )
-                )
-        return result
+    def _get_imports_list(self, typing_section: TypingSection):
+        return list(self.file_import.get_imports_from_section(typing_section))
 
     def _add_type_checking_import(self):
         if any(self.file_import.get_imports_from_section(TypingSection.TYPING)):
@@ -117,19 +96,13 @@ class FileImportSerializer:
     def __str__(self) -> str:
         self._add_type_checking_import()
         regular_imports = ""
-        regular_imports_list = self._get_imports_list(
-            baseline_typing_section=TypingSection.REGULAR,
-            add_conditional_typing=True,
-        )
+        regular_imports_list = self._get_imports_list(TypingSection.REGULAR)
 
         if regular_imports_list:
             regular_imports = "\n\n".join(_get_import_clauses(regular_imports_list, "\n"))
 
         typing_imports = ""
-        typing_imports_list = self._get_imports_list(
-            baseline_typing_section=TypingSection.TYPING,
-            add_conditional_typing=False,
-        )
+        typing_imports_list = self._get_imports_list(TypingSection.TYPING)
         if typing_imports_list:
             typing_imports += "\n\nif TYPE_CHECKING:\n    "
             typing_imports += "\n\n    ".join(_get_import_clauses(typing_imports_list, "\n    "))

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

@@ -527,6 +527,8 @@ class _MyMutableMapping(MutableMapping[str, typing.Any]):
         return self._data.setdefault(key, default)
 
     def __eq__(self, other: typing.Any) -> bool:
+        if isinstance(other, _MyMutableMapping):
+            return self._data == other._data
         try:
             other_model = self.__class__(other)
         except Exception:
@@ -650,6 +652,9 @@ class Model(_MyMutableMapping):
                         if len(items) > 0:
                             existed_attr_keys.append(xml_name)
                             dict_to_pass[rf._rest_name] = _deserialize(rf._type, items)
+                        elif not rf._is_optional:
+                            existed_attr_keys.append(xml_name)
+                            dict_to_pass[rf._rest_name] = []
                         continue
 
                     # text element is primitive type
@@ -928,6 +933,8 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=too-many-retur
     # is it optional?
     try:
         if any(a is _NONE_TYPE for a in annotation.__args__):  # pyright: ignore
+            if rf:
+                rf._is_optional = True
             if len(annotation.__args__) <= 2:  # pyright: ignore
                 if_obj_deserializer = _get_deserialize_callable_from_annotation(
                     next(a for a in annotation.__args__ if a is not _NONE_TYPE), module, rf  # pyright: ignore
@@ -1020,16 +1027,20 @@ def _deserialize_with_callable(
                 return float(value.text) if value.text else None
             if deserializer is bool:
                 return value.text == "true" if value.text else None
+            if deserializer and deserializer in _DESERIALIZE_MAPPING.values():
+                return deserializer(value.text) if value.text else None
+            if deserializer and deserializer in _DESERIALIZE_MAPPING_WITHFORMAT.values():
+                return deserializer(value.text) if value.text else None
         if deserializer is None:
             return value
         if deserializer in [int, float, bool]:
             return deserializer(value)
         if isinstance(deserializer, CaseInsensitiveEnumMeta):
             try:
-                return deserializer(value)
+                return deserializer(value.text if isinstance(value, ET.Element) else value)
             except ValueError:
                 # for unknown value, return raw value
-                return value
+                return value.text if isinstance(value, ET.Element) else value
         if isinstance(deserializer, type) and issubclass(deserializer, Model):
             return deserializer._deserialize(value, [])
         return typing.cast(typing.Callable[[typing.Any], typing.Any], deserializer)(value)
@@ -1084,9 +1095,7 @@ def _failsafe_deserialize_xml(
       return None
 
 
-{% if code_model.has_padded_model_property %}
 # pylint: disable=too-many-instance-attributes
-{% endif %}
 class _RestField:
     def __init__(
         self,
@@ -1109,6 +1118,7 @@ class _RestField:
         self._is_discriminator = is_discriminator
         self._visibility = visibility
         self._is_model = False
+        self._is_optional = False
         self._default = default
         self._format = format
         self._is_multipart_file_input = is_multipart_file_input

package/generator/pygen/preprocess/__init__.py

@@ -4,6 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 """The preprocessing autorest plugin."""
+
 import copy
 from typing import Callable, Any, Optional
 
@@ -21,7 +22,6 @@ from ..utils import (
     get_body_type_for_description,
     JSON_REGEXP,
     KNOWN_TYPES,
-    update_enum_value,
 )
 
 
@@ -267,30 +267,18 @@ class PreProcessPlugin(YamlUpdatePlugin):
                 add_redefined_builtin_info(property["clientName"], property)
             if type.get("name"):
                 pad_type = PadType.MODEL if type["type"] == "model" else PadType.ENUM_CLASS
-                name = self.pad_reserved_words(type["name"], pad_type, type)
-                type["name"] = name[0].upper() + name[1:]
+                if type["type"] != "enumvalue":
+                    name = self.pad_reserved_words(type["name"], pad_type, type)
+                    type["name"] = name[0].upper() + name[1:]
                 type["description"] = update_description(type.get("description", ""), type["name"])
                 type["snakeCaseName"] = to_snake_case(type["name"])
             if type.get("values"):
-                # we're enums
-                values_to_add = []
+                # we're enums - enum values are UPPER_CASE so no padding needed for reserved words
                 for value in type["values"]:
-                    padded_name = self.pad_reserved_words(value["name"].lower(), PadType.ENUM_VALUE, value).upper()
-                    if self.version_tolerant:
-                        if padded_name[0] in "0123456789":
-                            padded_name = "ENUM_" + padded_name
-                            value["name"] = padded_name
-                    else:
-                        if value["name"] != padded_name:
-                            values_to_add.append(
-                                update_enum_value(
-                                    name=padded_name,
-                                    value=value["value"],
-                                    description=value["description"],
-                                    enum_type=value["enumType"],
-                                )
-                            )
-                type["values"].extend(values_to_add)
+                    upper_name = value["name"].upper()
+                    if upper_name[0] in "0123456789":
+                        upper_name = "ENUM_" + upper_name
+                        value["name"] = upper_name
 
         # add type for reference
         for v in HEADERS_CONVERT_IN_METHOD.values():

package/generator/pygen/preprocess/python_mappings.py

@@ -56,7 +56,6 @@ class PadType(str, Enum):
     ENUM_CLASS = "Enum"
     METHOD = "_method"
     PARAMETER = "_parameter"
-    ENUM_VALUE = "_enum"
     PROPERTY = "_property"
     OPERATION_GROUP = "Operations"
 
@@ -183,7 +182,6 @@ RESERVED_WORDS = {
     PadType.MODEL: ["enum", *_always_reserved],
     PadType.PROPERTY: ["self", *_always_reserved],
     PadType.ENUM_CLASS: ["enum", *_always_reserved],
-    PadType.ENUM_VALUE: ["mro", *_always_reserved],
     PadType.OPERATION_GROUP: [*_always_reserved],
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.49.1",
+  "version": "6.50.0",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {
@@ -19,10 +19,10 @@
   },
   "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md",
   "dependencies": {
-    "@typespec/http-client-python": "~0.27.1",
+    "@typespec/http-client-python": "~0.28.0",
     "@autorest/system-requirements": "~1.0.2",
     "fs-extra": "~11.2.0",
-    "tsx": "~4.19.1"
+    "tsx": "^4.21.0"
   },
   "devDependencies": {
     "@microsoft.azure/autorest.testserver": "^3.3.50",