@autorest/python 6.14.3 → 6.15.0

package/autorest/__init__.py

@@ -5,59 +5,18 @@
 # --------------------------------------------------------------------------
 import logging
 from pathlib import Path
-import json
-from abc import ABC, abstractmethod
+from abc import abstractmethod
 from typing import Any, Dict, Union, List
 
 import yaml
 
+from pygen import ReaderAndWriter, Plugin, YamlUpdatePlugin
 from .jsonrpc import AutorestAPI
-from ._version import VERSION
 
 
-__version__ = VERSION
 _LOGGER = logging.getLogger(__name__)
 
 
-class ReaderAndWriter:
-    def __init__(self, *, output_folder: Union[str, Path], **kwargs: Any) -> None:
-        self.output_folder = Path(output_folder)
-        self._list_file: List[str] = []
-        try:
-            with open(
-                Path(self.output_folder) / Path("..") / Path("python.json"),
-                "r",
-                encoding="utf-8-sig",
-            ) as fd:
-                python_json = json.load(fd)
-        except Exception:  # pylint: disable=broad-except
-            python_json = {}
-        self.options = kwargs
-        if python_json:
-            _LOGGER.warning("Loading python.json file. This behavior will be depreacted")
-        self.options.update(python_json)
-
-    def read_file(self, path: Union[str, Path]) -> str:
-        """Directly reading from disk"""
-        # make path relative to output folder
-        try:
-            with open(self.output_folder / Path(path), "r", encoding="utf-8-sig") as fd:
-                return fd.read()
-        except FileNotFoundError:
-            return ""
-
-    def write_file(self, filename: Union[str, Path], file_content: str) -> None:
-        """Directly writing to disk"""
-        file_folder = Path(filename).parent
-        if not Path.is_dir(self.output_folder / file_folder):
-            Path.mkdir(self.output_folder / file_folder, parents=True)
-        with open(self.output_folder / Path(filename), "w", encoding="utf-8") as fd:
-            fd.write(file_content)
-
-    def list_file(self) -> List[str]:
-        return [str(f) for f in self.output_folder.glob("**/*") if f.is_file()]
-
-
 class ReaderAndWriterAutorest(ReaderAndWriter):
     def __init__(self, *, output_folder: Union[str, Path], autorestapi: AutorestAPI) -> None:
         super().__init__(output_folder=output_folder)
@@ -73,23 +32,6 @@ class ReaderAndWriterAutorest(ReaderAndWriter):
         return self._autorestapi.list_inputs()
 
 
-class Plugin(ReaderAndWriter, ABC):
-    """A base class for autorest plugin.
-
-    :param autorestapi: An autorest API instance
-    """
-
-    @abstractmethod
-    def process(self) -> bool:
-        """The plugin process.
-
-        :rtype: bool
-        :returns: True if everything's ok, False optherwise
-        :raises Exception: Could raise any exception, stacktrace will be sent to autorest API
-        """
-        raise NotImplementedError()
-
-
 class PluginAutorest(Plugin, ReaderAndWriterAutorest):
     """For our Autorest plugins, we want to take autorest api as input as options, then pass it to the Plugin"""
 
@@ -102,39 +44,6 @@ class PluginAutorest(Plugin, ReaderAndWriterAutorest):
         """Get the options bag using the AutorestAPI that we send to the parent plugin"""
 
 
-class YamlUpdatePlugin(Plugin):
-    """A plugin that update the YAML as input."""
-
-    def get_yaml(self) -> Dict[str, Any]:
-        # cadl file doesn't have to be relative to output folder
-        with open(self.options["cadl_file"], "r", encoding="utf-8-sig") as fd:
-            return yaml.safe_load(fd.read())
-
-    def write_yaml(self, yaml_string: str) -> None:
-        with open(self.options["cadl_file"], "w", encoding="utf-8-sig") as fd:
-            fd.write(yaml_string)
-
-    def process(self) -> bool:
-        # List the input file, should be only one
-        yaml_data = self.get_yaml()
-
-        self.update_yaml(yaml_data)
-
-        yaml_string = yaml.safe_dump(yaml_data)
-
-        self.write_yaml(yaml_string)
-        return True
-
-    @abstractmethod
-    def update_yaml(self, yaml_data: Dict[str, Any]) -> None:
-        """The code-model-v4-no-tags yaml model tree.
-
-        :rtype: updated yaml
-        :raises Exception: Could raise any exception, stacktrace will be sent to autorest API
-        """
-        raise NotImplementedError()
-
-
 class YamlUpdatePluginAutorest(YamlUpdatePlugin, PluginAutorest):  # pylint: disable=abstract-method
     def get_yaml(self) -> Dict[str, Any]:
         return yaml.safe_load(self.read_file("code-model-v4-no-tags.yaml"))

package/autorest/black.py

@@ -0,0 +1,13 @@
+# -------------------------------------------------------------------------
+# 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 Dict, Any
+from pygen.black import BlackScriptPlugin
+from . import PluginAutorest
+
+
+class BlackScriptPluginAutorest(BlackScriptPlugin, PluginAutorest):
+    def get_options(self) -> Dict[str, Any]:
+        return {"output_folder": self._autorestapi.get_value("outputFolderUri")}

package/autorest/codegen.py

@@ -0,0 +1,117 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+import logging
+from typing import Dict, Any, Union
+from pathlib import Path
+import yaml
+
+from pygen.codegen import CodeGenerator
+from pygen.codegen.models import CodeModel
+from pygen.codegen.serializers import JinjaSerializer
+
+from . import ReaderAndWriterAutorest
+from .jsonrpc import AutorestAPI
+from . import PluginAutorest
+
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class JinjaSerializerAutorest(JinjaSerializer, ReaderAndWriterAutorest):
+    def __init__(
+        self,
+        autorestapi: AutorestAPI,
+        code_model: CodeModel,
+        *,
+        output_folder: Union[str, Path],
+        **kwargs: Any,
+    ) -> None:
+        super().__init__(  # type: ignore
+            autorestapi=autorestapi,
+            code_model=code_model,
+            output_folder=output_folder,
+            **kwargs,
+        )
+
+
+class CodeGeneratorAutorest(CodeGenerator, PluginAutorest):
+    def get_options(self) -> Dict[str, Any]:
+        if self._autorestapi.get_boolean_value("python3-only") is False:
+            _LOGGER.warning("You have passed in --python3-only=False. We have force overriden this to True.")
+        if self._autorestapi.get_boolean_value("add-python3-operation-files"):
+            _LOGGER.warning(
+                "You have passed in --add-python3-operation-files. "
+                "This flag no longer has an effect bc all SDKs are now Python3 only."
+            )
+        if self._autorestapi.get_boolean_value("reformat-next-link"):
+            _LOGGER.warning(
+                "You have passed in --reformat-next-link. We have force overriden "
+                "this to False because we no longer reformat initial query parameters into next "
+                "calls unless explicitly defined in the service definition."
+            )
+        options = {
+            "azure-arm": self._autorestapi.get_boolean_value("azure-arm"),
+            "header-text": self._autorestapi.get_value("header-text"),
+            "low-level-client": self._autorestapi.get_boolean_value("low-level-client", False),
+            "version-tolerant": self._autorestapi.get_boolean_value("version-tolerant", True),
+            "show-operations": self._autorestapi.get_boolean_value("show-operations"),
+            "python3-only": self._autorestapi.get_boolean_value("python3-only"),
+            "head-as-boolean": self._autorestapi.get_boolean_value("head-as-boolean", False),
+            "keep-version-file": self._autorestapi.get_boolean_value("keep-version-file"),
+            "no-async": self._autorestapi.get_boolean_value("no-async"),
+            "no-namespace-folders": self._autorestapi.get_boolean_value("no-namespace-folders"),
+            "basic-setup-py": self._autorestapi.get_boolean_value("basic-setup-py"),
+            "package-name": self._autorestapi.get_value("package-name"),
+            "package-version": self._autorestapi.get_value("package-version"),
+            "client-side-validation": self._autorestapi.get_boolean_value("client-side-validation"),
+            "tracing": self._autorestapi.get_boolean_value("trace"),
+            "multiapi": self._autorestapi.get_boolean_value("multiapi", False),
+            "polymorphic-examples": self._autorestapi.get_value("polymorphic-examples"),
+            "models-mode": self._autorestapi.get_value("models-mode"),
+            "builders-visibility": self._autorestapi.get_value("builders-visibility"),
+            "show-send-request": self._autorestapi.get_boolean_value("show-send-request"),
+            "only-path-and-body-params-positional": self._autorestapi.get_boolean_value(
+                "only-path-and-body-params-positional"
+            ),
+            "combine-operation-files": self._autorestapi.get_boolean_value("combine-operation-files"),
+            "package-mode": self._autorestapi.get_value("package-mode"),
+            "package-pprint-name": self._autorestapi.get_value("package-pprint-name"),
+            "packaging-files-config": self._autorestapi.get_value("package-configuration"),
+            "default-optional-constants-to-none": self._autorestapi.get_boolean_value(
+                "default-optional-constants-to-none"
+            ),
+            "generate-sample": self._autorestapi.get_boolean_value("generate-sample"),
+            "generate-test": self._autorestapi.get_boolean_value("generate-test"),
+            "default-api-version": self._autorestapi.get_value("default-api-version"),
+        }
+        return {k: v for k, v in options.items() if v is not None}
+
+    def get_yaml(self) -> Dict[str, Any]:
+        inputs = self._autorestapi.list_inputs()
+        _LOGGER.debug("Possible Inputs: %s", inputs)
+        if "code-model-v4-no-tags.yaml" not in inputs:
+            raise ValueError("code-model-v4-no-tags.yaml must be a possible input")
+
+        if self._autorestapi.get_value("input-yaml"):
+            input_yaml = self._autorestapi.get_value("input-yaml")
+            file_content = self._autorestapi.read_file(input_yaml)
+        else:
+            inputs = self._autorestapi.list_inputs()
+            _LOGGER.debug("Possible Inputs: %s", inputs)
+            if "code-model-v4-no-tags.yaml" not in inputs:
+                raise ValueError("code-model-v4-no-tags.yaml must be a possible input")
+
+            file_content = self._autorestapi.read_file("code-model-v4-no-tags.yaml")
+
+        # Parse the received YAML
+        return yaml.safe_load(file_content)
+
+    def get_serializer(self, code_model: CodeModel):
+        return JinjaSerializerAutorest(
+            self._autorestapi,
+            code_model,
+            output_folder=self.output_folder,
+        )

package/autorest/m2r.py

@@ -0,0 +1,16 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+"""An autorest MD to RST plugin.
+"""
+from typing import Any, Dict
+
+from pygen.m2r import M2R
+from . import YamlUpdatePluginAutorest
+
+
+class M2RAutorest(YamlUpdatePluginAutorest, M2R):
+    def get_options(self) -> Dict[str, Any]:
+        return {}

package/autorest/m4reformatter/__init__.py

@@ -11,7 +11,7 @@ import copy
 import logging
 from typing import Callable, Dict, Any, Iterable, List, Optional, Set
 
-from .._utils import (
+from pygen.utils import (
     to_snake_case,
     KNOWN_TYPES,
     get_body_type_for_description,

package/autorest/multiapi/__init__.py

@@ -10,12 +10,13 @@ import json
 from collections import defaultdict
 from pathlib import Path
 from typing import Dict, List, Optional, cast, Any
+from pygen import Plugin, ReaderAndWriter
 
 from .serializers import MultiAPISerializer, MultiAPISerializerAutorest
 from .models import CodeModel
 from .utils import _get_default_api_version_from_list
 
-from .. import Plugin, PluginAutorest, ReaderAndWriter, ReaderAndWriterAutorest
+from .. import PluginAutorest, ReaderAndWriterAutorest
 
 _LOGGER = logging.getLogger(__name__)
 

package/autorest/multiapi/serializers/__init__.py

@@ -6,13 +6,15 @@
 from pathlib import Path
 from typing import Any, Optional, Union, List
 from jinja2 import PackageLoader, Environment
+from pygen import ReaderAndWriter
+from pygen.utils import build_policies
 
 from .import_serializer import FileImportSerializer
 
 from ...jsonrpc import AutorestAPI
 from ..models import CodeModel, GlobalParameter
-from ... import ReaderAndWriter, ReaderAndWriterAutorest
-from ..._utils import build_policies
+from ... import ReaderAndWriterAutorest
+
 
 __all__ = [
     "MultiAPISerializer",
@@ -123,7 +125,7 @@ class MultiAPISerializer(ReaderAndWriter):  # pylint: disable=abstract-method
 
         if not code_model.client.client_side_validation:
             codegen_env = Environment(
-                loader=PackageLoader("autorest.codegen", "templates"),
+                loader=PackageLoader("pygen.codegen", "templates"),
                 keep_trailing_newline=True,
                 line_statement_prefix="##",
                 line_comment_prefix="###",

package/autorest/multiclient/__init__.py

@@ -7,7 +7,8 @@ import logging
 from typing import Any, Dict
 from pathlib import Path
 from jinja2 import Environment, PackageLoader
-from .. import Plugin, PluginAutorest
+from pygen import Plugin
+from .. import PluginAutorest
 
 _LOGGER = logging.getLogger(__name__)
 

package/autorest/postprocess.py

@@ -0,0 +1,14 @@
+# -------------------------------------------------------------------------
+# 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 Any, Dict
+
+from pygen.postprocess import PostProcessPlugin
+from . import PluginAutorest
+
+
+class PostProcessPluginAutorest(PostProcessPlugin, PluginAutorest):
+    def get_options(self) -> Dict[str, Any]:
+        return {"outputFolderUri": self._autorestapi.get_value("outputFolderUri")}

package/autorest/preprocess.py

@@ -0,0 +1,20 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+"""The preprocessing autorest plugin.
+"""
+from typing import Dict, Any
+from pygen.preprocess import PreProcessPlugin
+from . import YamlUpdatePluginAutorest
+
+
+class PreProcessPluginAutorest(YamlUpdatePluginAutorest, 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"),
+            "models-mode": self._autorestapi.get_value("models-mode"),
+        }
+        return {k: v for k, v in options.items() if v is not None}

package/generator/LICENSE

@@ -0,0 +1,21 @@
+    MIT License
+
+    Copyright (c) Microsoft Corporation. All rights reserved.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE

package/generator/README.md

@@ -0,0 +1 @@
+# Core Library for Python Generation

package/generator/dev_requirements.txt

@@ -0,0 +1,5 @@
+-e ./generator
+-r ../../../eng/requirements.txt
+-r ../../../eng/dev_requirements.txt
+ptvsd==4.3.2
+types-PyYAML==6.0.12.8

package/generator/pygen/__init__.py

@@ -0,0 +1,107 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+import logging
+from pathlib import Path
+import json
+from abc import ABC, abstractmethod
+from typing import Any, Dict, Union, List
+
+import yaml
+
+from ._version import VERSION
+
+
+__version__ = VERSION
+_LOGGER = logging.getLogger(__name__)
+
+
+class ReaderAndWriter:
+    def __init__(self, *, output_folder: Union[str, Path], **kwargs: Any) -> None:
+        self.output_folder = Path(output_folder)
+        self._list_file: List[str] = []
+        try:
+            with open(
+                Path(self.output_folder) / Path("..") / Path("python.json"),
+                "r",
+                encoding="utf-8-sig",
+            ) as fd:
+                python_json = json.load(fd)
+        except Exception:  # pylint: disable=broad-except
+            python_json = {}
+        self.options = kwargs
+        if python_json:
+            _LOGGER.warning("Loading python.json file. This behavior will be depreacted")
+        self.options.update(python_json)
+
+    def read_file(self, path: Union[str, Path]) -> str:
+        """Directly reading from disk"""
+        # make path relative to output folder
+        try:
+            with open(self.output_folder / Path(path), "r", encoding="utf-8-sig") as fd:
+                return fd.read()
+        except FileNotFoundError:
+            return ""
+
+    def write_file(self, filename: Union[str, Path], file_content: str) -> None:
+        """Directly writing to disk"""
+        file_folder = Path(filename).parent
+        if not Path.is_dir(self.output_folder / file_folder):
+            Path.mkdir(self.output_folder / file_folder, parents=True)
+        with open(self.output_folder / Path(filename), "w", encoding="utf-8") as fd:
+            fd.write(file_content)
+
+    def list_file(self) -> List[str]:
+        return [str(f) for f in self.output_folder.glob("**/*") if f.is_file()]
+
+
+class Plugin(ReaderAndWriter, ABC):
+    """A base class for autorest plugin.
+
+    :param autorestapi: An autorest API instance
+    """
+
+    @abstractmethod
+    def process(self) -> bool:
+        """The plugin process.
+
+        :rtype: bool
+        :returns: True if everything's ok, False optherwise
+        :raises Exception: Could raise any exception, stacktrace will be sent to autorest API
+        """
+        raise NotImplementedError()
+
+
+class YamlUpdatePlugin(Plugin):
+    """A plugin that update the YAML as input."""
+
+    def get_yaml(self) -> Dict[str, Any]:
+        # cadl file doesn't have to be relative to output folder
+        with open(self.options["cadl_file"], "r", encoding="utf-8-sig") as fd:
+            return yaml.safe_load(fd.read())
+
+    def write_yaml(self, yaml_string: str) -> None:
+        with open(self.options["cadl_file"], "w", encoding="utf-8-sig") as fd:
+            fd.write(yaml_string)
+
+    def process(self) -> bool:
+        # List the input file, should be only one
+        yaml_data = self.get_yaml()
+
+        self.update_yaml(yaml_data)
+
+        yaml_string = yaml.safe_dump(yaml_data)
+
+        self.write_yaml(yaml_string)
+        return True
+
+    @abstractmethod
+    def update_yaml(self, yaml_data: Dict[str, Any]) -> None:
+        """The code-model-v4-no-tags yaml model tree.
+
+        :rtype: updated yaml
+        :raises Exception: Could raise any exception, stacktrace will be sent to autorest API
+        """
+        raise NotImplementedError()

package/generator/pygen/_version.py

@@ -0,0 +1,7 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+
+VERSION = "0.1.0"

package/{autorest/black/__init__.py → generator/pygen/black.py}

@@ -10,8 +10,8 @@ from typing import Any, Dict
 import black
 from black.report import NothingChanged
 
-from .. import Plugin, PluginAutorest
-from .._utils import parse_args
+from . import Plugin
+from .utils import parse_args
 
 _LOGGER = logging.getLogger("blib2to3")
 
@@ -65,11 +65,6 @@ class BlackScriptPlugin(Plugin):  # pylint: disable=abstract-method
             self.write_file(file, file_content)
 
 
-class BlackScriptPluginAutorest(BlackScriptPlugin, PluginAutorest):
-    def get_options(self) -> Dict[str, Any]:
-        return {"output_folder": self._autorestapi.get_value("outputFolderUri")}
-
-
 if __name__ == "__main__":
     # CADL pipeline will call this
     args, unknown_args = parse_args(need_cadl_file=False)

package/{autorest → generator/pygen}/codegen/__init__.py

@@ -9,10 +9,10 @@ from pathlib import Path
 import yaml
 
 
-from .. import Plugin, PluginAutorest
-from .._utils import parse_args
+from .. import Plugin
+from ..utils import parse_args
 from .models.code_model import CodeModel
-from .serializers import JinjaSerializer, JinjaSerializerAutorest
+from .serializers import JinjaSerializer
 from ._utils import DEFAULT_HEADER_TEXT, VALID_PACKAGE_MODE, TYPESPEC_PACKAGE_MODE
 
 
@@ -324,86 +324,6 @@ class CodeGenerator(Plugin):
         return True
 
 
-class CodeGeneratorAutorest(CodeGenerator, PluginAutorest):
-    def get_options(self) -> Dict[str, Any]:
-        if self._autorestapi.get_boolean_value("python3-only") is False:
-            _LOGGER.warning("You have passed in --python3-only=False. We have force overriden this to True.")
-        if self._autorestapi.get_boolean_value("add-python3-operation-files"):
-            _LOGGER.warning(
-                "You have passed in --add-python3-operation-files. "
-                "This flag no longer has an effect bc all SDKs are now Python3 only."
-            )
-        if self._autorestapi.get_boolean_value("reformat-next-link"):
-            _LOGGER.warning(
-                "You have passed in --reformat-next-link. We have force overriden "
-                "this to False because we no longer reformat initial query parameters into next "
-                "calls unless explicitly defined in the service definition."
-            )
-        options = {
-            "azure-arm": self._autorestapi.get_boolean_value("azure-arm"),
-            "header-text": self._autorestapi.get_value("header-text"),
-            "low-level-client": self._autorestapi.get_boolean_value("low-level-client", False),
-            "version-tolerant": self._autorestapi.get_boolean_value("version-tolerant", True),
-            "show-operations": self._autorestapi.get_boolean_value("show-operations"),
-            "python3-only": self._autorestapi.get_boolean_value("python3-only"),
-            "head-as-boolean": self._autorestapi.get_boolean_value("head-as-boolean", False),
-            "keep-version-file": self._autorestapi.get_boolean_value("keep-version-file"),
-            "no-async": self._autorestapi.get_boolean_value("no-async"),
-            "no-namespace-folders": self._autorestapi.get_boolean_value("no-namespace-folders"),
-            "basic-setup-py": self._autorestapi.get_boolean_value("basic-setup-py"),
-            "package-name": self._autorestapi.get_value("package-name"),
-            "package-version": self._autorestapi.get_value("package-version"),
-            "client-side-validation": self._autorestapi.get_boolean_value("client-side-validation"),
-            "tracing": self._autorestapi.get_boolean_value("trace"),
-            "multiapi": self._autorestapi.get_boolean_value("multiapi", False),
-            "polymorphic-examples": self._autorestapi.get_value("polymorphic-examples"),
-            "models-mode": self._autorestapi.get_value("models-mode"),
-            "builders-visibility": self._autorestapi.get_value("builders-visibility"),
-            "show-send-request": self._autorestapi.get_boolean_value("show-send-request"),
-            "only-path-and-body-params-positional": self._autorestapi.get_boolean_value(
-                "only-path-and-body-params-positional"
-            ),
-            "combine-operation-files": self._autorestapi.get_boolean_value("combine-operation-files"),
-            "package-mode": self._autorestapi.get_value("package-mode"),
-            "package-pprint-name": self._autorestapi.get_value("package-pprint-name"),
-            "packaging-files-config": self._autorestapi.get_value("package-configuration"),
-            "default-optional-constants-to-none": self._autorestapi.get_boolean_value(
-                "default-optional-constants-to-none"
-            ),
-            "generate-sample": self._autorestapi.get_boolean_value("generate-sample"),
-            "generate-test": self._autorestapi.get_boolean_value("generate-test"),
-            "default-api-version": self._autorestapi.get_value("default-api-version"),
-        }
-        return {k: v for k, v in options.items() if v is not None}
-
-    def get_yaml(self) -> Dict[str, Any]:
-        inputs = self._autorestapi.list_inputs()
-        _LOGGER.debug("Possible Inputs: %s", inputs)
-        if "code-model-v4-no-tags.yaml" not in inputs:
-            raise ValueError("code-model-v4-no-tags.yaml must be a possible input")
-
-        if self._autorestapi.get_value("input-yaml"):
-            input_yaml = self._autorestapi.get_value("input-yaml")
-            file_content = self._autorestapi.read_file(input_yaml)
-        else:
-            inputs = self._autorestapi.list_inputs()
-            _LOGGER.debug("Possible Inputs: %s", inputs)
-            if "code-model-v4-no-tags.yaml" not in inputs:
-                raise ValueError("code-model-v4-no-tags.yaml must be a possible input")
-
-            file_content = self._autorestapi.read_file("code-model-v4-no-tags.yaml")
-
-        # Parse the received YAML
-        return yaml.safe_load(file_content)
-
-    def get_serializer(self, code_model: CodeModel):
-        return JinjaSerializerAutorest(
-            self._autorestapi,
-            code_model,
-            output_folder=self.output_folder,
-        )
-
-
 if __name__ == "__main__":
     # CADL pipeline will call this
     parsed_args, unknown_args = parse_args()

package/{autorest → generator/pygen}/codegen/models/combined_type.py

@@ -5,7 +5,7 @@
 # --------------------------------------------------------------------------
 from typing import Any, Dict, List, Optional, TYPE_CHECKING, Type, Tuple, Union
 import re
-from autorest.codegen.models.imports import FileImport, ImportType, TypingSection
+from .imports import FileImport, ImportType, TypingSection
 from .base import BaseType
 from .model_type import ModelType
 

package/{autorest → generator/pygen}/codegen/models/model_type.py

@@ -7,7 +7,7 @@ from enum import Enum
 from collections import OrderedDict
 from typing import Any, Dict, List, Optional, TYPE_CHECKING, cast
 import sys
-from autorest.codegen.models.utils import (
+from .utils import (
     add_to_pylint_disable,
     NAME_LENGTH_LIMIT,
 )