@autorest/python 6.39.0 → 6.40.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/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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.39.0",
+  "version": "6.40.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.17.0",
     "@autorest/system-requirements": "~1.0.2",
     "fs-extra": "~11.2.0",
     "tsx": "~4.19.1"