@autorest/python 6.45.1 → 6.46.0

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

@@ -491,6 +491,10 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
     def has_operation_named_list(self) -> bool:
         return any(o.name.lower() == "list" for c in self.clients for og in c.operation_groups for o in og.operations)
 
+    @property
+    def has_property_named_list(self) -> bool:
+        return any(p.client_name.lower() == "list" for m in self.model_types for p in m.properties)
+
     @property
     def has_padded_model_property(self) -> bool:
         for model_type in self.model_types:

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

@@ -7,7 +7,8 @@ from typing import Any, TYPE_CHECKING, Optional, cast
 
 from .base import BaseType
 from .imports import FileImport, ImportType, TypingSection
-from .utils import NamespaceType
+from .utils import NamespaceType, add_to_pylint_disable
+from ...utils import NAME_LENGTH_LIMIT
 
 
 if TYPE_CHECKING:
@@ -189,6 +190,12 @@ class EnumType(BaseType):
             return f"Union[{self.value_type.type_annotation(**kwargs)}, {model_name}]"
         return self.value_type.type_annotation(**kwargs)
 
+    def pylint_disable(self) -> str:
+        retval: str = ""
+        if len(self.name) > NAME_LENGTH_LIMIT:
+            retval = add_to_pylint_disable(retval, "name-too-long")
+        return retval
+
     def get_declaration(self, value: Any) -> str:
         return self.value_type.get_declaration(value)
 

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

@@ -41,8 +41,12 @@ class ListType(BaseType):
             # this means we're version tolerant XML, we just return the XML element
             return self.element_type.type_annotation(**kwargs)
 
-        # if there is a function named `list` we have to make sure there's no conflict with the built-in `list`
-        list_type = "List" if self.code_model.has_operation_named_list and kwargs.get("is_operation_file") else "list"
+        # if there is a function/property named `list` we have to make sure there's no conflict with the built-in `list`
+        is_operation_file = kwargs.get("is_operation_file", False)
+        use_list_import = (self.code_model.has_operation_named_list and is_operation_file) or (
+            self.code_model.has_property_named_list and not is_operation_file
+        )
+        list_type = "List" if use_list_import else "list"
         return f"{list_type}[{self.element_type.type_annotation(**kwargs)}]"
 
     def description(self, *, is_operation_file: bool) -> str:

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

@@ -7,7 +7,7 @@ from enum import Enum
 from collections import OrderedDict
 from typing import Any, Optional, TYPE_CHECKING, cast
 import sys
-from .utils import add_to_pylint_disable, NamespaceType
+from .utils import add_to_pylint_disable, NamespaceType, LOCALS_LENGTH_LIMIT
 from .base import BaseType
 from .constant_type import ConstantType
 from .property import Property
@@ -244,7 +244,7 @@ class ModelType(BaseType):  # pylint: disable=too-many-instance-attributes, too-
     @property
     def init_pylint_disable(self) -> str:
         retval: str = ""
-        if len(self.properties) > 23:
+        if len(self.properties) > LOCALS_LENGTH_LIMIT:
             retval = add_to_pylint_disable(retval, "too-many-locals")
         return retval
 

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

@@ -16,7 +16,7 @@ from typing import (
 
 from .request_builder_parameter import RequestBuilderParameter
 
-from .utils import OrderedSet, add_to_pylint_disable
+from .utils import OrderedSet, add_to_pylint_disable, LOCALS_LENGTH_LIMIT, OPERATION_BODY_VARIABLES_LENGTH
 from .base_builder import BaseBuilder
 from .imports import FileImport, ImportType, TypingSection
 from .response import (
@@ -143,6 +143,12 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
             retval = add_to_pylint_disable(retval, "inconsistent-return-statements")
         if len(self.name) > NAME_LENGTH_LIMIT:
             retval = add_to_pylint_disable(retval, "name-too-long")
+        method_params = self.parameters.method
+        if self.is_overload and len(method_params) > LOCALS_LENGTH_LIMIT:
+            retval = add_to_pylint_disable(retval, "too-many-locals")
+        elif not self.is_overload and len(method_params) > (LOCALS_LENGTH_LIMIT - OPERATION_BODY_VARIABLES_LENGTH):
+            retval = add_to_pylint_disable(retval, "too-many-locals")
+
         return retval
 
     def cls_type_annotation(self, *, async_mode: bool, **kwargs: Any) -> str:
@@ -408,6 +414,9 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
         file_import.merge(self.get_request_builder_import(self.request_builder, async_mode, serialize_namespace))
         if self.overloads:
             file_import.add_submodule_import("typing", "overload", ImportType.STDLIB)
+            for overload in self.overloads:
+                if overload.parameters.has_body:
+                    file_import.merge(overload.parameters.body_parameter.type.imports(**kwargs))
         if self.code_model.options["models-mode"] == "dpg":
             relative_path = self.code_model.get_relative_import_path(
                 serialize_namespace, module_name="_utils.model_base"

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

@@ -93,7 +93,9 @@ class OperationGroup(BaseModel):
     @property
     def need_validation(self) -> bool:
         """Whether any of its operations need validation"""
-        return any(o for o in self.operations if o.need_validation)
+        return any(o for o in self.operations if o.need_validation) or any(
+            og for og in self.operation_groups if og.need_validation
+        )
 
     def imports(self, async_mode: bool, **kwargs: Any) -> FileImport:
         file_import = FileImport(self.code_model)

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

@@ -16,11 +16,12 @@ from typing import (
 from abc import abstractmethod
 
 from .base_builder import BaseBuilder
-from .utils import add_to_pylint_disable
+from .utils import add_to_pylint_disable, LOCALS_LENGTH_LIMIT, REQUEST_BUILDER_BODY_VARIABLES_LENGTH
 from .parameter_list import (
     RequestBuilderParameterList,
     OverloadedRequestBuilderParameterList,
 )
+from .parameter import ParameterLocation
 from .imports import FileImport, ImportType, TypingSection, MsrestImportType
 from ...utils import NAME_LENGTH_LIMIT
 
@@ -67,9 +68,25 @@ class RequestBuilderBase(BaseBuilder[ParameterListType, Sequence["RequestBuilder
         return self.yaml_data.get("discriminator") in ("lro", "lropaging")
 
     def pylint_disable(self, async_mode: bool) -> str:
+        retval = ""
         if len(self.name) > NAME_LENGTH_LIMIT:
-            return add_to_pylint_disable("", "name-too-long")
-        return ""
+            retval = add_to_pylint_disable(retval, "name-too-long")
+        method_params = self.parameters.method
+        if len(method_params) > LOCALS_LENGTH_LIMIT - REQUEST_BUILDER_BODY_VARIABLES_LENGTH:
+            retval = add_to_pylint_disable(retval, "too-many-locals")
+        if (
+            len(
+                [
+                    p
+                    for p in method_params
+                    if p.optional and p.location in [ParameterLocation.HEADER, ParameterLocation.QUERY]
+                ]
+            )
+            > LOCALS_LENGTH_LIMIT
+        ):
+            retval = add_to_pylint_disable(retval, "too-many-statements")
+            retval = add_to_pylint_disable(retval, "too-many-branches")
+        return retval
 
     def response_type_annotation(self, **kwargs) -> str:
         return "HttpRequest"

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

@@ -233,7 +233,7 @@ class LROResponse(Response):
 
     def get_no_polling_method(self, async_mode: bool) -> str:
         """Get the default no polling method"""
-        return self.get_no_polling_method_path(async_mode).split(".")[-1]
+        return self.get_no_polling_method_path(async_mode).rsplit(".", maxsplit=1)[-1]
 
     @staticmethod
     def get_base_polling_method_path(async_mode: bool) -> str:
@@ -242,7 +242,7 @@ class LROResponse(Response):
 
     def get_base_polling_method(self, async_mode: bool) -> str:
         """Get the base polling method."""
-        return self.get_base_polling_method_path(async_mode).split(".")[-1]
+        return self.get_base_polling_method_path(async_mode).rsplit(".", maxsplit=1)[-1]
 
     def type_annotation(self, **kwargs: Any) -> str:
         return f"{self.get_poller(kwargs.get('async_mode', False))}[{super().type_annotation(**kwargs)}]"

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

@@ -30,3 +30,10 @@ class NamespaceType(str, Enum):
     OPERATION = "operation"
     CLIENT = "client"
     TYPES_FILE = "types_file"
+
+
+LOCALS_LENGTH_LIMIT = 25
+
+REQUEST_BUILDER_BODY_VARIABLES_LENGTH = 6  # how many body variables are present in a request builder
+
+OPERATION_BODY_VARIABLES_LENGTH = 14  # how many body variables are present in an operation

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

@@ -781,8 +781,14 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
         client_names = [
             overload.request_builder.parameters.body_parameter.client_name for overload in builder.overloads
         ]
-        for v in sorted(set(client_names), key=client_names.index):
-            retval.append(f"_{v} = None")
+        all_dpg_model_overloads = False
+        if self.code_model.options["models-mode"] == "dpg" and builder.overloads:
+            all_dpg_model_overloads = all(
+                isinstance(o.parameters.body_parameter.type, DPGModelType) for o in builder.overloads
+            )
+        if not all_dpg_model_overloads:
+            for v in sorted(set(client_names), key=client_names.index):
+                retval.append(f"_{v} = None")
         try:
             # if there is a binary overload, we do a binary check first.
             binary_overload = cast(
@@ -808,17 +814,20 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                     f'"{other_overload.parameters.body_parameter.default_content_type}"{check_body_suffix}'
                 )
         except StopIteration:
-            for idx, overload in enumerate(builder.overloads):
-                if_statement = "if" if idx == 0 else "elif"
-                body_param = overload.parameters.body_parameter
-                retval.append(
-                    f"{if_statement} {body_param.type.instance_check_template.format(body_param.client_name)}:"
-                )
-                if body_param.default_content_type and not same_content_type:
+            if all_dpg_model_overloads:
+                retval.extend(f"{l}" for l in self._create_body_parameter(cast(OperationType, builder.overloads[0])))
+            else:
+                for idx, overload in enumerate(builder.overloads):
+                    if_statement = "if" if idx == 0 else "elif"
+                    body_param = overload.parameters.body_parameter
                     retval.append(
-                        f'    content_type = content_type or "{body_param.default_content_type}"{check_body_suffix}'
+                        f"{if_statement} {body_param.type.instance_check_template.format(body_param.client_name)}:"
                     )
-                retval.extend(f"    {l}" for l in self._create_body_parameter(cast(OperationType, overload)))
+                    if body_param.default_content_type and not same_content_type:
+                        retval.append(
+                            f'    content_type = content_type or "{body_param.default_content_type}"{check_body_suffix}'
+                        )
+                    retval.extend(f"    {l}" for l in self._create_body_parameter(cast(OperationType, overload)))
         return retval
 
     def _create_request_builder_call(

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

@@ -182,11 +182,10 @@ class ClientSerializer:
             retval.append("self._serialize.client_side_validation = False")
         operation_groups = [og for og in self.client.operation_groups if not og.is_mixin]
         for og in operation_groups:
-            api_version = ""
             retval.extend(
                 [
                     f"self.{og.property_name} = {og.class_name}(",
-                    f"    self._client, self._config, self._serialize, self._deserialize{api_version}",
+                    "    self._client, self._config, self._serialize, self._deserialize",
                     ")",
                 ]
             )

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

@@ -23,7 +23,7 @@ VERSION_MAP = {
     "msrest": "0.7.1",
     "isodate": "0.6.1",
     "azure-mgmt-core": "1.6.0",
-    "azure-core": "1.36.0",
+    "azure-core": "1.37.0",
     "typing-extensions": "4.6.0",
     "corehttp": "1.0.0b6",
 }

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

@@ -285,6 +285,9 @@ class DpgModelSerializer(_ModelSerializer):
                 file_import.add_submodule_import("typing", "overload", ImportType.STDLIB)
                 file_import.add_submodule_import("typing", "Mapping", ImportType.STDLIB)
                 file_import.add_submodule_import("typing", "Any", ImportType.STDLIB)
+        # if there is a property named `list` we have to make sure there's no conflict with the built-in `list`
+        if self.code_model.has_property_named_list:
+            file_import.define_mypy_type("List", "list")
         return file_import
 
     def declare_model(self, model: ModelType) -> str:

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

@@ -1,5 +1,7 @@
 
-class {{ enum.name }}({{ enum.value_type.type_annotation(is_operation_file=False) }}, Enum, metaclass=CaseInsensitiveEnumMeta):
+class {{ enum.name }}({{enum.pylint_disable()}}
+  {{ enum.value_type.type_annotation(is_operation_file=False) }}, Enum, metaclass=CaseInsensitiveEnumMeta
+):
     {% if enum.yaml_data.get("description") %}
     """{{ op_tools.wrap_string(enum.yaml_data["description"], "\n    ") }}
     """

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

@@ -36,6 +36,7 @@ __all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"]
 
 TZ_UTC = timezone.utc
 _T = typing.TypeVar("_T")
+_NONE_TYPE = type(None)
 
 {% if code_model.has_external_type %}
 TYPE_HANDLER_REGISTRY = TypeHandlerRegistry()
@@ -223,7 +224,7 @@ def _deserialize_datetime(attr: typing.Union[str, datetime]) -> datetime:
     test_utc = date_obj.utctimetuple()
     if test_utc.tm_year > 9999 or test_utc.tm_year < 1:
         raise OverflowError("Hit max or min date")
-    return date_obj
+    return date_obj  # type: ignore[no-any-return]
 
 
 def _deserialize_datetime_rfc7231(attr: typing.Union[str, datetime]) -> datetime:
@@ -277,7 +278,7 @@ def _deserialize_time(attr: typing.Union[str, time]) -> time:
     """
     if isinstance(attr, time):
         return attr
-    return isodate.parse_time(attr)
+    return isodate.parse_time(attr)  # type: ignore[no-any-return]
 
 
 def _deserialize_bytes(attr):
@@ -916,16 +917,16 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=too-many-retur
 
     # is it optional?
     try:
-        if any(a for a in annotation.__args__ if a == type(None)):  # pyright: ignore
+        if any(a is _NONE_TYPE for a in annotation.__args__):  # pyright: ignore
             if len(annotation.__args__) <= 2:  # pyright: ignore
                 if_obj_deserializer = _get_deserialize_callable_from_annotation(
-                    next(a for a in annotation.__args__ if a != type(None)), module, rf  # pyright: ignore
+                    next(a for a in annotation.__args__ if a is not _NONE_TYPE), module, rf  # pyright: ignore
                 )
 
                 return functools.partial(_deserialize_with_optional, if_obj_deserializer)
             # the type is Optional[Union[...]], we need to remove the None type from the Union
             annotation_copy = copy.copy(annotation)
-            annotation_copy.__args__ = [a for a in annotation_copy.__args__ if a != type(None)]  # pyright: ignore
+            annotation_copy.__args__ = [a for a in annotation_copy.__args__ if a is not _NONE_TYPE]  # pyright: ignore
             return _get_deserialize_callable_from_annotation(annotation_copy, module, rf)
     except AttributeError:
         pass
@@ -1327,7 +1328,7 @@ def _get_wrapped_element(
         _get_element(v, exclude_readonly, meta, wrapped_element)
     else:
         wrapped_element.text = _get_primitive_type_value(v)
-    return wrapped_element
+    return wrapped_element  # type: ignore[no-any-return]
 
 
 def _get_primitive_type_value(v) -> str:
@@ -1340,7 +1341,9 @@ def _get_primitive_type_value(v) -> str:
     return str(v)
 
 
-def _create_xml_element(tag, prefix=None, ns=None):
+def _create_xml_element(
+  tag: typing.Any, prefix: typing.Optional[str] = None, ns: typing.Optional[str] = None
+) -> ET.Element:
     if prefix and ns:
         ET.register_namespace(prefix, ns)
     if ns:

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

@@ -491,6 +491,10 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
     def has_operation_named_list(self) -> bool:
         return any(o.name.lower() == "list" for c in self.clients for og in c.operation_groups for o in og.operations)
 
+    @property
+    def has_property_named_list(self) -> bool:
+        return any(p.client_name.lower() == "list" for m in self.model_types for p in m.properties)
+
     @property
     def has_padded_model_property(self) -> bool:
         for model_type in self.model_types:

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

@@ -7,7 +7,8 @@ from typing import Any, TYPE_CHECKING, Optional, cast
 
 from .base import BaseType
 from .imports import FileImport, ImportType, TypingSection
-from .utils import NamespaceType
+from .utils import NamespaceType, add_to_pylint_disable
+from ...utils import NAME_LENGTH_LIMIT
 
 
 if TYPE_CHECKING:
@@ -189,6 +190,12 @@ class EnumType(BaseType):
             return f"Union[{self.value_type.type_annotation(**kwargs)}, {model_name}]"
         return self.value_type.type_annotation(**kwargs)
 
+    def pylint_disable(self) -> str:
+        retval: str = ""
+        if len(self.name) > NAME_LENGTH_LIMIT:
+            retval = add_to_pylint_disable(retval, "name-too-long")
+        return retval
+
     def get_declaration(self, value: Any) -> str:
         return self.value_type.get_declaration(value)
 

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

@@ -41,8 +41,12 @@ class ListType(BaseType):
             # this means we're version tolerant XML, we just return the XML element
             return self.element_type.type_annotation(**kwargs)
 
-        # if there is a function named `list` we have to make sure there's no conflict with the built-in `list`
-        list_type = "List" if self.code_model.has_operation_named_list and kwargs.get("is_operation_file") else "list"
+        # if there is a function/property named `list` we have to make sure there's no conflict with the built-in `list`
+        is_operation_file = kwargs.get("is_operation_file", False)
+        use_list_import = (self.code_model.has_operation_named_list and is_operation_file) or (
+            self.code_model.has_property_named_list and not is_operation_file
+        )
+        list_type = "List" if use_list_import else "list"
         return f"{list_type}[{self.element_type.type_annotation(**kwargs)}]"
 
     def description(self, *, is_operation_file: bool) -> str:

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

@@ -7,7 +7,7 @@ from enum import Enum
 from collections import OrderedDict
 from typing import Any, Optional, TYPE_CHECKING, cast
 import sys
-from .utils import add_to_pylint_disable, NamespaceType
+from .utils import add_to_pylint_disable, NamespaceType, LOCALS_LENGTH_LIMIT
 from .base import BaseType
 from .constant_type import ConstantType
 from .property import Property
@@ -244,7 +244,7 @@ class ModelType(BaseType):  # pylint: disable=too-many-instance-attributes, too-
     @property
     def init_pylint_disable(self) -> str:
         retval: str = ""
-        if len(self.properties) > 23:
+        if len(self.properties) > LOCALS_LENGTH_LIMIT:
             retval = add_to_pylint_disable(retval, "too-many-locals")
         return retval
 

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

@@ -16,7 +16,7 @@ from typing import (
 
 from .request_builder_parameter import RequestBuilderParameter
 
-from .utils import OrderedSet, add_to_pylint_disable
+from .utils import OrderedSet, add_to_pylint_disable, LOCALS_LENGTH_LIMIT, OPERATION_BODY_VARIABLES_LENGTH
 from .base_builder import BaseBuilder
 from .imports import FileImport, ImportType, TypingSection
 from .response import (
@@ -143,6 +143,12 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
             retval = add_to_pylint_disable(retval, "inconsistent-return-statements")
         if len(self.name) > NAME_LENGTH_LIMIT:
             retval = add_to_pylint_disable(retval, "name-too-long")
+        method_params = self.parameters.method
+        if self.is_overload and len(method_params) > LOCALS_LENGTH_LIMIT:
+            retval = add_to_pylint_disable(retval, "too-many-locals")
+        elif not self.is_overload and len(method_params) > (LOCALS_LENGTH_LIMIT - OPERATION_BODY_VARIABLES_LENGTH):
+            retval = add_to_pylint_disable(retval, "too-many-locals")
+
         return retval
 
     def cls_type_annotation(self, *, async_mode: bool, **kwargs: Any) -> str:
@@ -408,6 +414,9 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
         file_import.merge(self.get_request_builder_import(self.request_builder, async_mode, serialize_namespace))
         if self.overloads:
             file_import.add_submodule_import("typing", "overload", ImportType.STDLIB)
+            for overload in self.overloads:
+                if overload.parameters.has_body:
+                    file_import.merge(overload.parameters.body_parameter.type.imports(**kwargs))
         if self.code_model.options["models-mode"] == "dpg":
             relative_path = self.code_model.get_relative_import_path(
                 serialize_namespace, module_name="_utils.model_base"

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

@@ -93,7 +93,9 @@ class OperationGroup(BaseModel):
     @property
     def need_validation(self) -> bool:
         """Whether any of its operations need validation"""
-        return any(o for o in self.operations if o.need_validation)
+        return any(o for o in self.operations if o.need_validation) or any(
+            og for og in self.operation_groups if og.need_validation
+        )
 
     def imports(self, async_mode: bool, **kwargs: Any) -> FileImport:
         file_import = FileImport(self.code_model)

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

@@ -16,11 +16,12 @@ from typing import (
 from abc import abstractmethod
 
 from .base_builder import BaseBuilder
-from .utils import add_to_pylint_disable
+from .utils import add_to_pylint_disable, LOCALS_LENGTH_LIMIT, REQUEST_BUILDER_BODY_VARIABLES_LENGTH
 from .parameter_list import (
     RequestBuilderParameterList,
     OverloadedRequestBuilderParameterList,
 )
+from .parameter import ParameterLocation
 from .imports import FileImport, ImportType, TypingSection, MsrestImportType
 from ...utils import NAME_LENGTH_LIMIT
 
@@ -67,9 +68,25 @@ class RequestBuilderBase(BaseBuilder[ParameterListType, Sequence["RequestBuilder
         return self.yaml_data.get("discriminator") in ("lro", "lropaging")
 
     def pylint_disable(self, async_mode: bool) -> str:
+        retval = ""
         if len(self.name) > NAME_LENGTH_LIMIT:
-            return add_to_pylint_disable("", "name-too-long")
-        return ""
+            retval = add_to_pylint_disable(retval, "name-too-long")
+        method_params = self.parameters.method
+        if len(method_params) > LOCALS_LENGTH_LIMIT - REQUEST_BUILDER_BODY_VARIABLES_LENGTH:
+            retval = add_to_pylint_disable(retval, "too-many-locals")
+        if (
+            len(
+                [
+                    p
+                    for p in method_params
+                    if p.optional and p.location in [ParameterLocation.HEADER, ParameterLocation.QUERY]
+                ]
+            )
+            > LOCALS_LENGTH_LIMIT
+        ):
+            retval = add_to_pylint_disable(retval, "too-many-statements")
+            retval = add_to_pylint_disable(retval, "too-many-branches")
+        return retval
 
     def response_type_annotation(self, **kwargs) -> str:
         return "HttpRequest"

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

@@ -233,7 +233,7 @@ class LROResponse(Response):
 
     def get_no_polling_method(self, async_mode: bool) -> str:
         """Get the default no polling method"""
-        return self.get_no_polling_method_path(async_mode).split(".")[-1]
+        return self.get_no_polling_method_path(async_mode).rsplit(".", maxsplit=1)[-1]
 
     @staticmethod
     def get_base_polling_method_path(async_mode: bool) -> str:
@@ -242,7 +242,7 @@ class LROResponse(Response):
 
     def get_base_polling_method(self, async_mode: bool) -> str:
         """Get the base polling method."""
-        return self.get_base_polling_method_path(async_mode).split(".")[-1]
+        return self.get_base_polling_method_path(async_mode).rsplit(".", maxsplit=1)[-1]
 
     def type_annotation(self, **kwargs: Any) -> str:
         return f"{self.get_poller(kwargs.get('async_mode', False))}[{super().type_annotation(**kwargs)}]"

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

@@ -30,3 +30,10 @@ class NamespaceType(str, Enum):
     OPERATION = "operation"
     CLIENT = "client"
     TYPES_FILE = "types_file"
+
+
+LOCALS_LENGTH_LIMIT = 25
+
+REQUEST_BUILDER_BODY_VARIABLES_LENGTH = 6  # how many body variables are present in a request builder
+
+OPERATION_BODY_VARIABLES_LENGTH = 14  # how many body variables are present in an operation

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

@@ -781,8 +781,14 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
         client_names = [
             overload.request_builder.parameters.body_parameter.client_name for overload in builder.overloads
         ]
-        for v in sorted(set(client_names), key=client_names.index):
-            retval.append(f"_{v} = None")
+        all_dpg_model_overloads = False
+        if self.code_model.options["models-mode"] == "dpg" and builder.overloads:
+            all_dpg_model_overloads = all(
+                isinstance(o.parameters.body_parameter.type, DPGModelType) for o in builder.overloads
+            )
+        if not all_dpg_model_overloads:
+            for v in sorted(set(client_names), key=client_names.index):
+                retval.append(f"_{v} = None")
         try:
             # if there is a binary overload, we do a binary check first.
             binary_overload = cast(
@@ -808,17 +814,20 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                     f'"{other_overload.parameters.body_parameter.default_content_type}"{check_body_suffix}'
                 )
         except StopIteration:
-            for idx, overload in enumerate(builder.overloads):
-                if_statement = "if" if idx == 0 else "elif"
-                body_param = overload.parameters.body_parameter
-                retval.append(
-                    f"{if_statement} {body_param.type.instance_check_template.format(body_param.client_name)}:"
-                )
-                if body_param.default_content_type and not same_content_type:
+            if all_dpg_model_overloads:
+                retval.extend(f"{l}" for l in self._create_body_parameter(cast(OperationType, builder.overloads[0])))
+            else:
+                for idx, overload in enumerate(builder.overloads):
+                    if_statement = "if" if idx == 0 else "elif"
+                    body_param = overload.parameters.body_parameter
                     retval.append(
-                        f'    content_type = content_type or "{body_param.default_content_type}"{check_body_suffix}'
+                        f"{if_statement} {body_param.type.instance_check_template.format(body_param.client_name)}:"
                     )
-                retval.extend(f"    {l}" for l in self._create_body_parameter(cast(OperationType, overload)))
+                    if body_param.default_content_type and not same_content_type:
+                        retval.append(
+                            f'    content_type = content_type or "{body_param.default_content_type}"{check_body_suffix}'
+                        )
+                    retval.extend(f"    {l}" for l in self._create_body_parameter(cast(OperationType, overload)))
         return retval
 
     def _create_request_builder_call(

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

@@ -182,11 +182,10 @@ class ClientSerializer:
             retval.append("self._serialize.client_side_validation = False")
         operation_groups = [og for og in self.client.operation_groups if not og.is_mixin]
         for og in operation_groups:
-            api_version = ""
             retval.extend(
                 [
                     f"self.{og.property_name} = {og.class_name}(",
-                    f"    self._client, self._config, self._serialize, self._deserialize{api_version}",
+                    "    self._client, self._config, self._serialize, self._deserialize",
                     ")",
                 ]
             )

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

@@ -23,7 +23,7 @@ VERSION_MAP = {
     "msrest": "0.7.1",
     "isodate": "0.6.1",
     "azure-mgmt-core": "1.6.0",
-    "azure-core": "1.36.0",
+    "azure-core": "1.37.0",
     "typing-extensions": "4.6.0",
     "corehttp": "1.0.0b6",
 }

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

@@ -285,6 +285,9 @@ class DpgModelSerializer(_ModelSerializer):
                 file_import.add_submodule_import("typing", "overload", ImportType.STDLIB)
                 file_import.add_submodule_import("typing", "Mapping", ImportType.STDLIB)
                 file_import.add_submodule_import("typing", "Any", ImportType.STDLIB)
+        # if there is a property named `list` we have to make sure there's no conflict with the built-in `list`
+        if self.code_model.has_property_named_list:
+            file_import.define_mypy_type("List", "list")
         return file_import
 
     def declare_model(self, model: ModelType) -> str:

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

@@ -1,5 +1,7 @@
 
-class {{ enum.name }}({{ enum.value_type.type_annotation(is_operation_file=False) }}, Enum, metaclass=CaseInsensitiveEnumMeta):
+class {{ enum.name }}({{enum.pylint_disable()}}
+  {{ enum.value_type.type_annotation(is_operation_file=False) }}, Enum, metaclass=CaseInsensitiveEnumMeta
+):
     {% if enum.yaml_data.get("description") %}
     """{{ op_tools.wrap_string(enum.yaml_data["description"], "\n    ") }}
     """

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

@@ -36,6 +36,7 @@ __all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"]
 
 TZ_UTC = timezone.utc
 _T = typing.TypeVar("_T")
+_NONE_TYPE = type(None)
 
 {% if code_model.has_external_type %}
 TYPE_HANDLER_REGISTRY = TypeHandlerRegistry()
@@ -223,7 +224,7 @@ def _deserialize_datetime(attr: typing.Union[str, datetime]) -> datetime:
     test_utc = date_obj.utctimetuple()
     if test_utc.tm_year > 9999 or test_utc.tm_year < 1:
         raise OverflowError("Hit max or min date")
-    return date_obj
+    return date_obj  # type: ignore[no-any-return]
 
 
 def _deserialize_datetime_rfc7231(attr: typing.Union[str, datetime]) -> datetime:
@@ -277,7 +278,7 @@ def _deserialize_time(attr: typing.Union[str, time]) -> time:
     """
     if isinstance(attr, time):
         return attr
-    return isodate.parse_time(attr)
+    return isodate.parse_time(attr)  # type: ignore[no-any-return]
 
 
 def _deserialize_bytes(attr):
@@ -916,16 +917,16 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=too-many-retur
 
     # is it optional?
     try:
-        if any(a for a in annotation.__args__ if a == type(None)):  # pyright: ignore
+        if any(a is _NONE_TYPE for a in annotation.__args__):  # pyright: ignore
             if len(annotation.__args__) <= 2:  # pyright: ignore
                 if_obj_deserializer = _get_deserialize_callable_from_annotation(
-                    next(a for a in annotation.__args__ if a != type(None)), module, rf  # pyright: ignore
+                    next(a for a in annotation.__args__ if a is not _NONE_TYPE), module, rf  # pyright: ignore
                 )
 
                 return functools.partial(_deserialize_with_optional, if_obj_deserializer)
             # the type is Optional[Union[...]], we need to remove the None type from the Union
             annotation_copy = copy.copy(annotation)
-            annotation_copy.__args__ = [a for a in annotation_copy.__args__ if a != type(None)]  # pyright: ignore
+            annotation_copy.__args__ = [a for a in annotation_copy.__args__ if a is not _NONE_TYPE]  # pyright: ignore
             return _get_deserialize_callable_from_annotation(annotation_copy, module, rf)
     except AttributeError:
         pass
@@ -1327,7 +1328,7 @@ def _get_wrapped_element(
         _get_element(v, exclude_readonly, meta, wrapped_element)
     else:
         wrapped_element.text = _get_primitive_type_value(v)
-    return wrapped_element
+    return wrapped_element  # type: ignore[no-any-return]
 
 
 def _get_primitive_type_value(v) -> str:
@@ -1340,7 +1341,9 @@ def _get_primitive_type_value(v) -> str:
     return str(v)
 
 
-def _create_xml_element(tag, prefix=None, ns=None):
+def _create_xml_element(
+  tag: typing.Any, prefix: typing.Optional[str] = None, ns: typing.Optional[str] = None
+) -> ET.Element:
     if prefix and ns:
         ET.register_namespace(prefix, ns)
     if ns:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.45.1",
+  "version": "6.46.0",
   "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.23.1",
+    "@typespec/http-client-python": "~0.24.0",
     "@autorest/system-requirements": "~1.0.2",
     "fs-extra": "~11.2.0",
     "tsx": "~4.19.1"