@autorest/python 6.22.0 → 6.24.0

package/generator/dev_requirements.txt

@@ -1,5 +1,13 @@
 -e ./generator
--r ../../../eng/requirements.txt
--r ../../../eng/dev_requirements.txt
+pyright==1.1.375
+pylint==3.2.6
+tox==4.16.0
+mypy==1.10.1
+azure-pylint-guidelines-checker==0.0.8
+colorama==0.4.6
+debugpy==1.8.2
+pytest==8.3.2
+coverage==7.6.1
+black==24.8.0
 ptvsd==4.3.2
 types-PyYAML==6.0.12.8

package/generator/pygen/black.py

@@ -60,6 +60,8 @@ class BlackScriptPlugin(Plugin):
             _LOGGER.error("Error: failed to format %s", file)
             raise
         else:
+            if len(file_content.splitlines()) > 1000:
+                file_content = "# pylint: disable=too-many-lines\n" + file_content
             self.write_file(file, file_content)
 
 

package/generator/pygen/codegen/_utils.py

@@ -14,3 +14,4 @@ DEFAULT_HEADER_TEXT = (
 SWAGGER_PACKAGE_MODE = ["mgmtplane", "dataplane"]  # for backward compatibility
 TYPESPEC_PACKAGE_MODE = ["azure-mgmt", "azure-dataplane", "generic"]
 VALID_PACKAGE_MODE = SWAGGER_PACKAGE_MODE + TYPESPEC_PACKAGE_MODE
+NAME_LENGTH_LIMIT = 40

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

@@ -91,8 +91,7 @@ class BaseBuilder(
             return None
         return self._summary
 
-    @property
-    def pylint_disable(self) -> str:
+    def pylint_disable(self, async_mode: bool) -> str:  # pylint: disable=unused-argument
         return ""
 
     @abstractmethod

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

@@ -8,7 +8,7 @@ from typing import Any, Dict, TYPE_CHECKING, TypeVar, Generic, Union, List, Opti
 from .base import BaseModel
 from .parameter_list import ClientGlobalParameterList, ConfigGlobalParameterList
 from .imports import FileImport, ImportType, TypingSection, MsrestImportType
-from .utils import add_to_pylint_disable, NAME_LENGTH_LIMIT
+from .utils import add_to_pylint_disable
 from .operation_group import OperationGroup
 from .request_builder import (
     RequestBuilder,
@@ -18,7 +18,7 @@ from .request_builder import (
 from .parameter import Parameter, ParameterMethodLocation
 from .lro_operation import LROOperation
 from .lro_paging_operation import LROPagingOperation
-from ...utils import extract_original_name
+from ...utils import extract_original_name, NAME_LENGTH_LIMIT
 
 ParameterListType = TypeVar(
     "ParameterListType",
@@ -145,9 +145,15 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
         """Whether the base url is parameterized or not"""
         return not any(p for p in self.parameters if p.is_host)
 
-    @property
     def pylint_disable(self) -> str:
-        retval = add_to_pylint_disable("", "client-accepts-api-version-keyword")
+        retval = ""
+        if not any(
+            p
+            for p in self.parameters.parameters
+            if p.is_api_version
+            and p.method_location in [ParameterMethodLocation.KEYWORD_ONLY, ParameterMethodLocation.KWARG]
+        ):
+            retval = add_to_pylint_disable(retval, "client-accepts-api-version-keyword")
         if len(self.operation_groups) > 6:
             retval = add_to_pylint_disable(retval, "too-many-instance-attributes")
         if len(self.name) > NAME_LENGTH_LIMIT:
@@ -347,10 +353,9 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
 class Config(_ClientConfigBase[ConfigGlobalParameterList]):
     """Model representing our Config type."""
 
-    @property
     def pylint_disable(self) -> str:
         retval = add_to_pylint_disable("", "too-many-instance-attributes")
-        if len(self.name) + len("Configuration") > NAME_LENGTH_LIMIT:
+        if len(self.name) > NAME_LENGTH_LIMIT:
             retval = add_to_pylint_disable(retval, "name-too-long")
         return retval
 

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

@@ -19,7 +19,7 @@ class ImportType(str, Enum):
     THIRDPARTY = "thirdparty"
     SDKCORE = "sdkcore"
     LOCAL = "local"
-    BYVERSION = "by_version"
+    BY_VERSION = "by_version"
 
 
 class TypingSection(str, Enum):
@@ -171,7 +171,7 @@ class FileImport:
         self.add_submodule_import(
             "typing",
             "MutableMapping",
-            ImportType.BYVERSION,
+            ImportType.BY_VERSION,
             TypingSection.REGULAR,
             None,
             (((3, 9), "collections.abc", None),),

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

@@ -93,7 +93,7 @@ class LROOperationBase(OperationBase[LROResponseType]):
         return "None"
 
     def cls_type_annotation(self, *, async_mode: bool) -> str:
-        """We don't want the poller to show up in ClsType, so we call super() on resposne type annotation"""
+        """We don't want the poller to show up in ClsType, so we call super() on response type annotation"""
         return f"ClsType[{Response.type_annotation(self.responses[0], async_mode=async_mode)}]"
 
     def get_poller_with_response_type(self, async_mode: bool) -> str:

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

@@ -7,14 +7,12 @@ from enum import Enum
 from collections import OrderedDict
 from typing import Any, Dict, List, Optional, TYPE_CHECKING, cast
 import sys
-from .utils import (
-    add_to_pylint_disable,
-    NAME_LENGTH_LIMIT,
-)
+from .utils import add_to_pylint_disable
 from .base import BaseType
 from .constant_type import ConstantType
 from .property import Property
 from .imports import FileImport, ImportType, TypingSection
+from ...utils import NAME_LENGTH_LIMIT
 
 if sys.version_info >= (3, 8):
     from typing import Literal
@@ -236,7 +234,6 @@ class ModelType(BaseType):  # pylint: disable=too-many-instance-attributes, too-
         except StopIteration:
             return None
 
-    @property
     def pylint_disable(self) -> str:
         retval: str = ""
         if len(self.properties) > 10:

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

@@ -19,7 +19,7 @@ from typing import (
 
 from .request_builder_parameter import RequestBuilderParameter
 
-from .utils import OrderedSet, add_to_pylint_disable, NAME_LENGTH_LIMIT
+from .utils import OrderedSet, add_to_pylint_disable
 from .base_builder import BaseBuilder
 from .imports import FileImport, ImportType, TypingSection
 from .response import (
@@ -38,7 +38,7 @@ from .parameter_list import ParameterList
 from .model_type import ModelType
 from .base import BaseType
 from .request_builder import OverloadedRequestBuilder, RequestBuilder
-from ...utils import xml_serializable, json_serializable
+from ...utils import xml_serializable, json_serializable, NAME_LENGTH_LIMIT
 
 if TYPE_CHECKING:
     from .code_model import CodeModel
@@ -137,10 +137,9 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
             return self.responses[0].type_annotation(**kwargs)
         return "None"
 
-    @property
-    def pylint_disable(self) -> str:
+    def pylint_disable(self, async_mode: bool) -> str:
         retval: str = ""
-        if self.response_type_annotation(async_mode=False) == "None":
+        if not async_mode and not self.is_overload and self.response_type_annotation(async_mode=False) == "None":
             # doesn't matter if it's async or not
             retval = add_to_pylint_disable(retval, "inconsistent-return-statements")
         try:
@@ -204,9 +203,9 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
         default_exceptions = [e for e in self.exceptions if "default" in e.status_codes and e.type]
         if not default_exceptions:
             return None
-        excep_schema = default_exceptions[0].type
-        if isinstance(excep_schema, ModelType):
-            return excep_schema.type_annotation(skip_quote=True)
+        exception_schema = default_exceptions[0].type
+        if isinstance(exception_schema, ModelType):
+            return exception_schema.type_annotation(skip_quote=True)
         # in this case, it's just an AnyType
         return "'object'"
 
@@ -350,11 +349,12 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
             file_import.add_submodule_import("exceptions", error, ImportType.SDKCORE)
         if self.code_model.options["azure_arm"]:
             file_import.add_submodule_import("azure.mgmt.core.exceptions", "ARMErrorFormat", ImportType.SDKCORE)
-        file_import.add_submodule_import(
-            "typing",
-            "Type",
-            ImportType.STDLIB,
-        )
+        if self.non_default_errors:
+            file_import.add_submodule_import(
+                "typing",
+                "Type",
+                ImportType.STDLIB,
+            )
         file_import.add_mutable_mapping_import()
         if self.non_default_error_status_codes:
             file_import.add_submodule_import(

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

@@ -10,9 +10,10 @@ from .utils import OrderedSet
 from .base import BaseModel
 from .operation import get_operation
 from .imports import FileImport, ImportType, TypingSection
-from .utils import add_to_pylint_disable, NAME_LENGTH_LIMIT
+from .utils import add_to_pylint_disable
 from .lro_operation import LROOperation
 from .lro_paging_operation import LROPagingOperation
+from ...utils import NAME_LENGTH_LIMIT
 
 if TYPE_CHECKING:
     from .code_model import CodeModel
@@ -76,7 +77,6 @@ class OperationGroup(BaseModel):
             file_import.add_submodule_import(relative_path, "models", ImportType.LOCAL, alias="_models")
         return file_import
 
-    @property
     def pylint_disable(self) -> str:
         retval: str = ""
         if self.has_abstract_operations:

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

@@ -142,12 +142,12 @@ class _ParameterBase(BaseModel, abc.ABC):  # pylint: disable=too-many-instance-a
         kwargs["is_operation_file"] = True
         # special logic for api-version parameter
         if self.is_api_version:
-            type_annot = "str"
+            type_annotation = "str"
         else:
-            type_annot = self.type.type_annotation(**kwargs)
+            type_annotation = self.type.type_annotation(**kwargs)
         if self.optional and self.client_default_value is None:
-            return f"Optional[{type_annot}]"
-        return type_annot
+            return f"Optional[{type_annotation}]"
+        return type_annotation
 
     def docstring_text(self, **kwargs: Any) -> str:
         return self.type.docstring_text(**kwargs)
@@ -213,12 +213,12 @@ class _ParameterBase(BaseModel, abc.ABC):  # pylint: disable=too-many-instance-a
     def in_method_signature(self) -> bool: ...
 
     def method_signature(self, async_mode: bool) -> str:
-        type_annot = self.type_annotation(async_mode=async_mode)
+        type_annotation = self.type_annotation(async_mode=async_mode)
         if self.client_default_value is not None or self.optional:
-            return f"{self.client_name}: {type_annot} = {self.client_default_value_declaration},"
+            return f"{self.client_name}: {type_annotation} = {self.client_default_value_declaration},"
         if self.default_to_unset_sentinel:
-            return f"{self.client_name}: {type_annot} = _Unset,"
-        return f"{self.client_name}: {type_annot},"
+            return f"{self.client_name}: {type_annotation} = _Unset,"
+        return f"{self.client_name}: {type_annotation},"
 
 
 class BodyParameter(_ParameterBase):
@@ -306,7 +306,7 @@ class Parameter(_ParameterBase):
 
         self.skip_url_encoding: bool = self.yaml_data.get("skipUrlEncoding", False)
         self.explode: bool = self.yaml_data.get("explode", False)
-        self.in_overriden: bool = self.yaml_data.get("inOverriden", False)
+        self.in_overridden: bool = self.yaml_data.get("inOverridden", False)
         self.delimiter: Optional[ParameterDelimeter] = self.yaml_data.get("delimiter")
         self._default_to_unset_sentinel: bool = False
 

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

@@ -40,7 +40,6 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
         self.is_multipart_file_input: bool = yaml_data.get("isMultipartFileInput", False)
         self.flatten = self.yaml_data.get("flatten", False) and not getattr(self.type, "flattened_property", False)
 
-    @property
     def pylint_disable(self) -> str:
         retval: str = ""
         if self.yaml_data.get("pylintDisable"):

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

@@ -16,12 +16,13 @@ from typing import (
 from abc import abstractmethod
 
 from .base_builder import BaseBuilder
-from .utils import add_to_pylint_disable, NAME_LENGTH_LIMIT
+from .utils import add_to_pylint_disable
 from .parameter_list import (
     RequestBuilderParameterList,
     OverloadedRequestBuilderParameterList,
 )
 from .imports import FileImport, ImportType, TypingSection, MsrestImportType
+from ...utils import NAME_LENGTH_LIMIT
 
 if TYPE_CHECKING:
     from .code_model import CodeModel
@@ -65,8 +66,7 @@ class RequestBuilderBase(BaseBuilder[ParameterListType, List["RequestBuilder"]])
     def is_lro(self) -> bool:
         return self.yaml_data.get("discriminator") in ("lro", "lropaging")
 
-    @property
-    def pylint_disable(self) -> str:
+    def pylint_disable(self, async_mode: bool) -> str:
         if len(self.name) > NAME_LENGTH_LIMIT:
             return add_to_pylint_disable("", "name-too-long")
         return ""

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

@@ -100,7 +100,7 @@ class RequestBuilderParameter(Parameter):
         super_method_location = super().method_location
         if super_method_location == ParameterMethodLocation.KWARG:
             return super_method_location
-        if self.in_overriden and super_method_location == ParameterMethodLocation.KEYWORD_ONLY:
+        if self.in_overridden and super_method_location == ParameterMethodLocation.KEYWORD_ONLY:
             return ParameterMethodLocation.KWARG
         if self.location != ParameterLocation.PATH:
             return ParameterMethodLocation.KEYWORD_ONLY

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

@@ -97,10 +97,10 @@ class Response(BaseModel):
     def type_annotation(self, **kwargs: Any) -> str:
         if self.type:
             kwargs["is_operation_file"] = True
-            type_annot = self.type.type_annotation(**kwargs)
+            type_annotation = self.type.type_annotation(**kwargs)
             if self.nullable:
-                return f"Optional[{type_annot}]"
-            return type_annot
+                return f"Optional[{type_annotation}]"
+            return type_annotation
         return "None"
 
     def docstring_text(self, **kwargs: Any) -> str:

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

@@ -8,8 +8,6 @@ from typing import TypeVar, Dict
 T = TypeVar("T")
 OrderedSet = Dict[T, None]
 
-NAME_LENGTH_LIMIT = 40
-
 
 def add_to_description(description: str, entry: str) -> str:
     if description:

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

@@ -62,8 +62,8 @@ def _all_same(data: List[List[str]]) -> bool:
 
 
 def _need_type_ignore(builder: OperationType) -> bool:
-    for excep in builder.non_default_errors:
-        for status_code in excep.status_codes:
+    for e in builder.non_default_errors:
+        for status_code in e.status_codes:
             if status_code in (401, 404, 409, 304):
                 return True
     return False
@@ -187,24 +187,6 @@ def _get_json_response_template_to_status_codes(
     return retval
 
 
-def _api_version_validation(builder: OperationType) -> str:
-    if builder.is_overload:
-        return ""
-    retval: List[str] = []
-    if builder.added_on:
-        retval.append(f'    method_added_on="{builder.added_on}",')
-    params_added_on = defaultdict(list)
-    for parameter in builder.parameters:
-        if parameter.added_on:
-            params_added_on[parameter.added_on].append(parameter.client_name)
-    if params_added_on:
-        retval.append(f"    params_added_on={dict(params_added_on)},")
-    if retval:
-        retval_str = "\n".join(retval)
-        return f"@api_version_validation(\n{retval_str}\n){builder.pylint_disable}"
-    return ""
-
-
 def is_json_model_type(parameters: ParameterListType) -> bool:
     return (
         parameters.has_body
@@ -257,7 +239,7 @@ class _BuilderBaseSerializer(Generic[BuilderType]):
             method_name=builder.name,
             need_self_param=self._need_self_param,
             method_param_signatures=builder.method_signature(self.async_mode),
-            pylint_disable=builder.pylint_disable,
+            pylint_disable=builder.pylint_disable(self.async_mode),
         )
 
     def method_signature_and_response_type_annotation(
@@ -599,10 +581,27 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
     def decorators(self, builder: OperationType) -> List[str]:
         """Decorators for the method"""
         retval = super().decorators(builder)
-        if _api_version_validation(builder):
-            retval.append(_api_version_validation(builder))
+        if self._api_version_validation(builder):
+            retval.append(self._api_version_validation(builder))
         return retval
 
+    def _api_version_validation(self, builder: OperationType) -> str:
+        if builder.is_overload:
+            return ""
+        retval: List[str] = []
+        if builder.added_on:
+            retval.append(f'    method_added_on="{builder.added_on}",')
+        params_added_on = defaultdict(list)
+        for parameter in builder.parameters:
+            if parameter.added_on:
+                params_added_on[parameter.added_on].append(parameter.client_name)
+        if params_added_on:
+            retval.append(f"    params_added_on={dict(params_added_on)},")
+        if retval:
+            retval_str = "\n".join(retval)
+            return f"@api_version_validation(\n{retval_str}\n){builder.pylint_disable(self.async_mode)}"
+        return ""
+
     def pop_kwargs_from_signature(self, builder: OperationType) -> List[str]:
         kwargs_to_pop = builder.parameters.kwargs_to_pop
         kwargs = self.parameter_serializer.pop_kwargs_from_signature(
@@ -625,10 +624,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
             if p.hide_in_operation_signature:
                 kwargs.append(f'{p.client_name} = kwargs.pop("{p.client_name}", None)')
         cls_annotation = builder.cls_type_annotation(async_mode=self.async_mode)
-        pylint_disable = ""
-        if any(x.startswith("_") for x in cls_annotation.split(".")):
-            pylint_disable = "  # pylint: disable=protected-access"
-        kwargs.append(f"cls: {cls_annotation} = kwargs.pop({pylint_disable}\n    'cls', None\n)")
+        kwargs.append(f"cls: {cls_annotation} = kwargs.pop(\n    'cls', None\n)")
         return kwargs
 
     def response_docstring(self, builder: OperationType) -> List[str]:
@@ -883,7 +879,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
             # request builders don't allow grouped parameters, so we group them before making the call
             retval.extend(_serialize_grouped_body(builder))
         if builder.parameters.has_body and builder.parameters.body_parameter.flattened:
-            # unflatten before passing to request builder as well
+            # serialize flattened body before passing to request builder as well
             retval.extend(_serialize_flattened_body(builder.parameters.body_parameter))
         if is_json_model_type(builder.parameters):
             retval.extend(_serialize_json_model_body(builder.parameters.body_parameter, builder.parameters.parameters))
@@ -1089,9 +1085,7 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
         return retval
 
     def error_map(self, builder: OperationType) -> List[str]:
-        retval = [
-            "error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object"
-        ]
+        retval = ["error_map: MutableMapping = {"]
         if builder.non_default_errors:
             if not 401 in builder.non_default_error_status_codes:
                 retval.append("    401: ClientAuthenticationError,")
@@ -1101,17 +1095,17 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                 retval.append("    409: ResourceExistsError,")
             if not 304 in builder.non_default_error_status_codes:
                 retval.append("    304: ResourceNotModifiedError,")
-            for excep in builder.non_default_errors:
+            for e in builder.non_default_errors:
                 error_model_str = ""
-                if isinstance(excep.type, ModelType):
+                if isinstance(e.type, ModelType):
                     if self.code_model.options["models_mode"] == "msrest":
                         error_model_str = (
-                            f", model=self._deserialize(" f"_models.{excep.type.serialization_type}, response)"
+                            f", model=self._deserialize(" f"_models.{e.type.serialization_type}, response)"
                         )
                     elif self.code_model.options["models_mode"] == "dpg":
-                        error_model_str = f", model=_deserialize(_models.{excep.type.name}, response.json())"
+                        error_model_str = f", model=_deserialize(_models.{e.type.name}, response.json())"
                 error_format_str = ", error_format=ARMErrorFormat" if self.code_model.options["azure_arm"] else ""
-                for status_code in excep.status_codes:
+                for status_code in e.status_codes:
                     if status_code == 401:
                         retval.append(
                             "    401:  cast(Type[HttpResponseError], "
@@ -1196,8 +1190,8 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
             return ["@overload"]
         if self.code_model.options["tracing"] and builder.want_tracing:
             retval.append("@distributed_trace")
-        if _api_version_validation(builder):
-            retval.append(_api_version_validation(builder))
+        if self._api_version_validation(builder):
+            retval.append(self._api_version_validation(builder))
         return retval
 
     def call_next_link_request_builder(self, builder: PagingOperationType) -> List[str]:
@@ -1498,16 +1492,16 @@ def get_operation_serializer(
     LROOperationSerializer,
     LROPagingOperationSerializer,
 ]:
-    retcls: Union[
+    ret_cls: Union[
         Type[OperationSerializer],
         Type[PagingOperationSerializer],
         Type[LROOperationSerializer],
         Type[LROPagingOperationSerializer],
     ] = OperationSerializer
     if builder.operation_type == "lropaging":
-        retcls = LROPagingOperationSerializer
+        ret_cls = LROPagingOperationSerializer
     elif builder.operation_type == "lro":
-        retcls = LROOperationSerializer
+        ret_cls = LROOperationSerializer
     elif builder.operation_type == "paging":
-        retcls = PagingOperationSerializer
-    return retcls(code_model, async_mode)
+        ret_cls = PagingOperationSerializer
+    return ret_cls(code_model, async_mode)

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

@@ -43,13 +43,12 @@ class ClientSerializer:
             pop_params_kwarg=PopKwargType.NO,
         )
 
-    @property
     def class_definition(self) -> str:
         class_name = self.client.name
         base_class = ""
         if self.client.has_mixin:
             base_class = f"{class_name}OperationsMixin"
-        pylint_disable = self.client.pylint_disable
+        pylint_disable = self.client.pylint_disable()
         if base_class:
             return f"class {class_name}({base_class}):{pylint_disable}"
         return f"class {class_name}:{pylint_disable}"

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

@@ -42,8 +42,7 @@ def _serialize_versioned_package(i: ImportModel, delimiter: str) -> str:
         )
     buffer.append("else:")
     buffer.append(
-        f"    from {i.module_name} import {i.submodule_name}{f' as {i.alias}' if i.alias else ''}"
-        "  # type: ignore  # pylint: disable=ungrouped-imports"
+        f"    from {i.module_name} import {i.submodule_name}{f' as {i.alias}' if i.alias else ''}" "  # type: ignore"
     )
     return delimiter.join(buffer)
 
@@ -122,6 +121,6 @@ class FileImportSerializer:
             add_conditional_typing=False,
         )
         if typing_imports_list:
-            typing_imports += "\n\nif TYPE_CHECKING:\n    # pylint: disable=unused-import,ungrouped-imports\n    "
+            typing_imports += "\n\nif TYPE_CHECKING:\n    "
             typing_imports += "\n\n    ".join(_get_import_clauses(typing_imports_list, "\n    "))
         return regular_imports + typing_imports + self.get_typing_definitions()

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

@@ -66,10 +66,10 @@ class _ModelSerializer(BaseSerializer, ABC):
     @staticmethod
     def initialize_standard_property(prop: Property):
         if not (prop.optional or prop.client_default_value is not None):
-            return f"{prop.client_name}: {prop.type_annotation()},{prop.pylint_disable}"
+            return f"{prop.client_name}: {prop.type_annotation()},{prop.pylint_disable()}"
         return (
             f"{prop.client_name}: {prop.type_annotation()} = "
-            f"{prop.client_default_value_declaration},{prop.pylint_disable}"
+            f"{prop.client_default_value_declaration},{prop.pylint_disable()}"
         )
 
     @staticmethod
@@ -104,6 +104,23 @@ class _ModelSerializer(BaseSerializer, ABC):
         properties_to_pass_to_super.append("**kwargs")
         return ", ".join(properties_to_pass_to_super)
 
+    @abstractmethod
+    def initialize_properties(self, model: ModelType) -> List[str]: ...
+
+    def need_init(self, model: ModelType) -> bool:
+        return (not model.internal) and bool(self.init_line(model) or model.discriminator)
+
+    def pylint_disable(self, model: ModelType) -> str:
+        if model.flattened_property or self.initialize_properties(model):
+            return ""
+        if any(p for p in model.properties if p.is_discriminator and model.discriminator_value):
+            return ""
+        if model.parents and any(
+            "=" in prop for parent in model.parents for prop in self.init_line(parent) if self.need_init(parent)
+        ):
+            return ""
+        return "  # pylint: disable=useless-super-delegation"
+
 
 class MsrestModelSerializer(_ModelSerializer):
     def imports(self) -> FileImport:
@@ -128,7 +145,7 @@ class MsrestModelSerializer(_ModelSerializer):
         )
         if model.parents:
             basename = ", ".join([m.name for m in model.parents])
-        return f"class {model.name}({basename}):{model.pylint_disable}"
+        return f"class {model.name}({basename}):{model.pylint_disable()}"
 
     @staticmethod
     def get_properties_to_initialize(model: ModelType) -> List[Property]:
@@ -213,7 +230,7 @@ class DpgModelSerializer(_ModelSerializer):
             basename = ", ".join([m.name for m in model.parents])
         if model.discriminator_value:
             basename += f", discriminator='{model.discriminator_value}'"
-        return f"class {model.name}({basename}):{model.pylint_disable}"
+        return f"class {model.name}({basename}):{model.pylint_disable()}"
 
     @staticmethod
     def get_properties_to_declare(model: ModelType) -> List[Property]:

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

@@ -179,7 +179,7 @@ class ParameterSerializer:
         if pop_headers_kwarg != PopKwargType.NO or pop_params_kwarg != PopKwargType.NO:
             retval.append("")
         for kwarg in parameters:
-            type_annot = kwarg.type_annotation()
+            type_annotation = kwarg.type_annotation()
             if kwarg.client_default_value is not None or kwarg.optional:
                 if check_client_input and kwarg.check_client_input:
                     default_value = f"self._config.{kwarg.client_name}"
@@ -196,10 +196,10 @@ class ParameterSerializer:
                     default_value = f"_{kwarg_dict}.pop('{kwarg.wire_name}', {default_value})"
 
                 retval.append(
-                    f"{kwarg.client_name}: {type_annot} = kwargs.pop('{kwarg.client_name}', " + f"{default_value})"
+                    f"{kwarg.client_name}: {type_annotation} = kwargs.pop('{kwarg.client_name}', " + f"{default_value})"
                 )
             else:
-                retval.append(f"{kwarg.client_name}: {type_annot} = kwargs.pop('{kwarg.client_name}')")
+                retval.append(f"{kwarg.client_name}: {type_annotation} = kwargs.pop('{kwarg.client_name}')")
         return retval
 
     @staticmethod

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

@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
 # -------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for

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

@@ -1,4 +1,4 @@
-{{ serializer.class_definition }}
+{{ serializer.class_definition() }}
     """{{ op_tools.wrap_string(client.description, "\n") | indent }}
 
     {{ op_tools.serialize_with_wrap(serializer.property_descriptions(async_mode), "\n ") | indent }}

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

@@ -1,4 +1,4 @@
-class {{ client.name }}Configuration:  {{ client.config.pylint_disable }}
+class {{ client.name }}Configuration:  {{ client.config.pylint_disable() }}
     """Configuration for {{ client.name }}.
 
     Note that all parameters used to create this instance are saved as instance

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

@@ -7,7 +7,7 @@ from devtools_testutils import test_proxy, add_general_regex_sanitizer, add_body
 
 load_dotenv()
 
-# aovid record sensitive identity information in recordings
+# For security, please avoid record sensitive identity information in recordings
 @pytest.fixture(scope="session", autouse=True)
 def add_sanitizers(test_proxy):
     {% for test_name in test_names %}

package/generator/pygen/codegen/templates/macros.jinja2

@@ -1,6 +1,6 @@
 {% macro wrap_model_string(doc_string, wrap_string, suffix_string="") %}
-{% set orignal_result = doc_string | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrap_string) %}
-{% set list_result = orignal_result.split('\n') %}
+{% set original_result = doc_string | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrap_string) %}
+{% set list_result = original_result.split('\n') %}
 {% for line in list_result %}
     {% set suffix = suffix_string if list_result | length == loop.index %}
     {% if line | length > 120 %}

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

@@ -636,7 +636,7 @@ class Model(_MyMutableMapping):
         return mapped_cls._deserialize(data, exist_discriminators)
 
     def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]:
-        """Return a dict that can be JSONify using json.dump.
+        """Return a dict that can be turned into json using json.dump.
 
         :keyword bool exclude_readonly: Whether to remove the readonly properties.
         :returns: A dict JSON compatible object
@@ -732,8 +732,7 @@ def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.An
         key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"),
     )
 
-
-def _get_deserialize_callable_from_annotation(  # pylint: disable=R0911, R0915, R0912
+def _get_deserialize_callable_from_annotation(  # pylint: disable=too-many-return-statements, too-many-branches
     annotation: typing.Any,
     module: typing.Optional[str],
     rf: typing.Optional["_RestField"] = None,

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

@@ -1,6 +1,5 @@
 {% import 'operation_tools.jinja2' as op_tools %}
 # coding=utf-8
-# pylint: disable=too-many-lines
 {{ code_model.options['license_header'] }}
 
 {{ imports }}

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

@@ -50,8 +50,7 @@
     {% endif %}
 
 
-    {% set need_init = (not model.internal) and (serializer.init_line(model) or model.discriminator)%}
-    {% if need_init %}
+    {% if serializer.need_init(model) %}
     @overload
     def __init__({{ model.init_pylint_disable }}
         self,
@@ -70,7 +69,7 @@
 
     {% endif %}
     {% set initialize_properties = serializer.initialize_properties(model) %}
-    {% if need_init or initialize_properties %}
+    {% if serializer.need_init(model) or initialize_properties %}
     def __init__(self, *args: Any, **kwargs: Any) -> None:{{ '# pylint: disable=useless-super-delegation' if not initialize_properties else '' }}
         {% for line in serializer.super_call(model) %}
         {{ line }}

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

@@ -9,11 +9,11 @@
 {% endif %}
 {% endmacro %}
 {% if operation_group.base_class %}
-class {{ operation_group.class_name }}( {{ operation_group.pylint_disable }}
+class {{ operation_group.class_name }}( {{ operation_group.pylint_disable() }}
     {{ operation_group.base_class }}
 ):
 {% else %}
-class {{ operation_group.class_name }}: {{ operation_group.pylint_disable }}
+class {{ operation_group.class_name }}: {{ operation_group.pylint_disable() }}
 {% endif %}
 {% if not operation_group.is_mixin %}
     """
@@ -63,13 +63,13 @@ class {{ operation_group.class_name }}: {{ operation_group.pylint_disable }}
 {% set request_builder = operation.request_builder %}
 {% set operation_serializer = get_operation_serializer(operation) %}
     {% if operation.operation_type == "lropaging" %}
-    {%- macro someop() %}{% include "lro_paging_operation.py.jinja2" %}{% endmacro %}
+    {%- macro some_op() %}{% include "lro_paging_operation.py.jinja2" %}{% endmacro %}
     {% elif operation.operation_type == "lro" %}
-    {%- macro someop() %}{% include "lro_operation.py.jinja2" %}{% endmacro %}
+    {%- macro some_op() %}{% include "lro_operation.py.jinja2" %}{% endmacro %}
     {% elif operation.operation_type == "paging" %}
-    {% macro someop() %}{% include "paging_operation.py.jinja2" %}{% endmacro %}
+    {% macro some_op() %}{% include "paging_operation.py.jinja2" %}{% endmacro %}
     {% else %}
-    {% macro someop() %}{% include "operation.py.jinja2" %}{% endmacro %}
+    {% macro some_op() %}{% include "operation.py.jinja2" %}{% endmacro %}
     {% endif %}
-    {{ someop()|indent }}
+    {{ some_op()|indent }}
 {% endfor %}

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

@@ -1,7 +1,6 @@
 {% import 'operation_tools.jinja2' as op_tools %}
 {% set operations_description = "async operations" if async_mode else "operations" %}
 {% set return_none_type_annotation = " -> None" if async_mode else "" %}
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 {{ code_model.options['license_header'] }}
 {{ imports }}

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

@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
 # --------------------------------------------------------------------------
 #
 # Copyright (c) {{ code_model.options["company_name"] }} Corporation. All rights reserved.

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

@@ -1,5 +1,4 @@
 # coding=utf-8
-# pylint: disable=too-many-lines
 {{ code_model.options['license_header'] }}
 
 {{ imports }}

package/generator/pygen/preprocess/__init__.py

@@ -17,7 +17,13 @@ from .helpers import (
 from .python_mappings import CADL_RESERVED_WORDS, RESERVED_WORDS, PadType
 
 from .. import YamlUpdatePlugin
-from ..utils import parse_args, get_body_type_for_description, JSON_REGEXP, KNOWN_TYPES, update_enum_value
+from ..utils import (
+    parse_args,
+    get_body_type_for_description,
+    JSON_REGEXP,
+    KNOWN_TYPES,
+    update_enum_value,
+)
 
 
 def update_overload_section(
@@ -91,10 +97,10 @@ def add_overloads_for_body_param(yaml_data: Dict[str, Any]) -> None:
             yaml_data["overloads"].append(add_overload(yaml_data, body_type, for_flatten_params=True))
     content_type_param = next(p for p in yaml_data["parameters"] if p["wireName"].lower() == "content-type")
     content_type_param["inOverload"] = False
-    content_type_param["inOverriden"] = True
+    content_type_param["inOverridden"] = True
     content_type_param["inDocstring"] = True
     content_type_param["clientDefaultValue"] = (
-        None  # make it none bc it will be overriden, we depend on default of overloads
+        None  # make it none bc it will be overridden, we depend on default of overloads
     )
     content_type_param["optional"] = True
 

package/generator/pygen/preprocess/python_mappings.py

@@ -126,7 +126,7 @@ RESERVED_WORDS = {
         "connection_cert",
         "connection_data_block_size",
         "use_env_settings",
-        # the following aren't in the readme, but Xiang said these are also transport kwargs
+        # the following aren't in the readme, but @xiangyan99 said these are also transport kwargs
         "read_timeout",
         "proxies",
         "cookies",

package/generator/pygen/utils.py

@@ -158,3 +158,6 @@ def json_serializable(content_type: str) -> bool:
 
 def xml_serializable(content_type: str) -> bool:
     return bool(XML_REGEXP.match(content_type.split(";")[0].strip().lower()))
+
+
+NAME_LENGTH_LIMIT = 40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.22.0",
+  "version": "6.24.0",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {
@@ -24,10 +24,10 @@
     "tsx": "4.17.0"
   },
   "devDependencies": {
-    "@microsoft.azure/autorest.testserver": "^3.3.46",
-    "typescript": "~5.1.3",
+    "@microsoft.azure/autorest.testserver": "^3.3.50",
+    "@typespec/http-client-python": "0.2.0",
     "chalk": "5.3.0",
-    "@azure-tools/typespec-python": "^0.32.0"
+    "typescript": "~5.1.6"
   },
   "files": [
     "autorest/**/*.py",

package/scripts/copy-generator.ts

@@ -1,6 +1,5 @@
-import { copyFileSync, readdirSync } from "fs";
 import { existsSync, removeSync, copySync } from "fs-extra";
-import { join } from "path";
+import { join, win32, posix } from "path";
 
 const force: boolean = process.argv[2] === "--force";
 
@@ -12,13 +11,14 @@ function copyAndCreateDir(sourceDir: string, destDir: string) {
     }
 
     // Copy the source directory to the destination directory
-    copySync(sourceDir, destDir);
+    copySync(sourceDir, destDir, {
+        filter: (src: string) => {
+            return !src.replaceAll(win32.sep, posix.sep).includes("/test/");
+        },
+    });
 }
 
-const typespecModulePath: string = join(__dirname, "..", "node_modules", "@azure-tools", "typespec-python");
+const typespecModulePath: string = join(__dirname, "..", "node_modules", "@typespec", "http-client-python");
 
 // Copy the generator directory
 copyAndCreateDir(join(typespecModulePath, "generator"), join(__dirname, "..", "generator"));
-
-// Copy the scripts directory
-copyAndCreateDir(join(typespecModulePath, "scripts", "eng"), join(__dirname, "..", "scripts", "eng"));

package/scripts/eng/lint.ts

@@ -52,7 +52,7 @@ export function pyright() {
 export function eslint() {
     // const checkWarning = argv.skipWarning ? "" : "--max-warnings=0";
     const checkWarning = "";
-    executeCommand(`npx eslint . --ext .ts ${checkWarning} `, "eslint");
+    executeCommand(`npx eslint . ${checkWarning} `, "eslint");
 }
 
 if (argv.command === "pylint") {

package/scripts/eng/pylintrc

@@ -15,8 +15,9 @@ enable=useless-suppression
 # locally-disabled: Warning locally suppressed using disable-msg
 # cyclic-import: because of https://github.com/PyCQA/pylint/issues/850
 # too-many-arguments: Due to the nature of the CLI many commands have large arguments set which reflect in large arguments set in corresponding methods.
+# too-many-lines: Due to code generation many files end up with too many lines.
 # Let's black deal with bad-continuation
-disable=useless-object-inheritance,missing-docstring,locally-disabled,fixme,cyclic-import,too-many-arguments,invalid-name,duplicate-code,too-few-public-methods,consider-using-f-string,super-with-arguments,redefined-builtin,import-outside-toplevel,client-suffix-needed,unnecessary-dunder-call,unnecessary-ellipsis,disallowed-name,consider-using-max-builtin
+disable=useless-object-inheritance,missing-docstring,locally-disabled,fixme,cyclic-import,too-many-arguments,invalid-name,duplicate-code,too-few-public-methods,consider-using-f-string,super-with-arguments,redefined-builtin,import-outside-toplevel,client-suffix-needed,unnecessary-dunder-call,unnecessary-ellipsis,disallowed-name,consider-using-max-builtin,too-many-lines,parse-error,useless-suppression,unknown-option-value
 
 [FORMAT]
 max-line-length=120