@autorest/python 6.9.3 → 6.9.4

package/autorest/_utils.py

@@ -120,24 +120,39 @@ KNOWN_TYPES: Dict[str, Dict[str, Any]] = {
 JSON_REGEXP = re.compile(r"^(application|text)/(.+\+)?json$")
 
 
-def build_policies(is_arm: bool, async_mode: bool) -> List[str]:
-    async_prefix = "Async" if async_mode else ""
-    policies = [
-        "policies.RequestIdPolicy(**kwargs)",
-        "self._config.headers_policy",
-        "self._config.user_agent_policy",
-        "self._config.proxy_policy",
-        "policies.ContentDecodePolicy(**kwargs)",
-        f"{async_prefix}ARMAutoResourceProviderRegistrationPolicy()"
-        if is_arm
-        else None,
-        "self._config.redirect_policy",
-        "self._config.retry_policy",
-        "self._config.authentication_policy",
-        "self._config.custom_hook_policy",
-        "self._config.logging_policy",
-        "policies.DistributedTracingPolicy(**kwargs)",
-        "policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None",
-        "self._config.http_logging_policy",
-    ]
+def build_policies(
+    is_arm: bool, async_mode: bool, unbranded: bool = False
+) -> List[str]:
+    if not unbranded:
+        # for Azure
+        async_prefix = "Async" if async_mode else ""
+        policies = [
+            "policies.RequestIdPolicy(**kwargs)",
+            "self._config.headers_policy",
+            "self._config.user_agent_policy",
+            "self._config.proxy_policy",
+            "policies.ContentDecodePolicy(**kwargs)",
+            f"{async_prefix}ARMAutoResourceProviderRegistrationPolicy()"
+            if is_arm
+            else None,
+            "self._config.redirect_policy",
+            "self._config.retry_policy",
+            "self._config.authentication_policy",
+            "self._config.custom_hook_policy",
+            "self._config.logging_policy",
+            "policies.DistributedTracingPolicy(**kwargs)",
+            "policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None",
+            "self._config.http_logging_policy",
+        ]
+    else:
+        # for non-Azure
+        policies = [
+            "self._config.headers_policy",
+            "self._config.user_agent_policy",
+            "self._config.proxy_policy",
+            "policies.ContentDecodePolicy(**kwargs)",
+            "self._config.retry_policy",
+            "self._config.authentication_policy",
+            "self._config.logging_policy",
+        ]
     return [p for p in policies if p]

package/autorest/codegen/__init__.py

@@ -85,6 +85,11 @@ def _validate_code_model_options(options: Dict[str, Any]) -> None:
             "Please read https://aka.ms/azsdk/dpcodegen for more details."
         )
 
+    if options["unbranded"] and options["tracing"]:
+        raise ValueError(
+            "Can not set --unbranded=true and --tracing=true at the same time."
+        )
+
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -137,6 +142,7 @@ class CodeGenerator(Plugin):
             models_mode_default = "dpg"
 
         package_name = self.options.get("package-name")
+        unbranded = self.options.get("unbranded", False)
         options: Dict[str, Any] = {
             "azure_arm": azure_arm,
             "head_as_boolean": self.options.get("head-as-boolean", True),
@@ -148,7 +154,7 @@ class CodeGenerator(Plugin):
             "package_name": package_name,
             "package_version": self.options.get("package-version"),
             "client_side_validation": self.options.get("client-side-validation", False),
-            "tracing": self.options.get("tracing", show_operations),
+            "tracing": self.options.get("tracing", show_operations and not unbranded),
             "multiapi": self.options.get("multiapi", False),
             "polymorphic_examples": self.options.get("polymorphic-examples", 5),
             "models_mode": self.options.get("models-mode", models_mode_default).lower(),
@@ -177,6 +183,7 @@ class CodeGenerator(Plugin):
             "generate_sample": self.options.get("generate-sample", False),
             "default_api_version": self.options.get("default-api-version"),
             "from_typespec": self.options.get("from-typespec", False),
+            "unbranded": unbranded,
         }
 
         if options["builders_visibility"] is None:

package/autorest/codegen/models/base.py

@@ -53,14 +53,13 @@ class BaseType(BaseModel, ABC):  # pylint: disable=too-many-public-methods
         return cls(yaml_data=yaml_data, code_model=code_model)
 
     def imports(self, **kwargs) -> FileImport:  # pylint: disable=unused-argument
-        return FileImport()
+        return FileImport(self.code_model)
 
     def imports_for_multiapi(self, **kwargs: Any) -> FileImport:
         return self.imports(**kwargs)
 
-    @staticmethod
-    def imports_for_sample() -> FileImport:
-        return FileImport()
+    def imports_for_sample(self) -> FileImport:
+        return FileImport(self.code_model)
 
     @staticmethod
     def serialize_sample_value(value: Any) -> str:

package/autorest/codegen/models/client.py

@@ -195,7 +195,7 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
             raise KeyError(f"No operation with id {operation_id} found.") from exc
 
     def _imports_shared(self, async_mode: bool) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
 
         file_import.add_submodule_import(
             "typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL
@@ -225,10 +225,9 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
             ImportType.LOCAL,
         )
         file_import.add_msrest_import(
-            self.code_model,
-            ".." if async_mode else ".",
-            MsrestImportType.SerializerDeserializer,
-            TypingSection.REGULAR,
+            relative_path=".." if async_mode else ".",
+            msrest_import_type=MsrestImportType.SerializerDeserializer,
+            typing_section=TypingSection.REGULAR,
         )
         file_import.add_submodule_import(
             "azure.core.pipeline", "policies", ImportType.AZURECORE
@@ -406,7 +405,7 @@ class Config(_ClientConfigBase[ConfigGlobalParameterList]):
         return f"{super().name}Configuration"
 
     def _imports_shared(self, async_mode: bool) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.add_submodule_import(
             "azure.core.pipeline", "policies", ImportType.AZURECORE
         )

package/autorest/codegen/models/combined_type.py

@@ -103,7 +103,7 @@ class CombinedType(BaseType):
         raise ValueError("You shouldn't do instance checks on a multiple type")
 
     def imports(self, **kwargs: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         if self.name and not kwargs.get("is_types_file"):
             file_import.add_submodule_import(
                 kwargs.pop("relative_path"),

package/autorest/codegen/models/constant_type.py

@@ -124,7 +124,7 @@ class ConstantType(BaseType):
         )
 
     def _imports_shared(self, **kwargs: Any):
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.merge(self.value_type.imports(**kwargs))
         return file_import
 

package/autorest/codegen/models/credential_types.py

@@ -182,7 +182,7 @@ class TokenCredentialType(
         return "~azure.core.credentials.TokenCredential"
 
     def imports(self, **kwargs: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         if kwargs.get("async_mode"):
             file_import.add_submodule_import(
                 "azure.core.credentials_async",
@@ -221,7 +221,7 @@ class AzureKeyCredentialType(
         return "isinstance({}, AzureKeyCredential)"
 
     def imports(self, **kwargs: Any) -> FileImport:  # pylint: disable=unused-argument
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.add_submodule_import(
             "azure.core.credentials",
             "AzureKeyCredential",

package/autorest/codegen/models/dictionary_type.py

@@ -123,7 +123,7 @@ class DictionaryType(BaseType):
         )
 
     def imports(self, **kwargs: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.add_submodule_import(
             "typing", "Dict", ImportType.STDLIB, TypingSection.CONDITIONAL
         )

package/autorest/codegen/models/enum_type.py

@@ -76,7 +76,7 @@ class EnumValue(BaseType):
         return self.value_type.instance_check_template
 
     def imports(self, **kwargs: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.merge(self.value_type.imports(**kwargs))
         file_import.add_literal_import()
         file_import.add_submodule_import(
@@ -230,7 +230,7 @@ class EnumType(BaseType):
 
     def imports(self, **kwargs: Any) -> FileImport:
         operation = kwargs.pop("operation", False)
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         if self.code_model.options["models_mode"]:
             file_import.add_submodule_import(
                 "typing", "Union", ImportType.STDLIB, TypingSection.CONDITIONAL

package/autorest/codegen/models/imports.py

@@ -88,8 +88,9 @@ class TypeDefinition:
 
 
 class FileImport:
-    def __init__(self, imports: Optional[List[ImportModel]] = None) -> None:
-        self.imports = imports or []
+    def __init__(self, code_model: "CodeModel") -> None:
+        self.imports: List[ImportModel] = []
+        self.code_model = code_model
         # has sync and async type definitions
         self.type_definitions: Dict[str, TypeDefinition] = {}
 
@@ -272,12 +273,12 @@ class FileImport:
 
     def add_msrest_import(
         self,
-        code_model: "CodeModel",
+        *,
         relative_path: str,
         msrest_import_type: MsrestImportType,
         typing_section: TypingSection,
     ):
-        if code_model.options["client_side_validation"]:
+        if self.code_model.options["client_side_validation"]:
             if msrest_import_type == MsrestImportType.Module:
                 self.add_import(
                     "msrest.serialization", ImportType.AZURECORE, typing_section
@@ -291,7 +292,7 @@ class FileImport:
                         "msrest", "Deserializer", ImportType.THIRDPARTY, typing_section
                     )
         else:
-            if code_model.options["multiapi"]:
+            if self.code_model.options["multiapi"]:
                 relative_path += "."
             if msrest_import_type == MsrestImportType.Module:
                 self.add_submodule_import(

package/autorest/codegen/models/list_type.py

@@ -146,7 +146,7 @@ class ListType(BaseType):
         )
 
     def imports(self, **kwargs: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         if not (
             self.code_model.options["version_tolerant"]
             and self.element_type.is_xml

package/autorest/codegen/models/lro_operation.py

@@ -104,6 +104,9 @@ class LROOperationBase(OperationBase[LROResponseType]):
         """We don't want the poller to show up in ClsType, so we call super() on resposne 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:
+        return self.response_type_annotation(async_mode=async_mode)
+
     def get_poller(self, async_mode: bool) -> str:
         return self.responses[0].get_poller(async_mode)
 

package/autorest/codegen/models/model_type.py

@@ -268,7 +268,7 @@ class JSONModelType(ModelType):
         return "isinstance({}, MutableMapping)"
 
     def imports(self, **kwargs: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.add_submodule_import(
             "typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL
         )

package/autorest/codegen/models/operation.py

@@ -230,7 +230,7 @@ class OperationBase(  # pylint: disable=too-many-public-methods
     def _imports_shared(
         self, async_mode: bool, **kwargs: Any  # pylint: disable=unused-argument
     ) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.add_submodule_import(
             "typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL
         )
@@ -254,7 +254,7 @@ class OperationBase(  # pylint: disable=too-many-public-methods
 
     def imports_for_multiapi(self, async_mode: bool, **kwargs: Any) -> FileImport:
         if self.abstract:
-            return FileImport()
+            return FileImport(self.code_model)
         file_import = self._imports_shared(async_mode, **kwargs)
         for param in self.parameters.method:
             file_import.merge(
@@ -308,7 +308,7 @@ class OperationBase(  # pylint: disable=too-many-public-methods
         async_mode: bool,
     ) -> FileImport:
         """Helper method to get a request builder import."""
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         if self.code_model.options["builders_visibility"] != "embedded":
             group_name = request_builder.group_name
             rest_import_path = "..." if async_mode else ".."
@@ -338,7 +338,7 @@ class OperationBase(  # pylint: disable=too-many-public-methods
         self, async_mode: bool, **kwargs: Any
     ) -> FileImport:
         if self.abstract:
-            return FileImport()
+            return FileImport(self.code_model)
         file_import = self._imports_shared(async_mode, **kwargs)
 
         for param in self.parameters.method:

package/autorest/codegen/models/operation_group.py

@@ -48,7 +48,7 @@ class OperationGroup(BaseModel):
         return ", ".join(base_classes)
 
     def imports_for_multiapi(self, async_mode: bool) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         relative_path = ".." if async_mode else "."
         for operation in self.operations:
             file_import.merge(
@@ -79,7 +79,7 @@ class OperationGroup(BaseModel):
         return any(o for o in self.operations if o.need_validation)
 
     def imports(self, async_mode: bool) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
 
         relative_path = ("..." if async_mode else "..") + (
             "." if self.client.is_subclient else ""

package/autorest/codegen/models/paging_operation.py

@@ -144,7 +144,7 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
 
     def imports(self, async_mode: bool, **kwargs: Any) -> FileImport:
         if self.abstract:
-            return FileImport()
+            return FileImport(self.code_model)
         file_import = self._imports_shared(async_mode, **kwargs)
         file_import.merge(super().imports(async_mode, **kwargs))
         if self.code_model.options["tracing"] and self.want_tracing:

package/autorest/codegen/models/parameter.py

@@ -168,7 +168,7 @@ class _ParameterBase(
         return self.type.serialization_type
 
     def _imports_shared(self, async_mode: bool, **_: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         if self.optional and self.client_default_value is None:
             file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB)
         if self.added_on:

package/autorest/codegen/models/primitive_types.py

@@ -107,7 +107,7 @@ class BinaryType(PrimitiveType):
         from .combined_type import CombinedType
         from .operation import OperationBase
 
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.add_submodule_import("typing", "IO", ImportType.STDLIB)
         operation = kwargs.get("operation")
         if (
@@ -145,7 +145,7 @@ class BinaryIteratorType(PrimitiveType):
         return self.get_declaration("Iterator[bytes]")
 
     def imports(self, **kwargs: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         iterator = "AsyncIterator" if kwargs.get("async_mode") else "Iterator"
         file_import.add_submodule_import("typing", iterator, ImportType.STDLIB)
         return file_import
@@ -171,7 +171,7 @@ class AnyType(PrimitiveType):
         return self.get_declaration({})
 
     def imports(self, **kwargs: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.add_submodule_import(
             "typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL
         )
@@ -204,7 +204,7 @@ class AnyObjectType(PrimitiveType):
         return "isinstance({}, MutableMapping)"
 
     def imports(self, **kwargs: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.define_mutable_mapping_type()
         return file_import
 
@@ -386,7 +386,7 @@ class DatetimeType(PrimitiveType):
         return f'"{value}"'
 
     def imports(self, **kwargs: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.add_import("datetime", ImportType.STDLIB)
         return file_import
 
@@ -398,9 +398,8 @@ class DatetimeType(PrimitiveType):
     def instance_check_template(self) -> str:
         return "isinstance({}, datetime.datetime)"
 
-    @staticmethod
-    def imports_for_sample() -> FileImport:
-        file_import = super(DatetimeType, DatetimeType).imports_for_sample()
+    def imports_for_sample(self) -> FileImport:
+        file_import = super().imports_for_sample()
         file_import.add_import("isodate", ImportType.STDLIB)
         return file_import
 
@@ -430,7 +429,7 @@ class TimeType(PrimitiveType):
         return f'"{value}"'
 
     def imports(self, **kwargs: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.add_import("datetime", ImportType.STDLIB)
         return file_import
 
@@ -442,9 +441,8 @@ class TimeType(PrimitiveType):
     def instance_check_template(self) -> str:
         return "isinstance({}, datetime.time)"
 
-    @staticmethod
-    def imports_for_sample() -> FileImport:
-        file_import = super(TimeType, TimeType).imports_for_sample()
+    def imports_for_sample(self) -> FileImport:
+        file_import = super().imports_for_sample()
         file_import.add_import("isodate", ImportType.STDLIB)
         return file_import
 
@@ -478,7 +476,7 @@ class UnixTimeType(PrimitiveType):
         return f'"{value}"'
 
     def imports(self, **kwargs: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.add_import("datetime", ImportType.STDLIB)
         return file_import
 
@@ -490,9 +488,8 @@ class UnixTimeType(PrimitiveType):
     def instance_check_template(self) -> str:
         return "isinstance({}, datetime.time)"
 
-    @staticmethod
-    def imports_for_sample() -> FileImport:
-        file_import = super(UnixTimeType, UnixTimeType).imports_for_sample()
+    def imports_for_sample(self) -> FileImport:
+        file_import = super().imports_for_sample()
         file_import.add_import("datetime", ImportType.STDLIB)
         return file_import
 
@@ -522,7 +519,7 @@ class DateType(PrimitiveType):
         return f'"{value}"'
 
     def imports(self, **kwargs: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.add_import("datetime", ImportType.STDLIB)
         return file_import
 
@@ -534,9 +531,8 @@ class DateType(PrimitiveType):
     def instance_check_template(self) -> str:
         return "isinstance({}, datetime.date)"
 
-    @staticmethod
-    def imports_for_sample() -> FileImport:
-        file_import = super(DateType, DateType).imports_for_sample()
+    def imports_for_sample(self) -> FileImport:
+        file_import = super().imports_for_sample()
         file_import.add_import("isodate", ImportType.STDLIB)
         return file_import
 
@@ -566,7 +562,7 @@ class DurationType(PrimitiveType):
         return f'"{value}"'
 
     def imports(self, **kwargs: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.add_import("datetime", ImportType.STDLIB)
         return file_import
 
@@ -578,9 +574,8 @@ class DurationType(PrimitiveType):
     def instance_check_template(self) -> str:
         return "isinstance({}, datetime.timedelta)"
 
-    @staticmethod
-    def imports_for_sample() -> FileImport:
-        file_import = super(DurationType, DurationType).imports_for_sample()
+    def imports_for_sample(self) -> FileImport:
+        file_import = super().imports_for_sample()
         file_import.add_import("isodate", ImportType.STDLIB)
         return file_import
 
@@ -623,7 +618,7 @@ class AzureCoreType(PrimitiveType):
         return self.name
 
     def imports(self, **kwargs: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.add_submodule_import("azure.core", self.name, ImportType.AZURECORE)
         return file_import
 

package/autorest/codegen/models/property.py

@@ -120,6 +120,8 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
             )
         if self.description(is_operation_file=True):
             description = self.description(is_operation_file=True)
+        # make sure there is no \n otherwise the json template will be invalid
+        description = (description or "").replace("\n", " ")
         return self.type.get_json_template_representation(
             optional=self.optional,
             client_default_value_declaration=client_default_value_declaration,
@@ -145,7 +147,7 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
         return retval or None
 
     def imports(self, **kwargs) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         if self.is_discriminator and isinstance(self.type, EnumType):
             return file_import
         file_import.merge(

package/autorest/codegen/models/request_builder.py

@@ -81,7 +81,7 @@ class RequestBuilderBase(BaseBuilder[ParameterListType]):
         return "~azure.core.rest.HttpRequest"
 
     def imports(self) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         relative_path = ".."
         if (
             not self.code_model.options["builders_visibility"] == "embedded"
@@ -111,15 +111,14 @@ class RequestBuilderBase(BaseBuilder[ParameterListType]):
             "typing", "Any", ImportType.STDLIB, typing_section=TypingSection.CONDITIONAL
         )
         file_import.add_msrest_import(
-            self.code_model,
-            "..."
+            relative_path="..."
             if (
                 not self.code_model.options["builders_visibility"] == "embedded"
                 and self.group_name
             )
             else "..",
-            MsrestImportType.Serializer,
-            TypingSection.REGULAR,
+            msrest_import_type=MsrestImportType.Serializer,
+            typing_section=TypingSection.REGULAR,
         )
         if (
             self.overloads

package/autorest/codegen/models/response.py

@@ -108,7 +108,7 @@ class Response(BaseModel):
         return self.type.docstring_type(**kwargs) if self.type else "None"
 
     def _imports_shared(self, **kwargs: Any) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         if self.type:
             file_import.merge(self.type.imports(**kwargs))
         if self.nullable:

package/autorest/codegen/serializers/builder_serializer.py

@@ -1565,7 +1565,7 @@ class _LROOperationSerializer(_OperationSerializer[LROOperationType]):
         retval.append("else: polling_method = polling")
         retval.append("if cont_token:")
         retval.append(
-            f"    return {builder.get_poller(self.async_mode)}.from_continuation_token("
+            f"    return {builder.get_poller_with_response_type(self.async_mode)}.from_continuation_token("
         )
         retval.append("        polling_method=polling_method,")
         retval.append("        continuation_token=cont_token,")
@@ -1573,9 +1573,12 @@ class _LROOperationSerializer(_OperationSerializer[LROOperationType]):
         retval.append("        deserialization_callback=get_long_running_output")
         retval.append("    )")
         retval.append(
-            f"return {builder.get_poller(self.async_mode)}"
-            "(self._client, raw_result, get_long_running_output, polling_method)  # type: ignore"
+            f"return {builder.get_poller_with_response_type(self.async_mode)}("
         )
+        retval.append(
+            "    self._client, raw_result, get_long_running_output, polling_method  # type: ignore"
+        )
+        retval.append("    )")
         return retval
 
     def get_long_running_output(self, builder: LROOperationType) -> List[str]:

package/autorest/codegen/serializers/client_serializer.py

@@ -123,7 +123,7 @@ class ClientSerializer:
             [
                 "_policies = kwargs.pop('policies', None)",
                 "if _policies is None:",
-                f'    _policies = [{",".join(build_policies(self.client.code_model.options["azure_arm"], async_mode))}]',  # pylint: disable=line-too-long
+                f'    _policies = [{",".join(build_policies(self.client.code_model.options["azure_arm"], async_mode, self.client.code_model.options["unbranded"]))}]',  # pylint: disable=line-too-long
                 f"self._client: {pipeline_client_name} = {pipeline_client_name}("
                 f"{', '.join(f'{k}={v}' for k, v in params.items())}, **kwargs)",
             ]

package/autorest/codegen/serializers/general_serializer.py

@@ -85,7 +85,7 @@ class GeneralSerializer:
     def serialize_service_client_file(self, clients: List[Client]) -> str:
         template = self.env.get_template("client_container.py.jinja2")
 
-        imports = FileImport()
+        imports = FileImport(self.code_model)
         for client in clients:
             imports.merge(client.imports(self.async_mode))
 
@@ -101,7 +101,7 @@ class GeneralSerializer:
         template = self.env.get_template("vendor.py.jinja2")
 
         # configure imports
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         if self.code_model.need_request_converter:
             file_import.add_submodule_import(
                 "azure.core.pipeline.transport",
@@ -122,10 +122,9 @@ class GeneralSerializer:
                 TypingSection.TYPING,
             )
             file_import.add_msrest_import(
-                self.code_model,
-                ".." if self.async_mode else ".",
-                MsrestImportType.SerializerDeserializer,
-                TypingSection.TYPING,
+                relative_path=".." if self.async_mode else ".",
+                msrest_import_type=MsrestImportType.SerializerDeserializer,
+                typing_section=TypingSection.TYPING,
             )
             for client in clients:
                 file_import.add_submodule_import(
@@ -152,7 +151,7 @@ class GeneralSerializer:
 
     def serialize_config_file(self, clients: List[Client]) -> str:
         template = self.env.get_template("config_container.py.jinja2")
-        imports = FileImport()
+        imports = FileImport(self.code_model)
         for client in self.code_model.clients:
             imports.merge(client.config.imports(self.async_mode))
         return template.render(

package/autorest/codegen/serializers/model_serializer.py

@@ -133,9 +133,11 @@ class _ModelSerializer(ABC):
 
 class MsrestModelSerializer(_ModelSerializer):
     def imports(self) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.add_msrest_import(
-            self.code_model, "..", MsrestImportType.Module, TypingSection.REGULAR
+            relative_path="..",
+            msrest_import_type=MsrestImportType.Module,
+            typing_section=TypingSection.REGULAR,
         )
         for model in self.code_model.model_types:
             file_import.merge(model.imports(is_operation_file=False))
@@ -200,7 +202,7 @@ class MsrestModelSerializer(_ModelSerializer):
 
 class DpgModelSerializer(_ModelSerializer):
     def imports(self) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(self.code_model)
         file_import.add_submodule_import(
             "..",
             "_model_base",

package/autorest/codegen/serializers/operation_groups_serializer.py

@@ -57,7 +57,7 @@ class OperationGroupsSerializer:
             if self.operation_group
             else [og for client in self.clients for og in client.operation_groups]
         )
-        imports = FileImport()
+        imports = FileImport(code_model=self.code_model)
         for operation_group in operation_groups:
             imports.merge(
                 operation_group.imports(

package/autorest/codegen/serializers/patch_serializer.py

@@ -15,7 +15,7 @@ class PatchSerializer:
 
     def serialize(self) -> str:
         template = self.env.get_template("patch.py.jinja2")
-        imports = FileImport()
+        imports = FileImport(code_model=self.code_model)
         imports.add_submodule_import("typing", "List", ImportType.STDLIB)
         return template.render(
             code_model=self.code_model,

package/autorest/codegen/serializers/request_builders_serializer.py

@@ -26,7 +26,7 @@ class RequestBuildersSerializer:
 
     @property
     def imports(self) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(code_model=self.code_model)
         for request_builder in self.request_builders:
             if request_builder.group_name == self.group_name:
                 file_import.merge(request_builder.imports())

package/autorest/codegen/serializers/sample_serializer.py

@@ -43,7 +43,7 @@ class SampleSerializer:
         }
 
     def _imports(self) -> FileImportSerializer:
-        imports = FileImport()
+        imports = FileImport(self.code_model)
         namespace_from_package_name = get_namespace_from_package_name(
             self.code_model.options["package_name"]
         )

package/autorest/codegen/serializers/types_serializer.py

@@ -15,7 +15,7 @@ class TypesSerializer:
         self.env = env
 
     def imports(self) -> FileImport:
-        file_import = FileImport()
+        file_import = FileImport(code_model=self.code_model)
         if self.code_model.named_unions:
             file_import.add_submodule_import(
                 "typing",

package/autorest/codegen/templates/model_base.py.jinja2

@@ -553,7 +553,7 @@ class Model(_MyMutableMapping):
         if exclude_readonly:
             readonly_props = [p._rest_name for p in self._attr_to_rest_field.values() if _is_readonly(p)]
         for k, v in self.items():
-            if exclude_readonly and k in readonly_props:  # pyright: reportUnboundVariable=false
+            if exclude_readonly and k in readonly_props:  # pyright: ignore[reportUnboundVariable]
                 continue
             result[k] = Model._as_dict_value(v, exclude_readonly=exclude_readonly)
         return result

package/autorest/jsonrpc/server.py

@@ -3,12 +3,14 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+import typing
 import contextlib
 import os
 import sys
 import logging
 
 from jsonrpc import dispatcher, JSONRPCResponseManager
+from jsonrpc.jsonrpc2 import JSONRPC20Response
 
 from .stdstream import read_message, write_message
 
@@ -99,7 +101,9 @@ def main() -> None:
         _LOGGER.debug("Trying to read")
         message = read_message()
 
-        response = JSONRPCResponseManager.handle(message, dispatcher).json
+        response = typing.cast(
+            JSONRPC20Response, JSONRPCResponseManager.handle(message, dispatcher)
+        ).json
         _LOGGER.debug("Produced: %s", response)
         write_message(response)
         _LOGGER.debug("Message processed")

package/autorest/multiapi/models/imports.py

@@ -4,7 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 from enum import Enum
-from typing import Dict, Optional, Set, Union, Tuple
+from typing import Dict, Optional, Set, Union, Tuple, cast
 from ..utils import convert_list_to_tuple
 
 
@@ -108,21 +108,23 @@ class FileImport:
         ] = None,
         typing_section: TypingSection = TypingSection.REGULAR,
     ) -> None:
-        name_input: Optional[
-            Union[
-                str,
-                Tuple[
+        name_input = cast(
+            Optional[
+                Union[
                     str,
-                    str,
-                ],
-                Tuple[
-                    str,
-                    Optional[str],
-                    Tuple[Tuple[Tuple[int, int], str, Optional[str]]],
-                ],
-            ]
-        ] = None
-        name_input = convert_list_to_tuple(name_import)
+                    Tuple[
+                        str,
+                        str,
+                    ],
+                    Tuple[
+                        str,
+                        Optional[str],
+                        Tuple[Tuple[Tuple[int, int], str, Optional[str]]],
+                    ],
+                ]
+            ],
+            convert_list_to_tuple(name_import),
+        )
         self._imports.setdefault(typing_section, {}).setdefault(
             import_type, {}
         ).setdefault(from_section, set()).add(name_input)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.9.3",
+  "version": "6.9.4",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {