@autorest/python 6.9.2 → 6.9.4

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

@@ -7,6 +7,7 @@ from typing import Any, Dict, Optional, TYPE_CHECKING, List
 
 from .base import BaseModel
 from .constant_type import ConstantType
+from .enum_type import EnumType
 from .base import BaseType
 from .imports import FileImport, ImportType
 from .utils import add_to_description, add_to_pylint_disable
@@ -61,9 +62,9 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
     @property
     def client_default_value_declaration(self) -> str:
         if self.client_default_value is not None:
-            return self.type.get_declaration(self.client_default_value)
+            return self.get_declaration(self.client_default_value)
         if self.type.client_default_value is not None:
-            return self.type.get_declaration(self.type.client_default_value)
+            return self.get_declaration(self.type.client_default_value)
         return "None"
 
     @property
@@ -88,11 +89,24 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
     def msrest_deserialization_key(self) -> str:
         return self.type.msrest_deserialization_key
 
+    @property
+    def is_enum_discriminator(self) -> bool:
+        return self.is_discriminator and self.type.type == "enum"
+
     def type_annotation(self, *, is_operation_file: bool = False) -> str:
+        if self.is_enum_discriminator:
+            # here we are the enum discriminator property on the base model
+            return "Literal[None]"
         if self.optional and self.client_default_value is None:
             return f"Optional[{self.type.type_annotation(is_operation_file=is_operation_file)}]"
         return self.type.type_annotation(is_operation_file=is_operation_file)
 
+    def get_declaration(self, value: Any = None) -> Any:
+        if self.is_enum_discriminator:
+            # here we are the enum discriminator property on the base model
+            return None
+        return self.type.get_declaration(value)
+
     def get_json_template_representation(
         self,
         *,
@@ -101,11 +115,13 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
         description: Optional[str] = None,
     ) -> Any:
         if self.client_default_value:
-            client_default_value_declaration = self.type.get_declaration(
+            client_default_value_declaration = self.get_declaration(
                 self.client_default_value
             )
         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,
@@ -131,7 +147,12 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
         return retval or None
 
     def imports(self, **kwargs) -> FileImport:
-        file_import = self.type.imports(**kwargs, relative_path="..", model_typing=True)
+        file_import = FileImport(self.code_model)
+        if self.is_discriminator and isinstance(self.type, EnumType):
+            return file_import
+        file_import.merge(
+            self.type.imports(**kwargs, relative_path="..", model_typing=True)
+        )
         if self.optional and self.client_default_value is None:
             file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB)
         if self.code_model.options["models_mode"] == "dpg":

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

@@ -26,7 +26,6 @@ from ..models import (
     ParameterMethodLocation,
     RequestBuilderBodyParameter,
     OverloadedRequestBuilder,
-    ConstantType,
     MultipartBodyParameter,
     Property,
     RequestBuilderType,
@@ -458,15 +457,16 @@ class RequestBuilderSerializer(
     @staticmethod
     def declare_non_inputtable_constants(builder: RequestBuilderType) -> List[str]:
         def _get_value(param):
-            param_type = cast(ConstantType, param.type)
             if param.location in [ParameterLocation.HEADER, ParameterLocation.QUERY]:
                 kwarg_dict = (
                     "headers"
                     if param.location == ParameterLocation.HEADER
                     else "params"
                 )
-                return f"_{kwarg_dict}.pop('{param.wire_name}', {param_type.get_declaration()})"
-            return f"{param_type.get_declaration()}"
+                return (
+                    f"_{kwarg_dict}.pop('{param.wire_name}', {param.get_declaration()})"
+                )
+            return f"{param.get_declaration()}"
 
         return [
             f"{p.client_name} = {_get_value(p)}"
@@ -645,7 +645,7 @@ class _OperationSerializer(
             f"_stream = {stream_value}",
             f"pipeline_response: PipelineResponse = {self._call_method}self._client._pipeline.run(  "
             + f"{'# type: ignore' if type_ignore else ''} # pylint: disable=protected-access",
-            "    request,",
+            "    _request,",
             "    stream=_stream,",
             "    **kwargs",
             ")",
@@ -915,7 +915,7 @@ class _OperationSerializer(
                 ("_" + group_name) if group_name else "",
                 request_builder.name,
             )
-        retval.append(f"request = {request_path_name}(")
+        retval.append(f"_request = {request_path_name}(")
         for parameter in request_builder.parameters.method:
             if parameter.location == ParameterLocation.BODY:
                 # going to pass in body later based off of overloads
@@ -979,14 +979,14 @@ class _OperationSerializer(
                 and builder.parameters.body_parameter.client_name == "files"
             ):
                 pass_files = ", _files"
-            retval.append(f"request = _convert_request(request{pass_files})")
+            retval.append(f"_request = _convert_request(_request{pass_files})")
         if builder.parameters.path:
             retval.extend(self.serialize_path(builder))
-        url_to_format = "request.url"
+        url_to_format = "_request.url"
         if self.code_model.options["version_tolerant"] and template_url:
             url_to_format = template_url
         retval.append(
-            "request.url = self._client.format_url({}{})".format(
+            "_request.url = self._client.format_url({}{})".format(
                 url_to_format,
                 ", **path_format_arguments" if builder.parameters.path else "",
             )
@@ -1168,31 +1168,16 @@ class _OperationSerializer(
                     )
                 )
                 retval.append("")
-        type_ignore = (
-            builder.has_response_body
-            and not builder.has_optional_return_type
-            and not (
-                self.code_model.options["models_mode"] == "msrest"
-                and any(not resp.is_stream_response for resp in builder.responses)
-            )
-        )
         if builder.has_optional_return_type or self.code_model.options["models_mode"]:
             deserialized = "deserialized"
         else:
             deserialized = f"cast({builder.response_type_annotation(async_mode=self.async_mode)}, deserialized)"
-            type_ignore = False
-        if (
-            not builder.has_optional_return_type
-            and len(builder.responses) > 1
-            and any(resp.is_stream_response or resp.type for resp in builder.responses)
-        ):
-            type_ignore = True
         retval.append("if cls:")
         retval.append(
             "    return cls(pipeline_response, {}, {}){}".format(
                 deserialized if builder.has_response_body else "None",
                 "response_headers" if builder.any_response_has_headers else "{}",
-                " # type: ignore" if type_ignore else "",
+                " # type: ignore",
             )
         )
         if builder.has_response_body and any(
@@ -1200,9 +1185,7 @@ class _OperationSerializer(
             for response in builder.responses
         ):
             retval.append("")
-            retval.append(
-                f"return {deserialized}{' # type: ignore' if type_ignore else ''}"
-            )
+            retval.append(f"return {deserialized}  # type: ignore")
         if (
             builder.request_builder.method == "HEAD"
             and self.code_model.options["head_as_boolean"]
@@ -1370,8 +1353,8 @@ class _PagingOperationSerializer(
         except StopIteration:
             pass
 
-        retval.append(f'request = HttpRequest("GET", {next_link_str}{query_str})')
-        retval.extend(self._postprocess_http_request(builder, "request.url"))
+        retval.append(f'_request = HttpRequest("GET", {next_link_str}{query_str})')
+        retval.extend(self._postprocess_http_request(builder, "_request.url"))
 
         return retval
 
@@ -1391,10 +1374,10 @@ class _PagingOperationSerializer(
             [f"        {line}" for line in self.call_next_link_request_builder(builder)]
         )
         if not builder.next_request_builder and self.code_model.is_legacy:
-            retval.append('        request.method = "GET"')
+            retval.append('        _request.method = "GET"')
         else:
             retval.append("")
-        retval.append("    return request")
+        retval.append("    return _request")
         return retval
 
     @property
@@ -1453,7 +1436,7 @@ class _PagingOperationSerializer(
 
     def _get_next_callback(self, builder: PagingOperationType) -> List[str]:
         retval = [f"{'async ' if self.async_mode else ''}def get_next(next_link=None):"]
-        retval.append("    request = prepare_request(next_link)")
+        retval.append("    _request = prepare_request(next_link)")
         retval.append("")
         retval.extend([f"    {l}" for l in self.make_pipeline_call(builder)])
         retval.append("    response = pipeline_response.http_response")
@@ -1582,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,")
@@ -1590,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]:
@@ -1626,11 +1612,7 @@ class _LROOperationSerializer(_OperationSerializer[LROOperationType]):
                 "response_headers"
                 if builder.lro_response and builder.lro_response.headers
                 else "{}",
-                " # type: ignore"
-                if builder.lro_response
-                and builder.lro_response.type
-                and self.code_model.options["models_mode"] != "msrest"
-                else "",
+                " # type: ignore",
             )
         )
         if builder.lro_response and builder.lro_response.type:

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

@@ -3,14 +3,13 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import List, cast
+from typing import List
 from abc import ABC, abstractmethod
 
 from jinja2 import Environment
-from ..models import ModelType, CodeModel, Property
+from ..models import ModelType, CodeModel, Property, ConstantType, EnumValue
 from ..models.imports import FileImport, TypingSection, MsrestImportType, ImportType
 from .import_serializer import FileImportSerializer
-from ..models.constant_type import ConstantType
 
 
 def _documentation_string(
@@ -134,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))
@@ -201,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",
@@ -266,8 +267,8 @@ class DpgModelSerializer(_ModelSerializer):
         field = "rest_discriminator" if prop.is_discriminator else "rest_field"
         type_ignore = (
             prop.is_discriminator
-            and prop.is_discriminator
-            and cast(ConstantType, prop.type).value
+            and isinstance(prop.type, (ConstantType, EnumValue))
+            and prop.type.value
         )
         return (
             f"{prop.client_name}: {prop.type_annotation()} ="
@@ -280,7 +281,7 @@ class DpgModelSerializer(_ModelSerializer):
             if prop.constant or prop.is_discriminator:
                 init_args.append(
                     f"self.{prop.client_name}: {prop.type_annotation()} = "
-                    f"{cast(ConstantType, prop.type).get_declaration()}"
+                    f"{prop.get_declaration()}"
                 )
         return init_args
 

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/client.py.jinja2

@@ -24,7 +24,7 @@
         {% else %}
         request_copy.url = self._client.format_url(request_copy.url)
         {% endif %}
-        return self._client.send_request(request_copy, **kwargs)
+        return self._client.send_request(request_copy, **kwargs)  # type: ignore
 
     {{ keywords.def }} close(self) -> None:
         {{ keywords.await }}self._client.close()

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

@@ -7,7 +7,7 @@ class {{ enum.name }}({{ enum.value_type.type_annotation(is_operation_file=False
 
     {% for value in enum.values %}
     {{ value.name }} = {{ enum.value_type.get_declaration(value.value) }}
-    {% if value.description %}
-    """{{ value.description | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n    #: ') }}"""
+    {% if value.description(is_operation_file=False) %}
+    """{{ value.description(is_operation_file=False) | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n    #: ') }}"""
     {% endif %}
-    {% endfor %}
+    {% endfor %}

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