@autorest/python 5.19.0 → 6.0.1

package/autorest/postprocess/__init__.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import Tuple
+from typing import Tuple, Any, Dict
 from pathlib import Path
 import os
 import shutil
@@ -11,7 +11,7 @@ from venv import EnvBuilder
 import black
 from .venvtools import ExtendedEnvBuilder, python_run
 
-from .. import Plugin
+from .. import Plugin, PluginAutorest
 
 _BLACK_MODE = black.Mode()
 _BLACK_MODE.line_length = 120
@@ -29,10 +29,10 @@ def format_file(file: Path, file_content: str) -> str:
     return file_content
 
 
-class PostProcessPlugin(Plugin):
-    def __init__(self, autorestapi):
-        super().__init__(autorestapi)
-        output_folder_uri = self._autorestapi.get_value("outputFolderUri")
+class PostProcessPlugin(Plugin):  # pylint: disable=abstract-method
+    def __init__(self, **kwargs: Any):
+        super().__init__(**kwargs)
+        output_folder_uri = self.options["outputFolderUri"]
         if output_folder_uri.startswith("file:"):
             output_folder_uri = output_folder_uri[5:]
         if os.name == "nt" and output_folder_uri.startswith("///"):
@@ -65,9 +65,7 @@ class PostProcessPlugin(Plugin):
         try:
             init_file = next(d for d in dir.iterdir() if d.name == "__init__.py")
             # we don't care about pkgutil inits, we skip over them
-            file_content = self._autorestapi.read_file(
-                init_file.relative_to(self.output_folder)
-            )
+            file_content = self.read_file(init_file.relative_to(self.output_folder))
             if not "pkgutil" in file_content:
                 return dir, namespace
         except StopIteration:
@@ -157,7 +155,7 @@ class PostProcessPlugin(Plugin):
             k: None for k in customized_objects_str.split(",")
         }.keys()  # filter out duplicates
         file = (folder_path / "__init__.py").relative_to(self.output_folder)
-        file_content = self._autorestapi.read_file(file)
+        file_content = self.read_file(file)
         added_objs = []
         for obj in customized_objects:
             if f" import {obj}\n" in file_content:
@@ -199,4 +197,9 @@ class PostProcessPlugin(Plugin):
                 "__all__ = [", f"__all__ = [\n{added_objs_all}", 1
             )
         formatted_file = format_file(file, file_content)
-        self._autorestapi.write_file(file, formatted_file)
+        self.write_file(file, formatted_file)
+
+
+class PostProcessPluginAutorest(PostProcessPlugin, PluginAutorest):
+    def get_options(self) -> Dict[str, Any]:
+        return {"outputFolderUri": self._autorestapi.get_value("outputFolderUri")}

package/autorest/preprocess/__init__.py

@@ -9,7 +9,17 @@ from typing import Callable, Dict, Any, List, Optional
 from .helpers import to_snake_case, pad_reserved_words, add_redefined_builtin_info
 from .python_mappings import PadType
 
-from .. import YamlUpdatePlugin
+from .. import YamlUpdatePlugin, PluginAutorest
+
+
+def _remove_paging_maxpagesize(yaml_data: Dict[str, Any]) -> None:
+    # we don't expose maxpagesize for version tolerant generation
+    # users should be passing this into `by_page`
+    yaml_data["parameters"] = [
+        p
+        for p in yaml_data.get("parameters", [])
+        if p["restApiName"].lower() not in ["maxpagesize", "$maxpagesize"]
+    ]
 
 
 def update_description(
@@ -82,9 +92,13 @@ def update_paging_response(yaml_data: Dict[str, Any]) -> None:
     )
 
 
-class PreProcessPlugin(YamlUpdatePlugin):
+class PreProcessPlugin(YamlUpdatePlugin):  # pylint: disable=abstract-method
     """Add Python naming information."""
 
+    @property
+    def version_tolerant(self) -> bool:
+        return self.options.get("version-tolerant", True)
+
     def get_operation_updater(
         self, yaml_data: Dict[str, Any]
     ) -> Callable[[Dict[str, Any]], None]:
@@ -119,7 +133,7 @@ class PreProcessPlugin(YamlUpdatePlugin):
             response["discriminator"] = "operation"
 
     def _update_lro_operation_helper(self, yaml_data: Dict[str, Any]) -> None:
-        azure_arm = self._autorestapi.get_boolean_value("azure-arm", False)
+        azure_arm = self.options.get("azure-arm", False)
         for response in yaml_data.get("responses", []):
             response["discriminator"] = "lro"
             response["pollerSync"] = (
@@ -144,13 +158,16 @@ class PreProcessPlugin(YamlUpdatePlugin):
     def update_lro_paging_operation(self, yaml_data: Dict[str, Any]) -> None:
         self.update_lro_operation(yaml_data)
         self.update_paging_operation(yaml_data)
+        yaml_data["discriminator"] = "lropaging"
         for response in yaml_data.get("responses", []):
             response["discriminator"] = "lropaging"
+        for overload in yaml_data.get("overloads", []):
+            self.update_lro_paging_operation(overload)
 
     def update_lro_operation(self, yaml_data: Dict[str, Any]) -> None:
         self.update_operation(yaml_data)
         self._update_lro_operation_helper(yaml_data)
-        for overload in yaml_data["overloads"]:
+        for overload in yaml_data.get("overloads", []):
             self._update_lro_operation_helper(overload)
 
     def update_paging_operation(self, yaml_data: Dict[str, Any]) -> None:
@@ -164,15 +181,18 @@ class PreProcessPlugin(YamlUpdatePlugin):
             if yaml_data.get("nextOperation")
             else yaml_data["responses"][0]
         )
-        # if we're in version tolerant, hide the paging model
-        if self._autorestapi.get_boolean_value("version-tolerant"):
+        if self.version_tolerant:
+            # if we're in version tolerant, hide the paging model
             returned_response_object["type"]["isPublic"] = False
+            _remove_paging_maxpagesize(yaml_data)
         item_type = next(
             p["type"]["elementType"]
             for p in returned_response_object["type"]["properties"]
-            if p["restApiName"] == yaml_data["itemName"]
+            if p["restApiName"] == (yaml_data.get("itemName") or "value")
         )
         if yaml_data.get("nextOperation"):
+            if self.version_tolerant:
+                _remove_paging_maxpagesize(yaml_data["nextOperation"])
             yaml_data["nextOperation"]["groupName"] = pad_reserved_words(
                 yaml_data["nextOperation"]["groupName"], PadType.OPERATION_GROUP
             )
@@ -208,3 +228,12 @@ class PreProcessPlugin(YamlUpdatePlugin):
         update_client(yaml_data["client"])
         update_types(yaml_data["types"])
         self.update_operation_groups(yaml_data)
+
+
+class PreProcessPluginAutorest(PluginAutorest, PreProcessPlugin):
+    def get_options(self) -> Dict[str, Any]:
+        options = {
+            "version-tolerant": self._autorestapi.get_boolean_value("version-tolerant"),
+            "azure-arm": self._autorestapi.get_boolean_value("azure-arm"),
+        }
+        return {k: v for k, v in options.items() if v is not None}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@autorest/python",
-    "version": "5.19.0",
+    "version": "6.0.1",
     "description": "The Python extension for generators in AutoRest.",
     "scripts": {
         "prepare": "node run-python3.js prepare.py",
@@ -27,7 +27,7 @@
         "@autorest/system-requirements": "~1.0.0"
     },
     "devDependencies": {
-        "@microsoft.azure/autorest.testserver": "^3.3.28"
+        "@microsoft.azure/autorest.testserver": "^3.3.31"
     },
     "files": [
         "autorest/**/*.py",

package/autorest/codegen/serializers/model_generic_serializer.py

@@ -1,32 +0,0 @@
-# -------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-# --------------------------------------------------------------------------
-from typing import List
-from jinja2 import Environment
-from .model_base_serializer import ModelBaseSerializer
-from ..models import ModelType, CodeModel, Property
-
-
-class ModelGenericSerializer(ModelBaseSerializer):
-    def __init__(self, code_model: CodeModel, env: Environment) -> None:
-        super().__init__(code_model=code_model, env=env, is_python3_file=False)
-
-    def init_line(self, model: ModelType) -> List[str]:
-        return []
-
-    def properties_to_pass_to_super(self, model: ModelType) -> str:
-        return "**kwargs"
-
-    def required_property_no_default_init(self, prop: Property) -> str:
-        return f"self.{prop.client_name} = kwargs['{prop.client_name}']"
-
-    def optional_property_init(self, prop: Property) -> str:
-        return f"self.{prop.client_name} = kwargs.get('{prop.client_name}', {prop.client_default_value_declaration})"
-
-    def initialize_standard_arg(self, prop: Property) -> str:
-        return self.initialize_standard_property(prop)
-
-    def super_call_template(self, model: ModelType) -> str:
-        return "super(" + model.name + ", self).__init__({})"

package/autorest/codegen/serializers/model_python3_serializer.py

@@ -1,72 +0,0 @@
-# -------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-# --------------------------------------------------------------------------
-from typing import List
-from jinja2 import Environment
-from .model_base_serializer import ModelBaseSerializer
-from ..models import ModelType, CodeModel, Property
-from ..models.imports import FileImport
-
-
-class ModelPython3Serializer(ModelBaseSerializer):
-    def __init__(self, code_model: CodeModel, env: Environment) -> None:
-        super().__init__(code_model=code_model, env=env, is_python3_file=True)
-
-    def init_line(self, model: ModelType) -> List[str]:
-        init_properties_declaration = []
-        init_line_parameters = [
-            p
-            for p in model.properties
-            if not p.readonly and not p.is_discriminator and not p.constant
-        ]
-        init_line_parameters.sort(key=lambda x: x.optional)
-        if init_line_parameters:
-            init_properties_declaration.append("*,")
-        for param in init_line_parameters:
-            init_properties_declaration.append(self.initialize_standard_property(param))
-
-        return init_properties_declaration
-
-    def properties_to_pass_to_super(self, model: ModelType) -> str:
-        properties_to_pass_to_super = []
-        for parent in model.parents:
-            for prop in model.properties:
-                if (
-                    prop in parent.properties
-                    and not prop.is_discriminator
-                    and not prop.constant
-                    and not prop.readonly
-                ):
-                    properties_to_pass_to_super.append(
-                        f"{prop.client_name}={prop.client_name}"
-                    )
-        properties_to_pass_to_super.append("**kwargs")
-        return ", ".join(properties_to_pass_to_super)
-
-    def required_property_no_default_init(self, prop: Property) -> str:
-        return f"{prop.client_name}: {prop.type_annotation()},{prop.pylint_disable}"
-
-    def optional_property_init(self, prop: Property) -> str:
-        return (
-            f"{prop.client_name}: {prop.type_annotation()} = "
-            f"{prop.client_default_value_declaration},{prop.pylint_disable}"
-        )
-
-    def initialize_standard_arg(self, prop: Property) -> str:
-        return f"self.{prop.client_name} = {prop.client_name}"
-
-    def super_call_template(self, model: ModelType) -> str:
-        return "super().__init__({})"
-
-    def imports(self) -> FileImport:
-        file_import = super(ModelPython3Serializer, self).imports()
-        for model in self.code_model.model_types:
-            init_line_parameters = [
-                p for p in model.properties if not p.readonly and not p.is_discriminator
-            ]
-            for param in init_line_parameters:
-                file_import.merge(param.imports())
-
-        return file_import