@autorest/python 6.13.11 → 6.13.13

package/autorest/_utils.py

@@ -136,9 +136,11 @@ def build_policies(
             "self._config.user_agent_policy",
             "self._config.proxy_policy",
             "policies.ContentDecodePolicy(**kwargs)",
-            f"{async_prefix}ARMAutoResourceProviderRegistrationPolicy()"
-            if is_arm
-            else None,
+            (
+                f"{async_prefix}ARMAutoResourceProviderRegistrationPolicy()"
+                if is_arm
+                else None
+            ),
             "self._config.redirect_policy",
             "self._config.retry_policy",
             "self._config.authentication_policy",

package/autorest/codegen/__init__.py

@@ -62,9 +62,11 @@ class OptionsRetriever:
     def license_header(self) -> str:
         license_header = self.options.get(
             "header-text",
-            DEFAULT_HEADER_TEXT.format(company_name=self.company_name)
-            if self.company_name
-            else "",
+            (
+                DEFAULT_HEADER_TEXT.format(company_name=self.company_name)
+                if self.company_name
+                else ""
+            ),
         )
         if license_header:
             license_header = license_header.replace("\n", "\n# ")

package/autorest/codegen/models/base_builder.py

@@ -100,16 +100,13 @@ class BaseBuilder(
         return ""
 
     @abstractmethod
-    def response_type_annotation(self, **kwargs) -> str:
-        ...
+    def response_type_annotation(self, **kwargs) -> str: ...
 
     @abstractmethod
-    def response_docstring_text(self, **kwargs) -> str:
-        ...
+    def response_docstring_text(self, **kwargs) -> str: ...
 
     @abstractmethod
-    def response_docstring_type(self, **kwargs) -> str:
-        ...
+    def response_docstring_type(self, **kwargs) -> str: ...
 
     @property
     def description(self) -> str:

package/autorest/codegen/models/client.py

@@ -350,9 +350,7 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
         elif self.code_model.options["models_mode"] == "msrest":
             # in this case, we have client_models = {} in the service client, which needs a type annotation
             # this import will always be commented, so will always add it to the typing section
-            file_import.add_submodule_import(
-                "typing", "Dict", ImportType.STDLIB, TypingSection.TYPING
-            )
+            file_import.add_submodule_import("typing", "Dict", ImportType.STDLIB)
         file_import.add_submodule_import("copy", "deepcopy", ImportType.STDLIB)
         return file_import
 

package/autorest/codegen/models/enum_type.py

@@ -256,8 +256,10 @@ class EnumType(BaseType):
                 "models",
                 ImportType.LOCAL,
                 alias="_models",
-                typing_section=TypingSection.TYPING
-                if kwargs.get("model_typing")
-                else TypingSection.REGULAR,
+                typing_section=(
+                    TypingSection.TYPING
+                    if kwargs.get("model_typing")
+                    else TypingSection.REGULAR
+                ),
             )
         return file_import

package/autorest/codegen/models/lro_operation.py

@@ -1,3 +1,4 @@
+# pylint: disable=multiple-statements
 # -------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for
@@ -151,5 +152,4 @@ class LROOperationBase(OperationBase[LROResponseType]):
         return file_import
 
 
-class LROOperation(LROOperationBase[LROResponse]):
-    ...
+class LROOperation(LROOperationBase[LROResponse]): ...

package/autorest/codegen/models/model_type.py

@@ -165,9 +165,9 @@ class ModelType(  # pylint: disable=abstract-method
             ]
         }
         if self.discriminator and self.discriminator_value:
-            representation[
-                f'"{self.discriminator.wire_name}"'
-            ] = f'"{self.discriminator_value}"'
+            representation[f'"{self.discriminator.wire_name}"'] = (
+                f'"{self.discriminator_value}"'
+            )
 
         # once we've finished, we want to reset created_json_template_representation to false
         # so we can call it again
@@ -333,18 +333,22 @@ class GeneratedModelType(ModelType):  # pylint: disable=abstract-method
                 "models",
                 ImportType.LOCAL,
                 alias="_models",
-                typing_section=TypingSection.TYPING
-                if kwargs.get("model_typing")
-                else TypingSection.REGULAR,
+                typing_section=(
+                    TypingSection.TYPING
+                    if kwargs.get("model_typing")
+                    else TypingSection.REGULAR
+                ),
             )
             if self.is_form_data:
                 file_import.add_submodule_import(
                     relative_path,
                     "_model_base",
                     ImportType.LOCAL,
-                    typing_section=TypingSection.TYPING
-                    if kwargs.get("model_typing")
-                    else TypingSection.REGULAR,
+                    typing_section=(
+                        TypingSection.TYPING
+                        if kwargs.get("model_typing")
+                        else TypingSection.REGULAR
+                    ),
                 )
         return file_import
 

package/autorest/codegen/models/paging_operation.py

@@ -1,3 +1,4 @@
+# pylint: disable=multiple-statements
 # -------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for
@@ -182,5 +183,4 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
         return file_import
 
 
-class PagingOperation(PagingOperationBase[PagingResponse]):
-    ...
+class PagingOperation(PagingOperationBase[PagingResponse]): ...

package/autorest/codegen/models/parameter.py

@@ -227,8 +227,7 @@ class _ParameterBase(
 
     @property
     @abc.abstractmethod
-    def in_method_signature(self) -> bool:
-        ...
+    def in_method_signature(self) -> bool: ...
 
     def method_signature(self, async_mode: bool) -> str:
         type_annot = self.type_annotation(async_mode=async_mode)

package/autorest/codegen/models/primitive_types.py

@@ -228,18 +228,26 @@ class NumberType(PrimitiveType):  # pylint: disable=abstract-method
     @property
     def serialization_constraints(self) -> List[str]:
         validation_constraints = [
-            f"maximum_ex={self.maximum}"
-            if self.maximum is not None and self.exclusive_maximum
-            else None,
-            f"maximum={self.maximum}"
-            if self.maximum is not None and not self.exclusive_maximum
-            else None,
-            f"minimum_ex={self.minimum}"
-            if self.minimum is not None and self.exclusive_minimum
-            else None,
-            f"minimum={self.minimum}"
-            if self.minimum is not None and not self.exclusive_minimum
-            else None,
+            (
+                f"maximum_ex={self.maximum}"
+                if self.maximum is not None and self.exclusive_maximum
+                else None
+            ),
+            (
+                f"maximum={self.maximum}"
+                if self.maximum is not None and not self.exclusive_maximum
+                else None
+            ),
+            (
+                f"minimum_ex={self.minimum}"
+                if self.minimum is not None and self.exclusive_minimum
+                else None
+            ),
+            (
+                f"minimum={self.minimum}"
+                if self.minimum is not None and not self.exclusive_minimum
+                else None
+            ),
             f"multiple={self.multiple}" if self.multiple else None,
         ]
         return [x for x in validation_constraints if x is not None]

package/autorest/codegen/models/request_builder.py

@@ -117,12 +117,14 @@ class RequestBuilderBase(BaseBuilder[ParameterListType, List["RequestBuilder"]])
             "typing", "Any", ImportType.STDLIB, typing_section=TypingSection.CONDITIONAL
         )
         file_import.add_msrest_import(
-            relative_path="..."
-            if (
-                not self.code_model.options["builders_visibility"] == "embedded"
-                and self.group_name
-            )
-            else "..",
+            relative_path=(
+                "..."
+                if (
+                    not self.code_model.options["builders_visibility"] == "embedded"
+                    and self.group_name
+                )
+                else ".."
+            ),
             msrest_import_type=MsrestImportType.Serializer,
             typing_section=TypingSection.REGULAR,
         )
@@ -137,8 +139,7 @@ class RequestBuilderBase(BaseBuilder[ParameterListType, List["RequestBuilder"]])
     @abstractmethod
     def parameter_list_type() -> (
         Callable[[Dict[str, Any], "CodeModel"], ParameterListType]
-    ):
-        ...
+    ): ...
 
     @classmethod
     def get_name(

package/autorest/codegen/serializers/__init__.py

@@ -524,7 +524,7 @@ class JinjaSerializer(ReaderAndWriter):  # pylint: disable=abstract-method
             )
         if self.code_model.options.get("emit_cross_language_definition_file"):
             self.write_file(
-                namespace_path / Path("apiview_mapping_python.json"),
+                Path("./apiview_mapping_python.json"),
                 general_serializer.serialize_cross_language_definition_file(),
             )
 

package/autorest/codegen/serializers/builder_serializer.py

@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines
+# pylint: disable=too-many-lines,multiple-statements
 # -------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for
@@ -262,8 +262,7 @@ class _BuilderBaseSerializer(Generic[BuilderType]):  # pylint: disable=abstract-
 
     @property
     @abstractmethod
-    def _need_self_param(self) -> bool:
-        ...
+    def _need_self_param(self) -> bool: ...
 
     @property
     @abstractmethod
@@ -378,8 +377,7 @@ class _BuilderBaseSerializer(Generic[BuilderType]):  # pylint: disable=abstract-
 
     @property
     @abstractmethod
-    def _json_response_template_name(self) -> str:
-        ...
+    def _json_response_template_name(self) -> str: ...
 
     def _json_input_example_template(self, builder: BuilderType) -> List[str]:
         template: List[str] = []
@@ -525,12 +523,16 @@ class RequestBuilderSerializer(
         return self.parameter_serializer.pop_kwargs_from_signature(
             builder.parameters.kwargs_to_pop,
             check_kwarg_dict=True,
-            pop_headers_kwarg=PopKwargType.CASE_INSENSITIVE
-            if bool(builder.parameters.headers)
-            else PopKwargType.NO,
-            pop_params_kwarg=PopKwargType.CASE_INSENSITIVE
-            if bool(builder.parameters.query)
-            else PopKwargType.NO,
+            pop_headers_kwarg=(
+                PopKwargType.CASE_INSENSITIVE
+                if bool(builder.parameters.headers)
+                else PopKwargType.NO
+            ),
+            pop_params_kwarg=(
+                PopKwargType.CASE_INSENSITIVE
+                if bool(builder.parameters.query)
+                else PopKwargType.NO
+            ),
         )
 
     @staticmethod
@@ -711,16 +713,20 @@ class _OperationSerializer(
         kwargs = self.parameter_serializer.pop_kwargs_from_signature(
             kwargs_to_pop,
             check_kwarg_dict=True,
-            pop_headers_kwarg=PopKwargType.CASE_INSENSITIVE
-            if builder.has_kwargs_to_pop_with_default(
-                kwargs_to_pop, ParameterLocation.HEADER  # type: ignore
-            )
-            else PopKwargType.SIMPLE,
-            pop_params_kwarg=PopKwargType.CASE_INSENSITIVE
-            if builder.has_kwargs_to_pop_with_default(
-                kwargs_to_pop, ParameterLocation.QUERY  # type: ignore
-            )
-            else PopKwargType.SIMPLE,
+            pop_headers_kwarg=(
+                PopKwargType.CASE_INSENSITIVE
+                if builder.has_kwargs_to_pop_with_default(
+                    kwargs_to_pop, ParameterLocation.HEADER  # type: ignore
+                )
+                else PopKwargType.SIMPLE
+            ),
+            pop_params_kwarg=(
+                PopKwargType.CASE_INSENSITIVE
+                if builder.has_kwargs_to_pop_with_default(
+                    kwargs_to_pop, ParameterLocation.QUERY  # type: ignore
+                )
+                else PopKwargType.SIMPLE
+            ),
             check_client_input=not self.code_model.options["multiapi"],
             operation_name=f"('{builder.name}')" if builder.group_name == "" else "",
         )
@@ -1217,9 +1223,11 @@ class _OperationSerializer(
         retval.append(
             "    raise HttpResponseError(response=response{}{})".format(
                 error_model,
-                ", error_format=ARMErrorFormat"
-                if self.code_model.options["azure_arm"]
-                else "",
+                (
+                    ", error_format=ARMErrorFormat"
+                    if self.code_model.options["azure_arm"]
+                    else ""
+                ),
             )
         )
         return retval
@@ -1364,8 +1372,7 @@ class _OperationSerializer(
         return "await " if self.async_mode else ""
 
 
-class OperationSerializer(_OperationSerializer[Operation]):
-    ...
+class OperationSerializer(_OperationSerializer[Operation]): ...
 
 
 ############################## PAGING OPERATIONS ##############################
@@ -1552,8 +1559,7 @@ class _PagingOperationSerializer(
         return retval
 
 
-class PagingOperationSerializer(_PagingOperationSerializer[PagingOperation]):
-    ...
+class PagingOperationSerializer(_PagingOperationSerializer[PagingOperation]): ...
 
 
 ############################## LRO OPERATIONS ##############################
@@ -1682,12 +1688,16 @@ class _LROOperationSerializer(_OperationSerializer[LROOperationType]):
         retval.append("    if cls:")
         retval.append(
             "        return cls(pipeline_response, {}, {}){}".format(
-                "deserialized"
-                if builder.lro_response and builder.lro_response.type
-                else "None",
-                "response_headers"
-                if builder.lro_response and builder.lro_response.headers
-                else "{}",
+                (
+                    "deserialized"
+                    if builder.lro_response and builder.lro_response.type
+                    else "None"
+                ),
+                (
+                    "response_headers"
+                    if builder.lro_response and builder.lro_response.headers
+                    else "{}"
+                ),
                 " # type: ignore",
             )
         )
@@ -1696,8 +1706,7 @@ class _LROOperationSerializer(_OperationSerializer[LROOperationType]):
         return retval
 
 
-class LROOperationSerializer(_LROOperationSerializer[LROOperation]):
-    ...
+class LROOperationSerializer(_LROOperationSerializer[LROOperation]): ...
 
 
 ############################## LRO PAGING OPERATIONS ##############################

package/autorest/codegen/serializers/client_serializer.py

@@ -206,9 +206,9 @@ class ClientSerializer:
         send_request_signature = self._send_request_signature()
         return utils.method_signature_and_response_type_annotation_template(
             method_signature=send_request_signature,
-            response_type_annotation="Awaitable[AsyncHttpResponse]"
-            if async_mode
-            else "HttpResponse",
+            response_type_annotation=(
+                "Awaitable[AsyncHttpResponse]" if async_mode else "HttpResponse"
+            ),
         )
 
     def _example_make_call(self, async_mode: bool) -> List[str]:

package/autorest/codegen/serializers/metadata_serializer.py

@@ -66,11 +66,11 @@ def _json_serialize_imports(
                 if name_imports:
                     name_import_ordered_list = list(name_imports)
                     name_import_ordered_list.sort(
-                        key=lambda e: _to_string(e)  # type: ignore
-                        if isinstance(e, (list, tuple))
-                        else e
-                        if isinstance(e, str)
-                        else ""
+                        key=lambda e: (
+                            _to_string(e)  # type: ignore
+                            if isinstance(e, (list, tuple))
+                            else e if isinstance(e, str) else ""
+                        )
                     )
                 json_package_name_dictionary[package_name] = name_import_ordered_list
             json_import_type_dictionary[import_type_key] = json_package_name_dictionary

package/autorest/codegen/serializers/model_serializer.py

@@ -30,8 +30,7 @@ def _documentation_string(
 
 class _ModelSerializer(BaseSerializer, ABC):
     @abstractmethod
-    def imports(self) -> FileImport:
-        ...
+    def imports(self) -> FileImport: ...
 
     def serialize(self) -> str:
         # Generate the models
@@ -44,8 +43,7 @@ class _ModelSerializer(BaseSerializer, ABC):
         )
 
     @abstractmethod
-    def declare_model(self, model: ModelType) -> str:
-        ...
+    def declare_model(self, model: ModelType) -> str: ...
 
     @staticmethod
     def escape_dot(s: str):

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

@@ -13,7 +13,6 @@ import sys
 import logging
 import base64
 import re
-import copy
 import typing
 import enum
 import email.utils
@@ -347,7 +346,7 @@ _UNSET = object()
 
 class _MyMutableMapping(MutableMapping[str, typing.Any]):  # pylint: disable=unsubscriptable-object
     def __init__(self, data: typing.Dict[str, typing.Any]) -> None:
-        self._data = copy.deepcopy(data)
+        self._data = data
 
     def __contains__(self, key: typing.Any) -> bool:
         return key in self._data
@@ -605,6 +604,56 @@ class Model(_MyMutableMapping):
             }
         return v.as_dict(exclude_readonly=exclude_readonly) if hasattr(v, "as_dict") else v
 
+def _deserialize_model(model_deserializer: typing.Optional[typing.Callable], obj):
+    if _is_model(obj):
+        return obj
+    return _deserialize(model_deserializer, obj)
+
+def _deserialize_with_optional(if_obj_deserializer: typing.Optional[typing.Callable], obj):
+    if obj is None:
+        return obj
+    return _deserialize_with_callable(if_obj_deserializer, obj)
+
+def _deserialize_with_union(deserializers, obj):
+    for deserializer in deserializers:
+        try:
+            return _deserialize(deserializer, obj)
+        except DeserializationError:
+            pass
+    raise DeserializationError()
+
+def _deserialize_dict(
+    value_deserializer: typing.Optional[typing.Callable],
+    module: typing.Optional[str],
+    obj: typing.Dict[typing.Any, typing.Any],
+):
+    if obj is None:
+        return obj
+    return {
+        k: _deserialize(value_deserializer, v, module)
+        for k, v in obj.items()
+    }
+
+def _deserialize_multiple_sequence(
+    entry_deserializers: typing.List[typing.Optional[typing.Callable]],
+    module: typing.Optional[str],
+    obj,
+):
+    if obj is None:
+        return obj
+    return type(obj)(
+        _deserialize(deserializer, entry, module)
+        for entry, deserializer in zip(obj, entry_deserializers)
+    )
+
+def _deserialize_sequence(
+    deserializer: typing.Optional[typing.Callable],
+    module: typing.Optional[str],
+    obj,
+):
+    if obj is None:
+        return obj
+    return type(obj)(_deserialize(deserializer, entry, module) for entry in obj)
 
 def _get_deserialize_callable_from_annotation(  # pylint: disable=R0911, R0915, R0912
     annotation: typing.Any,
@@ -633,11 +682,6 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=R0911, R0915,
             if rf:
                 rf._is_model = True
 
-            def _deserialize_model(model_deserializer: typing.Optional[typing.Callable], obj):
-                if _is_model(obj):
-                    return obj
-                return _deserialize(model_deserializer, obj)
-
             return functools.partial(_deserialize_model, annotation)  # pyright: ignore
     except Exception:
         pass
@@ -656,11 +700,6 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=R0911, R0915,
                 next(a for a in annotation.__args__ if a != type(None)), module, rf  # pyright: ignore
             )
 
-            def _deserialize_with_optional(if_obj_deserializer: typing.Optional[typing.Callable], obj):
-                if obj is None:
-                    return obj
-                return _deserialize_with_callable(if_obj_deserializer, obj)
-
             return functools.partial(_deserialize_with_optional, if_obj_deserializer)
     except AttributeError:
         pass
@@ -674,14 +713,6 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=R0911, R0915,
         )
         ]
 
-        def _deserialize_with_union(deserializers, obj):
-            for deserializer in deserializers:
-                try:
-                    return _deserialize(deserializer, obj)
-                except DeserializationError:
-                    pass
-            raise DeserializationError()
-
         return functools.partial(_deserialize_with_union, deserializers)
 
     try:
@@ -690,20 +721,11 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=R0911, R0915,
                 annotation.__args__[1], module, rf  # pyright: ignore
             )
 
-            def _deserialize_dict(
-                value_deserializer: typing.Optional[typing.Callable],
-                obj: typing.Dict[typing.Any, typing.Any],
-            ):
-                if obj is None:
-                    return obj
-                return {
-                    k: _deserialize(value_deserializer, v, module)
-                    for k, v in obj.items()
-                }
-
+            
             return functools.partial(
                 _deserialize_dict,
                 value_deserializer,
+                module,
             )
     except (AttributeError, IndexError):
         pass
@@ -711,34 +733,18 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=R0911, R0915,
         if annotation._name in ["List", "Set", "Tuple", "Sequence"]:  # pyright: ignore
             if len(annotation.__args__) > 1:  # pyright: ignore
 
-                def _deserialize_multiple_sequence(
-                    entry_deserializers: typing.List[typing.Optional[typing.Callable]],
-                    obj,
-                ):
-                    if obj is None:
-                        return obj
-                    return type(obj)(
-                        _deserialize(deserializer, entry, module)
-                        for entry, deserializer in zip(obj, entry_deserializers)
-                    )
 
                 entry_deserializers = [
                     _get_deserialize_callable_from_annotation(dt, module, rf) for dt in annotation.__args__  # pyright: ignore
                 ]
-                return functools.partial(_deserialize_multiple_sequence, entry_deserializers)
+                return functools.partial(_deserialize_multiple_sequence, entry_deserializers, module)
             deserializer = _get_deserialize_callable_from_annotation(
                 annotation.__args__[0], module, rf  # pyright: ignore
             )
 
-            def _deserialize_sequence(
-                deserializer: typing.Optional[typing.Callable],
-                obj,
-            ):
-                if obj is None:
-                    return obj
-                return type(obj)(_deserialize(deserializer, entry, module) for entry in obj)
+            
 
-            return functools.partial(_deserialize_sequence, deserializer)
+            return functools.partial(_deserialize_sequence, deserializer, module)
     except (TypeError, IndexError, AttributeError, SyntaxError):
         pass
 

package/autorest/codegen/templates/packaging_templates/dev_requirements.txt.jinja2

@@ -1,4 +1,3 @@
--e ../../../tools/azure-devtools
 -e ../../../tools/azure-sdk-tools
 ../../core/azure-core
 {% if token_credential -%}

package/autorest/m4reformatter/__init__.py

@@ -1143,9 +1143,11 @@ class M4Reformatter(
             "name": yaml_data["language"]["default"]["name"],
             "description": yaml_data["info"].get("description"),
             "parameters": parameters,
-            "url": update_client_url(yaml_data)
-            if yaml_data.get("globalParameters")
-            else "",
+            "url": (
+                update_client_url(yaml_data)
+                if yaml_data.get("globalParameters")
+                else ""
+            ),
         }
 
     def update_yaml(self, yaml_data: Dict[str, Any]) -> None:

package/autorest/preprocess/__init__.py

@@ -69,9 +69,9 @@ def add_overload(
     content_type_param["inOverload"] = True
     content_type_param["inDocstring"] = True
     body_type_description = get_body_type_for_description(overload["bodyParameter"])
-    content_type_param[
-        "description"
-    ] = f"Body Parameter content-type. Content type parameter for {body_type_description} body."
+    content_type_param["description"] = (
+        f"Body Parameter content-type. Content type parameter for {body_type_description} body."
+    )
     content_types = yaml_data["bodyParameter"]["contentTypes"]
     if body_type["type"] == "binary" and len(content_types) > 1:
         content_types = "'" + "', '".join(content_types) + "'"
@@ -110,9 +110,9 @@ def add_overloads_for_body_param(yaml_data: Dict[str, Any]) -> None:
     content_type_param["inOverload"] = False
     content_type_param["inOverriden"] = 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
+    content_type_param["clientDefaultValue"] = (
+        None  # make it none bc it will be overriden, we depend on default of overloads
+    )
     content_type_param["optional"] = True
 
 

package/package.json

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

package/requirements.txt

@@ -1,4 +1,4 @@
-black==22.12.0
+black==24.4.0
 click==8.1.3
 docutils==0.19
 Jinja2==3.1.3