@autorest/python 6.39.0 → 6.41.0

package/generator/build/lib/pygen/black.py

@@ -69,9 +69,9 @@ class BlackScriptPlugin(Plugin):
                 pylint_disables.append("too-many-lines")
             if pylint_disables:
                 file_content = (
-                    "\n".join([lines[0] + ",".join([""] + pylint_disables)] + lines[1:])
+                    os.linesep.join([lines[0] + ",".join([""] + pylint_disables)] + lines[1:])
                     if "pylint: disable=" in lines[0]
-                    else f"# pylint: disable={','.join(pylint_disables)}\n" + file_content
+                    else f"# pylint: disable={','.join(pylint_disables)}{os.linesep}" + file_content
                 )
         self.write_file(file, file_content)
 

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

@@ -484,3 +484,7 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
 
         # No generation-subdir specified, use the namespace path directly
         return Path(*namespace.split("."))
+
+    @property
+    def has_operation_named_list(self) -> bool:
+        return any(o.name.lower() == "list" for c in self.clients for og in c.operation_groups for o in og.operations)

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

@@ -40,13 +40,9 @@ class ListType(BaseType):
         ):
             # this means we're version tolerant XML, we just return the XML element
             return self.element_type.type_annotation(**kwargs)
-        has_operation_named_list = any(
-            o.name.lower() == "list"
-            for c in self.code_model.clients
-            for og in c.operation_groups
-            for o in og.operations
-        )
-        list_type = "List" if has_operation_named_list and kwargs.get("is_operation_file") else "list"
+
+        # if there is a function named `list` we have to make sure there's no conflict with the built-in `list`
+        list_type = "List" if self.code_model.has_operation_named_list and kwargs.get("is_operation_file") else "list"
         return f"{list_type}[{self.element_type.type_annotation(**kwargs)}]"
 
     def description(self, *, is_operation_file: bool) -> str:

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

@@ -404,10 +404,6 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
         file_import.merge(self.get_request_builder_import(self.request_builder, async_mode, serialize_namespace))
         if self.overloads:
             file_import.add_submodule_import("typing", "overload", ImportType.STDLIB)
-        if self.name == "list":
-            # if there is a function named `list` we have to make sure there's no conflict with the built-in `list`
-            # not doing for dict or set yet, though we might have to later
-            file_import.define_mypy_type("List", "list")
         if self.code_model.options["models-mode"] == "dpg":
             relative_path = self.code_model.get_relative_import_path(
                 serialize_namespace, module_name="_utils.model_base"

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

@@ -96,6 +96,10 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
             return self._get_attr_name(wire_name)
         return wire_name
 
+    @property
+    def next_link_is_nested(self) -> bool:
+        return self.yaml_data.get("nextLinkIsNested", False)
+
     @property
     def item_name(self) -> str:
         wire_name = self.yaml_data["itemName"]

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

@@ -63,7 +63,7 @@ class _ParameterBase(BaseModel, abc.ABC):  # pylint: disable=too-many-instance-a
         self.wire_name: str = yaml_data.get("wireName", "")
         self.client_name: str = self.yaml_data["clientName"]
         self.optional: bool = self.yaml_data["optional"]
-        self.implementation: str = yaml_data.get("implementation", None)
+        self.implementation: Optional[str] = yaml_data.get("implementation", None)
         self.location: ParameterLocation = self.yaml_data["location"]
         self.client_default_value = self.yaml_data.get("clientDefaultValue", None)
         self.in_docstring = self.yaml_data.get("inDocstring", True)

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

@@ -1383,6 +1383,13 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
                 cont_token_property = "None"
             elif self.code_model.options["models-mode"] == "msrest":
                 cont_token_property = f"deserialized.{next_link_name} or None"
+            elif builder.next_link_is_nested:
+                next_link_name_array = next_link_name.split(".")
+                access = (
+                    "".join([f'.get("{i}", {{}})' for i in next_link_name_array[:-1]])
+                    + f'.get("{next_link_name_array[-1]}")'
+                )
+                cont_token_property = f"deserialized{access} or None"
             else:
                 cont_token_property = f'deserialized.get("{next_link_name}") or None'
         list_type = "AsyncList" if self.async_mode else "iter"

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

@@ -158,6 +158,16 @@ class MsrestModelSerializer(_ModelSerializer):
                         called_by_property=True,
                     )
                 )
+            for prop in model.properties:
+                if prop.readonly:
+                    # it will be defined in the __init__ so we need to import it
+                    file_import.merge(
+                        prop.imports(
+                            serialize_namespace=self.serialize_namespace,
+                            serialize_namespace_type=NamespaceType.MODEL,
+                            called_by_property=True,
+                        )
+                    )
 
         return file_import
 
@@ -224,7 +234,16 @@ class DpgModelSerializer(_ModelSerializer):
                 "for k, v in _flattened_input.items():",
                 "    setattr(self, k, v)",
             ]
-        return [super_call]
+        discriminator_value_setter = []
+        for prop in self.get_properties_to_declare(model):
+            if (
+                prop.is_discriminator
+                and isinstance(prop.type, (ConstantType, EnumValue))
+                and prop.type.value is not None
+            ):
+                discriminator_value_setter.append(f"self.{prop.client_name}={prop.get_declaration()}  # type: ignore")
+
+        return [super_call, *discriminator_value_setter]
 
     def imports(self) -> FileImport:
         file_import = FileImport(self.code_model)
@@ -343,17 +362,7 @@ class DpgModelSerializer(_ModelSerializer):
 
     @staticmethod
     def properties_to_pass_to_super(model: ModelType) -> str:
-        properties_to_pass_to_super = ["*args"]
-        for parent in model.parents:
-            for prop in model.properties:
-                if (
-                    prop.client_name in [prop.client_name for prop in parent.properties if prop.is_base_discriminator]
-                    and prop.is_discriminator
-                    and not prop.constant
-                    and not prop.readonly
-                ):
-                    properties_to_pass_to_super.append(f"{prop.client_name}={prop.get_declaration()}")
-        properties_to_pass_to_super.append("**kwargs")
+        properties_to_pass_to_super = ["*args", "**kwargs"]
         return ", ".join(properties_to_pass_to_super)
 
     def global_pylint_disables(self) -> str:

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

@@ -66,6 +66,11 @@ class OperationGroupsSerializer(BaseSerializer):
                     serialize_namespace_type=NamespaceType.OPERATION,
                 )
             )
+        # put here since one operation file only need one self-defined list type
+        if self.code_model.has_operation_named_list:
+            # if there is a function named `list` we have to make sure there's no conflict with the built-in `list`
+            # not doing for dict or set yet, though we might have to later
+            imports.define_mypy_type("List", "list")
 
         template = self.env.get_or_select_template("operation_groups_container.py.jinja2")
 

package/generator/build/lib/pygen/codegen/templates/packaging_templates/pyproject.toml.jinja2

@@ -43,7 +43,7 @@ dependencies = [
     {% else %}
     "isodate>={{ VERSION_MAP['isodate'] }}",
     {% endif %}
-    {% if options.get('azure_arm') %}
+    {% if options.get('azure-arm') %}
     "azure-mgmt-core>={{ VERSION_MAP['azure-mgmt-core'] }}",
     {% elif code_model.is_azure_flavor %}
     "azure-core>={{ VERSION_MAP['azure-core'] }}",

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

@@ -783,7 +783,7 @@ class Serializer:  # pylint: disable=too-many-public-methods
 
             # If dependencies is empty, try with current data class
             # It has to be a subclass of Enum anyway
-            enum_type = self.dependencies.get(data_type, data.__class__)
+            enum_type = self.dependencies.get(data_type, cast(type, data.__class__))
             if issubclass(enum_type, Enum):
                 return Serializer.serialize_enum(data, enum_obj=enum_type)
 

package/generator/build/lib/pygen/preprocess/__init__.py

@@ -213,7 +213,10 @@ class PreProcessPlugin(YamlUpdatePlugin):
             and not any(t for t in ["flattened", "groupedBy"] if body_parameter.get(t))
         ):
             origin_type = body_parameter["type"]["type"]
-            is_dpg_model = body_parameter["type"].get("base") == "dpg"
+            model_type = (
+                body_parameter["type"] if origin_type == "model" else body_parameter["type"].get("elementType", {})
+            )
+            is_dpg_model = model_type.get("base") == "dpg"
             body_parameter["type"] = {
                 "type": "combined",
                 "types": [body_parameter["type"]],
@@ -222,8 +225,15 @@ class PreProcessPlugin(YamlUpdatePlugin):
             if not (self.is_tsp and has_multi_part_content_type(body_parameter)):
                 body_parameter["type"]["types"].append(KNOWN_TYPES["binary"])
 
-            if origin_type == "model" and is_dpg_model and self.options["models-mode"] == "dpg":
-                body_parameter["type"]["types"].insert(1, KNOWN_TYPES["any-object"])
+            if self.options["models-mode"] == "dpg" and is_dpg_model:
+                if origin_type == "model":
+                    body_parameter["type"]["types"].insert(1, KNOWN_TYPES["any-object"])
+                else:
+                    # dict or list
+                    # copy the original dict / list type
+                    any_obj_list_or_dict = copy.deepcopy(body_parameter["type"]["types"][0])
+                    any_obj_list_or_dict["elementType"] = KNOWN_TYPES["any-object"]
+                    body_parameter["type"]["types"].insert(1, any_obj_list_or_dict)
             code_model["types"].append(body_parameter["type"])
 
     def pad_reserved_words(self, name: str, pad_type: PadType):

package/generator/pygen/black.py

@@ -69,9 +69,9 @@ class BlackScriptPlugin(Plugin):
                 pylint_disables.append("too-many-lines")
             if pylint_disables:
                 file_content = (
-                    "\n".join([lines[0] + ",".join([""] + pylint_disables)] + lines[1:])
+                    os.linesep.join([lines[0] + ",".join([""] + pylint_disables)] + lines[1:])
                     if "pylint: disable=" in lines[0]
-                    else f"# pylint: disable={','.join(pylint_disables)}\n" + file_content
+                    else f"# pylint: disable={','.join(pylint_disables)}{os.linesep}" + file_content
                 )
         self.write_file(file, file_content)
 

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

@@ -484,3 +484,7 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
 
         # No generation-subdir specified, use the namespace path directly
         return Path(*namespace.split("."))
+
+    @property
+    def has_operation_named_list(self) -> bool:
+        return any(o.name.lower() == "list" for c in self.clients for og in c.operation_groups for o in og.operations)

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

@@ -40,13 +40,9 @@ class ListType(BaseType):
         ):
             # this means we're version tolerant XML, we just return the XML element
             return self.element_type.type_annotation(**kwargs)
-        has_operation_named_list = any(
-            o.name.lower() == "list"
-            for c in self.code_model.clients
-            for og in c.operation_groups
-            for o in og.operations
-        )
-        list_type = "List" if has_operation_named_list and kwargs.get("is_operation_file") else "list"
+
+        # if there is a function named `list` we have to make sure there's no conflict with the built-in `list`
+        list_type = "List" if self.code_model.has_operation_named_list and kwargs.get("is_operation_file") else "list"
         return f"{list_type}[{self.element_type.type_annotation(**kwargs)}]"
 
     def description(self, *, is_operation_file: bool) -> str:

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

@@ -404,10 +404,6 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
         file_import.merge(self.get_request_builder_import(self.request_builder, async_mode, serialize_namespace))
         if self.overloads:
             file_import.add_submodule_import("typing", "overload", ImportType.STDLIB)
-        if self.name == "list":
-            # if there is a function named `list` we have to make sure there's no conflict with the built-in `list`
-            # not doing for dict or set yet, though we might have to later
-            file_import.define_mypy_type("List", "list")
         if self.code_model.options["models-mode"] == "dpg":
             relative_path = self.code_model.get_relative_import_path(
                 serialize_namespace, module_name="_utils.model_base"

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

@@ -96,6 +96,10 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
             return self._get_attr_name(wire_name)
         return wire_name
 
+    @property
+    def next_link_is_nested(self) -> bool:
+        return self.yaml_data.get("nextLinkIsNested", False)
+
     @property
     def item_name(self) -> str:
         wire_name = self.yaml_data["itemName"]

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

@@ -63,7 +63,7 @@ class _ParameterBase(BaseModel, abc.ABC):  # pylint: disable=too-many-instance-a
         self.wire_name: str = yaml_data.get("wireName", "")
         self.client_name: str = self.yaml_data["clientName"]
         self.optional: bool = self.yaml_data["optional"]
-        self.implementation: str = yaml_data.get("implementation", None)
+        self.implementation: Optional[str] = yaml_data.get("implementation", None)
         self.location: ParameterLocation = self.yaml_data["location"]
         self.client_default_value = self.yaml_data.get("clientDefaultValue", None)
         self.in_docstring = self.yaml_data.get("inDocstring", True)

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

@@ -1383,6 +1383,13 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
                 cont_token_property = "None"
             elif self.code_model.options["models-mode"] == "msrest":
                 cont_token_property = f"deserialized.{next_link_name} or None"
+            elif builder.next_link_is_nested:
+                next_link_name_array = next_link_name.split(".")
+                access = (
+                    "".join([f'.get("{i}", {{}})' for i in next_link_name_array[:-1]])
+                    + f'.get("{next_link_name_array[-1]}")'
+                )
+                cont_token_property = f"deserialized{access} or None"
             else:
                 cont_token_property = f'deserialized.get("{next_link_name}") or None'
         list_type = "AsyncList" if self.async_mode else "iter"

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

@@ -158,6 +158,16 @@ class MsrestModelSerializer(_ModelSerializer):
                         called_by_property=True,
                     )
                 )
+            for prop in model.properties:
+                if prop.readonly:
+                    # it will be defined in the __init__ so we need to import it
+                    file_import.merge(
+                        prop.imports(
+                            serialize_namespace=self.serialize_namespace,
+                            serialize_namespace_type=NamespaceType.MODEL,
+                            called_by_property=True,
+                        )
+                    )
 
         return file_import
 
@@ -224,7 +234,16 @@ class DpgModelSerializer(_ModelSerializer):
                 "for k, v in _flattened_input.items():",
                 "    setattr(self, k, v)",
             ]
-        return [super_call]
+        discriminator_value_setter = []
+        for prop in self.get_properties_to_declare(model):
+            if (
+                prop.is_discriminator
+                and isinstance(prop.type, (ConstantType, EnumValue))
+                and prop.type.value is not None
+            ):
+                discriminator_value_setter.append(f"self.{prop.client_name}={prop.get_declaration()}  # type: ignore")
+
+        return [super_call, *discriminator_value_setter]
 
     def imports(self) -> FileImport:
         file_import = FileImport(self.code_model)
@@ -343,17 +362,7 @@ class DpgModelSerializer(_ModelSerializer):
 
     @staticmethod
     def properties_to_pass_to_super(model: ModelType) -> str:
-        properties_to_pass_to_super = ["*args"]
-        for parent in model.parents:
-            for prop in model.properties:
-                if (
-                    prop.client_name in [prop.client_name for prop in parent.properties if prop.is_base_discriminator]
-                    and prop.is_discriminator
-                    and not prop.constant
-                    and not prop.readonly
-                ):
-                    properties_to_pass_to_super.append(f"{prop.client_name}={prop.get_declaration()}")
-        properties_to_pass_to_super.append("**kwargs")
+        properties_to_pass_to_super = ["*args", "**kwargs"]
         return ", ".join(properties_to_pass_to_super)
 
     def global_pylint_disables(self) -> str:

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

@@ -66,6 +66,11 @@ class OperationGroupsSerializer(BaseSerializer):
                     serialize_namespace_type=NamespaceType.OPERATION,
                 )
             )
+        # put here since one operation file only need one self-defined list type
+        if self.code_model.has_operation_named_list:
+            # if there is a function named `list` we have to make sure there's no conflict with the built-in `list`
+            # not doing for dict or set yet, though we might have to later
+            imports.define_mypy_type("List", "list")
 
         template = self.env.get_or_select_template("operation_groups_container.py.jinja2")
 

package/generator/pygen/codegen/templates/packaging_templates/pyproject.toml.jinja2

@@ -43,7 +43,7 @@ dependencies = [
     {% else %}
     "isodate>={{ VERSION_MAP['isodate'] }}",
     {% endif %}
-    {% if options.get('azure_arm') %}
+    {% if options.get('azure-arm') %}
     "azure-mgmt-core>={{ VERSION_MAP['azure-mgmt-core'] }}",
     {% elif code_model.is_azure_flavor %}
     "azure-core>={{ VERSION_MAP['azure-core'] }}",

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

@@ -783,7 +783,7 @@ class Serializer:  # pylint: disable=too-many-public-methods
 
             # If dependencies is empty, try with current data class
             # It has to be a subclass of Enum anyway
-            enum_type = self.dependencies.get(data_type, data.__class__)
+            enum_type = self.dependencies.get(data_type, cast(type, data.__class__))
             if issubclass(enum_type, Enum):
                 return Serializer.serialize_enum(data, enum_obj=enum_type)
 

package/generator/pygen/preprocess/__init__.py

@@ -213,7 +213,10 @@ class PreProcessPlugin(YamlUpdatePlugin):
             and not any(t for t in ["flattened", "groupedBy"] if body_parameter.get(t))
         ):
             origin_type = body_parameter["type"]["type"]
-            is_dpg_model = body_parameter["type"].get("base") == "dpg"
+            model_type = (
+                body_parameter["type"] if origin_type == "model" else body_parameter["type"].get("elementType", {})
+            )
+            is_dpg_model = model_type.get("base") == "dpg"
             body_parameter["type"] = {
                 "type": "combined",
                 "types": [body_parameter["type"]],
@@ -222,8 +225,15 @@ class PreProcessPlugin(YamlUpdatePlugin):
             if not (self.is_tsp and has_multi_part_content_type(body_parameter)):
                 body_parameter["type"]["types"].append(KNOWN_TYPES["binary"])
 
-            if origin_type == "model" and is_dpg_model and self.options["models-mode"] == "dpg":
-                body_parameter["type"]["types"].insert(1, KNOWN_TYPES["any-object"])
+            if self.options["models-mode"] == "dpg" and is_dpg_model:
+                if origin_type == "model":
+                    body_parameter["type"]["types"].insert(1, KNOWN_TYPES["any-object"])
+                else:
+                    # dict or list
+                    # copy the original dict / list type
+                    any_obj_list_or_dict = copy.deepcopy(body_parameter["type"]["types"][0])
+                    any_obj_list_or_dict["elementType"] = KNOWN_TYPES["any-object"]
+                    body_parameter["type"]["types"].insert(1, any_obj_list_or_dict)
             code_model["types"].append(body_parameter["type"])
 
     def pad_reserved_words(self, name: str, pad_type: PadType):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.39.0",
+  "version": "6.41.0",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {
@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md",
   "dependencies": {
-    "@typespec/http-client-python": "~0.16.0",
+    "@typespec/http-client-python": "~0.18.0",
     "@autorest/system-requirements": "~1.0.2",
     "fs-extra": "~11.2.0",
     "tsx": "~4.19.1"