@autorest/python 5.19.0 → 6.0.1

package/ChangeLog.md

@@ -1,6 +1,64 @@
 # Release History
 
-### 2022-07-13 - 5.19.0
+### 2022-06-29 - 6.0.1
+
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.8.1`     |
+| `@autorest/modelerfour`                                                 | `4.23.5`    |
+| `azure-core` dep of generated code                                      | `1.24.0`    |
+| `isodate` dep of generated code                                         | `0.6.1`     |
+| `msrest` dep of generated code (If generating legacy code)              | `0.7.1`     |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
+
+**Bug Fixes**
+
+- Ignore linting error for clients with no credentials  #1333
+
+### 2022-06-24 - 6.0.0
+
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.8.1`     |
+| `@autorest/modelerfour`                                                 | `4.23.5`    |
+| `azure-core` dep of generated code                                      | `1.24.0`    |
+| `isodate` dep of generated code                                         | `0.6.1`     |
+| `msrest` dep of generated code (If generating legacy code)              | `0.7.1`     |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
+
+**Breaking Changes**
+
+- Don't generate paging variables `maxpagesize` for DPG generations. Users should pass in `maxpagesize` to the `by_page` method of their
+pager  #1320
+
+### 2022-06-17 - 6.0.0-rc.1
+
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.8.1`     |
+| `@autorest/modelerfour`                                                 | `4.23.5`    |
+| `azure-core` dep of generated code                                      | `1.24.0`    |
+| `isodate` dep of generated code                                         | `0.6.1`     |
+| `msrest` dep of generated code (If generating legacy code)              | `0.7.1`     |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
+
+**Breaking Changes**
+
+- Default to generating DPG SDKs with `--version-tolerant` now defaulting to `true`. For a list of flag default changes, please
+see [here](https://github.com/Azure/autorest.python/issues/1186)  #1304
+- Only generate Python3 SDKs  #1297
+- Don't reformat initial query parameters into the next link. However, we do append `api-version` parameters if they are not present in the next link  #1297  #1309
+- Don't generate operations with more than two body types. SDK authors need to implement this operation themselves  #1300
+
+**New Features**
+
+- Automatically format generated code with `black`. To not format, pass in `--black=false`  #1304
+
+**Other**
+
+- Remove testing support for `--low-level-client` SDKs  #1303
+
+### 2022-06-13 - 5.19.0
 
 | Library                                                                 | Min Version |
 | ----------------------------------------------------------------------- | ----------- |
@@ -11,9 +69,10 @@
 | `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
 
 **New Features**
+
 - Add _serialization.py for `--client-side-validation=false` generation, and migrate serilization from msrest to _serialization.py #1236
 
-### 2022-07-13 - 5.18.0
+### 2022-06-09 - 5.18.0
 
 | Library                                                                 | Min Version |
 | ----------------------------------------------------------------------- | ----------- |

package/README.md

@@ -23,6 +23,15 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio
 
 #### Python code gen
 
+```yaml !$(multiapiscript)
+# default values for version tolerant and black
+black: true
+```
+
+```yaml !$(low-level-client)
+version-tolerant: true
+```
+
 ```yaml !$(low-level-client) && !$(version-tolerant)
 modelerfour:
   group-parameters: true

package/autorest/__init__.py

@@ -4,8 +4,9 @@
 # license information.
 # --------------------------------------------------------------------------
 import logging
+from pathlib import Path
 from abc import ABC, abstractmethod
-from typing import Any, Dict
+from typing import Any, Dict, Union
 
 import yaml
 
@@ -17,14 +18,40 @@ __version__ = VERSION
 _LOGGER = logging.getLogger(__name__)
 
 
-class Plugin(ABC):
+class ReaderAndWriter:
+    def __init__(self, **kwargs: Any) -> None:
+        pass
+
+    def read_file(self, path: Union[str, Path]) -> str:
+        """How does one read a file in cadl?"""
+        raise NotImplementedError("Haven't plugged in Cadl yet")
+
+    def write_file(self, filename: Union[str, Path], file_content: str) -> None:
+        """How does writing work in cadl?"""
+        raise NotImplementedError("Haven't plugged in Cadl yet")
+
+
+class ReaderAndWriterAutorest(ReaderAndWriter):
+    def __init__(self, *, autorestapi: AutorestAPI) -> None:
+        super().__init__()
+        self._autorestapi = autorestapi
+
+    def read_file(self, path: Union[str, Path]) -> str:
+        return self._autorestapi.read_file(path)
+
+    def write_file(self, filename: Union[str, Path], file_content: str) -> None:
+        return self._autorestapi.write_file(filename, file_content)
+
+
+class Plugin(ReaderAndWriter, ABC):
     """A base class for autorest plugin.
 
     :param autorestapi: An autorest API instance
     """
 
-    def __init__(self, autorestapi: AutorestAPI) -> None:
-        self._autorestapi = autorestapi
+    def __init__(self, **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+        self.options: Dict[str, Any] = {}
 
     @abstractmethod
     def process(self) -> bool:
@@ -37,24 +64,30 @@ class Plugin(ABC):
         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"""
+
+    def __init__(self, autorestapi: AutorestAPI) -> None:
+        super().__init__(autorestapi=autorestapi)
+        self.options = self.get_options()
+
+    @abstractmethod
+    def get_options(self) -> Dict[str, Any]:
+        """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 process(self) -> bool:
         # List the input file, should be only one
-        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")
-        yaml_data = yaml.safe_load(file_content)
+        yaml_data = yaml.safe_load(self.read_file("code-model-v4-no-tags.yaml"))
 
         self.update_yaml(yaml_data)
 
         yaml_string = yaml.safe_dump(yaml_data)
 
-        self._autorestapi.write_file("code-model-v4-no-tags.yaml", yaml_string)
+        self.write_file("code-model-v4-no-tags.yaml", yaml_string)
         return True
 
     @abstractmethod
@@ -67,4 +100,12 @@ class YamlUpdatePlugin(Plugin):
         raise NotImplementedError()
 
 
-__all__ = ["Plugin", "YamlUpdatePlugin"]
+class YamlUpdatePluginAutorest(  # pylint: disable=abstract-method
+    YamlUpdatePlugin, PluginAutorest
+):
+    def get_options(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")
+        return {}

package/autorest/black/__init__.py

@@ -6,9 +6,10 @@
 import logging
 from pathlib import Path
 import os
+from typing import Any, Dict
 import black
 
-from .. import Plugin
+from .. import Plugin, PluginAutorest
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -16,10 +17,10 @@ _BLACK_MODE = black.Mode()
 _BLACK_MODE.line_length = 120
 
 
-class BlackScriptPlugin(Plugin):
-    def __init__(self, autorestapi):
-        super().__init__(autorestapi)
-        output_folder_uri = self._autorestapi.get_value("outputFolderUri")
+class BlackScriptPlugin(Plugin):  # pylint: disable=abstract-method
+    def __init__(self, **kwargs):
+        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("///"):
@@ -38,9 +39,9 @@ class BlackScriptPlugin(Plugin):
 
     def format_file(self, full_path) -> None:
         file = full_path.relative_to(self.output_folder)
-        file_content = self._autorestapi.read_file(file)
+        file_content = self.read_file(file)
         if not file.suffix == ".py":
-            self._autorestapi.write_file(file, file_content)
+            self.write_file(file, file_content)
             return
         try:
             file_content = black.format_file_contents(
@@ -48,4 +49,9 @@ class BlackScriptPlugin(Plugin):
             )
         except black.NothingChanged:
             pass
-        self._autorestapi.write_file(file, file_content)
+        self.write_file(file, file_content)
+
+
+class BlackScriptPluginAutorest(BlackScriptPlugin, PluginAutorest):
+    def get_options(self) -> Dict[str, Any]:
+        return {"outputFolderUri": self._autorestapi.get_value("outputFolderUri")}

package/autorest/codegen/__init__.py

@@ -10,13 +10,13 @@ from pathlib import Path
 import yaml
 
 
-from .. import Plugin
+from .. import Plugin, PluginAutorest
 from .models.client import Client, Config
 from .models.code_model import CodeModel
 from .models import build_type
 from .models.request_builder import get_request_builder
 from .models.operation_group import OperationGroup
-from .serializers import JinjaSerializer
+from .serializers import JinjaSerializer, JinjaSerializerAutorest
 
 
 def _build_convenience_layer(yaml_data: Dict[str, Any], code_model: CodeModel) -> None:
@@ -57,13 +57,6 @@ def _validate_code_model_options(options: Dict[str, Any]) -> None:
             "to 'public' or 'hidden'."
         )
 
-    if not options["show_operations"] and options["add_python3_operation_files"]:
-        raise ValueError(
-            "Can not add typed sync operation files if you are not showing operations. "
-            "If you want typed synced operation files, you have to add flag "
-            "--show-operations"
-        )
-
     if options["basic_setup_py"] and not options["package_version"]:
         raise ValueError("--basic-setup-py must be used with --package-version")
 
@@ -85,12 +78,6 @@ def _validate_code_model_options(options: Dict[str, Any]) -> None:
                 "--package-mode can only be 'mgmtplane' or 'dataplane' or directory which contains template files"
             )
 
-    if options["reformat_next_link"] and options["version_tolerant"]:
-        raise ValueError(
-            "--reformat-next-link can not be true for version tolerant generations. "
-            "Please remove --reformat-next-link from your call for version tolerant generations."
-        )
-
     if options["multiapi"] and options["version_tolerant"]:
         raise ValueError(
             "Can not currently generate version tolerant multiapi SDKs. "
@@ -136,7 +123,7 @@ class CodeGenerator(Plugin):
         return {
             "dependency_azure_mgmt_core": "azure-mgmt-core<2.0.0,>=1.3.0",
             "dependency_azure_core": "azure-core<2.0.0,>=1.24.0",
-            "dependency_msrest": "msrest>=0.7.0",
+            "dependency_msrest": "msrest>=0.7.1",
         }
 
     def _create_code_model(
@@ -175,8 +162,8 @@ class CodeGenerator(Plugin):
 
     def _build_code_model_options(self) -> Dict[str, Any]:
         """Build en options dict from the user input while running autorest."""
-        azure_arm = self._autorestapi.get_boolean_value("azure-arm", False)
-        license_header = self._autorestapi.get_value("header-text")
+        azure_arm = self.options.get("azure-arm", False)
+        license_header = self.options["header-text"]
         if license_header:
             license_header = license_header.replace("\n", "\n# ")
             license_header = (
@@ -185,84 +172,49 @@ class CodeGenerator(Plugin):
             )
             license_header += "\n# --------------------------------------------------------------------------"
 
-        low_level_client = cast(
-            bool, self._autorestapi.get_boolean_value("low-level-client", False)
-        )
-        version_tolerant = cast(
-            bool, self._autorestapi.get_boolean_value("version-tolerant", False)
-        )
-        show_operations = self._autorestapi.get_boolean_value(
-            "show-operations", not low_level_client
-        )
+        low_level_client = cast(bool, self.options.get("low-level-client", False))
+        version_tolerant = cast(bool, self.options.get("version-tolerant", True))
+        show_operations = self.options.get("show-operations", not low_level_client)
         models_mode_default = (
             "none" if low_level_client or version_tolerant else "msrest"
         )
-        python3_only = cast(
-            bool,
-            self._autorestapi.get_boolean_value(
-                "python3-only", low_level_client or version_tolerant
-            ),
-        )
 
         options: Dict[str, Any] = {
             "azure_arm": azure_arm,
-            "head_as_boolean": self._autorestapi.get_boolean_value(
-                "head-as-boolean", False
-            ),
+            "head_as_boolean": self.options.get("head-as-boolean", True),
             "license_header": license_header,
-            "keep_version_file": self._autorestapi.get_boolean_value(
-                "keep-version-file", False
-            ),
-            "no_async": self._autorestapi.get_boolean_value("no-async", False),
-            "no_namespace_folders": self._autorestapi.get_boolean_value(
-                "no-namespace-folders", False
-            ),
-            "basic_setup_py": self._autorestapi.get_boolean_value(
-                "basic-setup-py", False
-            ),
-            "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", False
-            ),
-            "tracing": self._autorestapi.get_boolean_value("trace", show_operations),
-            "multiapi": self._autorestapi.get_boolean_value("multiapi", False),
-            "polymorphic_examples": self._autorestapi.get_value("polymorphic-examples")
-            or 5,
-            "models_mode": (
-                self._autorestapi.get_value("models-mode") or models_mode_default
-            ).lower(),
-            "builders_visibility": self._autorestapi.get_value("builders-visibility"),
+            "keep_version_file": self.options.get("keep-version-file", False),
+            "no_async": self.options.get("no-async", False),
+            "no_namespace_folders": self.options.get("no-namespace-folders", False),
+            "basic_setup_py": self.options.get("basic-setup-py", False),
+            "package_name": self.options.get("package-name"),
+            "package_version": self.options.get("package-version"),
+            "client_side_validation": self.options.get("client-side-validation", False),
+            "tracing": self.options.get("tracing", show_operations),
+            "multiapi": self.options.get("multiapi", False),
+            "polymorphic_examples": self.options.get("polymorphic-examples", 5),
+            "models_mode": self.options.get("models-mode", models_mode_default).lower(),
+            "builders_visibility": self.options.get("builders-visibility"),
             "show_operations": show_operations,
-            "show_send_request": self._autorestapi.get_boolean_value(
+            "show_send_request": self.options.get(
                 "show-send-request", low_level_client or version_tolerant
             ),
-            "only_path_and_body_params_positional": self._autorestapi.get_boolean_value(
+            "only_path_and_body_params_positional": self.options.get(
                 "only-path-and-body-params-positional",
                 low_level_client or version_tolerant,
             ),
-            "add_python3_operation_files": self._autorestapi.get_boolean_value(
-                "add-python3-operation-files",
-                python3_only and not (low_level_client or version_tolerant),
-            ),
             "version_tolerant": version_tolerant,
             "low_level_client": low_level_client,
-            "combine_operation_files": self._autorestapi.get_boolean_value(
+            "combine_operation_files": self.options.get(
                 "combine-operation-files", version_tolerant
             ),
-            "python3_only": python3_only,
-            "package_mode": self._autorestapi.get_value("package-mode"),
-            "package_pprint_name": self._autorestapi.get_value("package-pprint-name"),
-            "package_configuration": self._autorestapi.get_value(
-                "package-configuration"
-            ),
-            "default_optional_constants_to_none": self._autorestapi.get_boolean_value(
+            "package_mode": self.options.get("package-mode"),
+            "package_pprint_name": self.options.get("package-pprint-name"),
+            "package_configuration": self.options.get("package-configuration"),
+            "default_optional_constants_to_none": self.options.get(
                 "default-optional-constants-to-none",
                 low_level_client or version_tolerant,
             ),
-            "reformat_next_link": self._autorestapi.get_boolean_value(
-                "reformat-next-link", not version_tolerant
-            ),
         }
 
         if options["builders_visibility"] is None:
@@ -283,8 +235,102 @@ class CodeGenerator(Plugin):
             options["head_as_boolean"] = True
         return options
 
+    def get_yaml(self) -> Dict[str, Any]:
+        # cadl should call this one
+        raise NotImplementedError()
+
+    @staticmethod
+    def get_serializer(code_model: CodeModel):
+        return JinjaSerializer(code_model)
+
     def process(self) -> bool:
         # List the input file, should be only one
+
+        options = self._build_code_model_options()
+        yaml_data = self.get_yaml()
+
+        if options["azure_arm"]:
+            self.remove_cloud_errors(yaml_data)
+
+        code_model = self._create_code_model(yaml_data=yaml_data, options=options)
+
+        serializer = self.get_serializer(code_model)
+        serializer.serialize()
+
+        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"),
+            "package-configuration": self._autorestapi.get_value(
+                "package-configuration"
+            ),
+            "default-optional-constants-to-none": self._autorestapi.get_boolean_value(
+                "default-optional-constants-to-none"
+            ),
+        }
+        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:
@@ -302,19 +348,10 @@ class CodeGenerator(Plugin):
             file_content = self._autorestapi.read_file("code-model-v4-no-tags.yaml")
 
         # Parse the received YAML
-        yaml_data = yaml.safe_load(file_content)
-
-        options = self._build_code_model_options()
+        return yaml.safe_load(file_content)
 
-        if options["azure_arm"]:
-            self.remove_cloud_errors(yaml_data)
-
-        code_model = self._create_code_model(yaml_data=yaml_data, options=options)
-
-        serializer = JinjaSerializer(self._autorestapi, code_model)
-        serializer.serialize()
-
-        return True
+    def get_serializer(self, code_model: CodeModel):  # type: ignore
+        return JinjaSerializerAutorest(self._autorestapi, code_model)
 
 
 def main(yaml_model_file: str) -> None:
@@ -322,7 +359,7 @@ def main(yaml_model_file: str) -> None:
         LocalAutorestAPI,
     )
 
-    code_generator = CodeGenerator(
+    code_generator = CodeGeneratorAutorest(
         autorestapi=LocalAutorestAPI(reachable_files=[yaml_model_file])
     )
     if not code_generator.process():

package/autorest/codegen/models/base_builder.py

@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+import logging
 from abc import abstractmethod
 from typing import Any, Dict, List, Optional, TypeVar, Union, TYPE_CHECKING, Generic
 from .base_model import BaseModel
@@ -27,6 +28,8 @@ if TYPE_CHECKING:
     from .operation import Operation
     from .request_builder import RequestBuilder
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class BaseBuilder(Generic[ParameterListType], BaseModel):
     """Base class for Operations and Request Builders"""
@@ -39,7 +42,6 @@ class BaseBuilder(Generic[ParameterListType], BaseModel):
         parameters: ParameterListType,
         *,
         overloads=None,
-        abstract: bool = False,
         want_tracing: bool = True,
     ) -> None:
         super().__init__(yaml_data=yaml_data, code_model=code_model)
@@ -50,14 +52,23 @@ class BaseBuilder(Generic[ParameterListType], BaseModel):
             overloads or []
         )
         self._summary: str = yaml_data.get("summary", "")
-        # for operations where we don't know what to do, we mark them as abstract so users implement
-        # in patch.py
-        self.abstract = abstract
         self.want_tracing = want_tracing
         self.group_name: str = yaml_data["groupName"]
         self.is_overload: bool = yaml_data["isOverload"]
         self.api_versions: List[str] = yaml_data["apiVersions"]
 
+        if code_model.options["version_tolerant"] and yaml_data.get("abstract"):
+            _LOGGER.warning(
+                'Not going to generate operation "%s" because we are unable to generate this '
+                "type of operation right now. "
+                'Please write your own custom operation in the "_patch.py" file '
+                "following https://aka.ms/azsdk/python/dpcodegen/python/customize",
+                name,
+            )
+            self.abstract = True
+        else:
+            self.abstract = False
+
     @property
     def summary(self) -> Optional[str]:
         if self.abstract:
@@ -89,7 +100,7 @@ class BaseBuilder(Generic[ParameterListType], BaseModel):
             )
         return self._description or self.name
 
-    def method_signature(self, is_python3_file: bool, async_mode: bool) -> List[str]:
+    def method_signature(self, async_mode: bool) -> List[str]:
         if self.abstract:
             return ["*args,", "**kwargs"]
-        return self.parameters.method_signature(is_python3_file, async_mode)
+        return self.parameters.method_signature(async_mode)

package/autorest/codegen/models/client.py

@@ -159,7 +159,7 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
                 # Also in this case, we're in version tolerant, so python3 only is true
                 file_import.add_submodule_import(
                     f"{path_to_models}models",
-                    f"{self.code_model.get_models_filename(is_python3_file=True)}",
+                    self.code_model.models_filename,
                     ImportType.LOCAL,
                     alias="models",
                 )

package/autorest/codegen/models/code_model.py

@@ -235,11 +235,7 @@ class CodeModel:  # pylint: disable=too-many-instance-attributes, too-many-publi
     @property
     def need_mixin_abc(self) -> bool:
         """Do we want a mixin ABC class for typing purposes?"""
-        return any(
-            o
-            for o in self.operation_groups
-            if o.is_mixin and self.options["python3_only"]
-        )
+        return any(o for o in self.operation_groups if o.is_mixin)
 
     @property
     def has_lro_operations(self) -> bool:
@@ -252,20 +248,19 @@ class CodeModel:  # pylint: disable=too-many-instance-attributes, too-many-publi
             ]
         )
 
-    def get_models_filename(self, is_python3_file: bool) -> str:
+    @property
+    def models_filename(self) -> str:
         """Get the names of the model file(s)"""
-        if not self.is_legacy and self.options["python3_only"]:
-            return "_models"
-        if is_python3_file:
+        if self.is_legacy:
             return "_models_py3"
         return "_models"
 
     @property
     def enums_filename(self) -> str:
         """The name of the enums file"""
-        if not self.is_legacy:
-            return "_enums"
-        return f"_{self.module_name}_enums"
+        if self.is_legacy:
+            return f"_{self.module_name}_enums"
+        return "_enums"
 
     @property
     def is_legacy(self) -> bool: