@autorest/python 5.11.2 → 5.12.0

package/autorest/codegen/serializers/builder_serializer.py

@@ -57,7 +57,7 @@ def _json_dumps_template(template_representation: Any) -> Any:
 def _serialize_files_or_data_dict(multipart_parameters: List[Parameter]) -> str:
     # only for template use
     template = {
-        param.serialized_name: param.schema.get_files_and_data_template_representation(
+        f'"{param.serialized_name}"': param.schema.get_files_and_data_template_representation(
             optional=not param.required,
             description=param.description,
         )
@@ -542,11 +542,11 @@ class RequestBuilderGenericSerializer(_RequestBuilderBaseSerializer):
     @staticmethod
     def _method_signature_and_response_type_annotation_template(method_signature: str, response_type_annotation: str):
         return utils.method_signature_and_response_type_annotation_template(
-            is_python_3_file=False, method_signature=method_signature, response_type_annotation=response_type_annotation
+            is_python3_file=False, method_signature=method_signature, response_type_annotation=response_type_annotation
         )
 
     def _get_kwargs_to_pop(self, builder: BuilderType):
-        return builder.parameters.kwargs_to_pop(is_python_3_file=False)
+        return builder.parameters.kwargs_to_pop(is_python3_file=False)
 
     def _body_params_to_pass_to_request_creation(self, builder: BuilderType) -> List[str]:
         if builder.parameters.has_body and not builder.parameters.body_kwarg_names:
@@ -564,11 +564,11 @@ class RequestBuilderPython3Serializer(_RequestBuilderBaseSerializer):
     @staticmethod
     def _method_signature_and_response_type_annotation_template(method_signature: str, response_type_annotation: str):
         return utils.method_signature_and_response_type_annotation_template(
-            is_python_3_file=True, method_signature=method_signature, response_type_annotation=response_type_annotation
+            is_python3_file=True, method_signature=method_signature, response_type_annotation=response_type_annotation
         )
 
     def _get_kwargs_to_pop(self, builder: BuilderType):
-        return builder.parameters.kwargs_to_pop(is_python_3_file=True)
+        return builder.parameters.kwargs_to_pop(is_python3_file=True)
 
     def _body_params_to_pass_to_request_creation(self, builder: BuilderType) -> List[str]:
         body_kwargs = list(builder.parameters.body_kwarg_names.keys())
@@ -698,10 +698,10 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
         body_kwarg_to_pass = builder.body_kwargs_to_pass_to_request_builder[0]
         if self.code_model.options["models_mode"]:
             return (
-                f"{body_kwarg_to_pass} = self._serialize.body({body_param.serialized_name}, "
+                f"_{body_kwarg_to_pass} = self._serialize.body({body_param.serialized_name}, "
                 f"'{ body_param.serialization_type }'{body_is_xml}{ pass_ser_ctxt })"
             )
-        return f"{body_kwarg_to_pass} = {body_param.serialized_name}"
+        return f"_{body_kwarg_to_pass} = {body_param.serialized_name}"
 
     def _serialize_body(self, builder: BuilderType, body_param: Parameter, body_kwarg: str) -> List[str]:
         retval = []
@@ -728,7 +728,7 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
             retval.append("    " + serialize_body_call)
             if len(builder.body_kwargs_to_pass_to_request_builder) == 1:
                 retval.append("else:")
-                retval.append(f"    {body_kwarg} = None")
+                retval.append(f"    _{body_kwarg} = None")
         return retval
 
     def _set_body_content_kwarg(
@@ -743,7 +743,7 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
                 return retval
         except AttributeError:
             pass
-        retval.append(f"{body_kwarg.serialized_name} = {body_param.serialized_name}")
+        retval.append(f"_{body_kwarg.serialized_name} = {body_param.serialized_name}")
         return retval
 
 
@@ -790,7 +790,7 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
             if self.code_model.options["version_tolerant"]:
                 body_params_to_initialize = [p for p in body_params_to_initialize if p != "files"]
             for k in body_params_to_initialize:
-                retval.append(f"{k} = None")
+                retval.append(f"_{k} = None")
         if builder.parameters.grouped:
             # request builders don't allow grouped parameters, so we group them before making the call
             retval.extend(_serialize_grouped_body(builder))
@@ -799,8 +799,8 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
             # unflatten before passing to request builder as well
             retval.extend(_serialize_flattened_body(builder))
         if request_builder.multipart or request_builder.parameters.data_inputs:
-            param_name = "files" if request_builder.multipart else "data"
             if not self.code_model.options["version_tolerant"]:
+                param_name = "_files" if request_builder.multipart else "_data"
                 retval.extend(_serialize_files_and_data_body(builder, param_name))
         elif builder.parameters.has_body and not builder.parameters.body[0].constant:
             retval.extend(self._serialize_body_parameters(builder))
@@ -823,18 +823,23 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
                 continue
             high_level_name = cast(RequestBuilderParameter, parameter).name_in_high_level_operation
             retval.append(f"    {parameter.serialized_name}={high_level_name},")
-        template_url = template_url or f"self.{builder.name}.metadata['url']"
-        retval.append(f"    template_url={template_url},")
+        if not self.code_model.options["version_tolerant"]:
+            template_url = template_url or f"self.{builder.name}.metadata['url']"
+            retval.append(f"    template_url={template_url},")
         retval.append(f")")
         if not self.code_model.options["version_tolerant"]:
             pass_files = ""
             if "files" in builder.body_kwargs_to_pass_to_request_builder:
-                pass_files = ", files"
+                pass_files = ", _files"
             retval.append(f"request = _convert_request(request{pass_files})")
         if builder.parameters.path:
             retval.extend(self.serialize_path(builder))
+        url_to_format = "request.url"
+        if self.code_model.options["version_tolerant"] and template_url:
+            url_to_format = template_url
         retval.append(
-            "request.url = self._client.format_url(request.url{})".format(
+            "request.url = self._client.format_url({}{})".format(
+                url_to_format,
                 ", **path_format_arguments" if builder.parameters.path else ""
             )
         )
@@ -1005,11 +1010,11 @@ class SyncOperationGenericSerializer(_SyncOperationBaseSerializer):
     @staticmethod
     def _method_signature_and_response_type_annotation_template(method_signature: str, response_type_annotation: str):
         return utils.method_signature_and_response_type_annotation_template(
-            is_python_3_file=False, method_signature=method_signature, response_type_annotation=response_type_annotation
+            is_python3_file=False, method_signature=method_signature, response_type_annotation=response_type_annotation
         )
 
     def _get_kwargs_to_pop(self, builder: BuilderType):
-        return builder.parameters.kwargs_to_pop(is_python_3_file=False)
+        return builder.parameters.kwargs_to_pop(is_python3_file=False)
 
 
 class SyncOperationPython3Serializer(_SyncOperationBaseSerializer):
@@ -1020,11 +1025,11 @@ class SyncOperationPython3Serializer(_SyncOperationBaseSerializer):
     @staticmethod
     def _method_signature_and_response_type_annotation_template(method_signature: str, response_type_annotation: str):
         return utils.method_signature_and_response_type_annotation_template(
-            is_python_3_file=True, method_signature=method_signature, response_type_annotation=response_type_annotation
+            is_python3_file=True, method_signature=method_signature, response_type_annotation=response_type_annotation
         )
 
     def _get_kwargs_to_pop(self, builder: BuilderType):
-        return builder.parameters.kwargs_to_pop(is_python_3_file=True)
+        return builder.parameters.kwargs_to_pop(is_python3_file=True)
 
 class AsyncOperationSerializer(SyncOperationPython3Serializer):
 
@@ -1057,7 +1062,7 @@ class _PagingOperationBaseSerializer(_OperationBaseSerializer):  # pylint: disab
     def call_next_link_request_builder(self, builder: BuilderType) -> List[str]:
         if builder.next_request_builder:
             request_builder = builder.next_request_builder
-            template_url = f"'{request_builder.url}'"
+            template_url = None if self.code_model.options["version_tolerant"] else f"'{request_builder.url}'"
         else:
             request_builder = builder.request_builder
             template_url = "next_link"
@@ -1445,14 +1450,14 @@ def get_operation_serializer(
     builder: BuilderType,
     code_model,
     async_mode: bool,
-    is_python_3_file: bool,
+    is_python3_file: bool,
 ) -> _OperationBaseSerializer:
     retcls = _OperationBaseSerializer
     if isinstance(builder, LROPagingOperation):
         retcls = (
             AsyncLROPagingOperationSerializer if async_mode
             else (
-                SyncLROPagingOperationPython3Serializer if is_python_3_file
+                SyncLROPagingOperationPython3Serializer if is_python3_file
                 else SyncLROPagingOperationGenericSerializer
             )
         )
@@ -1460,22 +1465,22 @@ def get_operation_serializer(
     if isinstance(builder, LROOperation):
         retcls = (
             AsyncLROOperationSerializer if async_mode
-            else (SyncLROOperationPython3Serializer if is_python_3_file else SyncLROOperationGenericSerializer)
+            else (SyncLROOperationPython3Serializer if is_python3_file else SyncLROOperationGenericSerializer)
         )
         return retcls(code_model)
     if isinstance(builder, PagingOperation):
         retcls = (
             AsyncPagingOperationSerializer if async_mode
-            else (SyncPagingOperationPython3Serializer if is_python_3_file else SyncPagingOperationGenericSerializer)
+            else (SyncPagingOperationPython3Serializer if is_python3_file else SyncPagingOperationGenericSerializer)
         )
         return retcls(code_model)
     retcls = (
         AsyncOperationSerializer if async_mode
-        else (SyncOperationPython3Serializer if is_python_3_file else SyncOperationGenericSerializer)
+        else (SyncOperationPython3Serializer if is_python3_file else SyncOperationGenericSerializer)
     )
     return retcls(code_model)
 
 
-def get_request_builder_serializer(code_model, is_python_3_file: bool) -> _RequestBuilderBaseSerializer:
-    retcls = RequestBuilderPython3Serializer if is_python_3_file else RequestBuilderGenericSerializer
+def get_request_builder_serializer(code_model, is_python3_file: bool) -> _RequestBuilderBaseSerializer:
+    retcls = RequestBuilderPython3Serializer if is_python3_file else RequestBuilderGenericSerializer
     return retcls(code_model)

package/autorest/codegen/serializers/client_serializer.py

@@ -9,27 +9,32 @@ from ..models import CodeModel
 
 
 class ClientSerializer:
-    def __init__(self, code_model: CodeModel) -> None:
+    def __init__(self, code_model: CodeModel, is_python3_file: bool) -> None:
         self.code_model = code_model
+        self.is_python3_file = is_python3_file
 
     def _init_signature(self, async_mode: bool) -> str:
         return utils.serialize_method(
             function_def="def",
             method_name="__init__",
             is_in_class=True,
-            method_param_signatures=self.code_model.service_client.parameters.client_method_signature(async_mode),
+            method_param_signatures=self.code_model.service_client.parameters.client_method_signature(
+                async_mode or self.is_python3_file
+            ),
         )
 
     def init_signature_and_response_type_annotation(self, async_mode: bool) -> str:
         init_signature = self._init_signature(async_mode)
         return utils.method_signature_and_response_type_annotation_template(
-            is_python_3_file=async_mode,
+            is_python3_file=async_mode or self.is_python3_file,
             method_signature=init_signature,
             response_type_annotation="None",
         )
 
     def pop_kwargs_from_signature(self, async_mode: bool) -> List[str]:
-        return utils.pop_kwargs_from_signature(self.code_model.service_client.parameters.kwargs_to_pop(async_mode))
+        return utils.pop_kwargs_from_signature(self.code_model.service_client.parameters.kwargs_to_pop(
+            async_mode or self.is_python3_file
+        ))
 
     def class_definition(self, async_mode) -> str:
         class_name = self.code_model.class_name
@@ -37,7 +42,7 @@ class ClientSerializer:
         base_class = ""
         if has_mixin_og:
             base_class = f"{class_name}OperationsMixin"
-        elif not async_mode:
+        elif not (async_mode or self.is_python3_file):
             base_class = "object"
         if base_class:
             return f"class {class_name}({base_class}):"
@@ -107,13 +112,15 @@ class ClientSerializer:
             function_def="def",
             method_name=self.code_model.send_request_name,
             is_in_class=True,
-            method_param_signatures=self.code_model.service_client.send_request_signature(async_mode),
+            method_param_signatures=self.code_model.service_client.send_request_signature(
+                async_mode, async_mode or self.is_python3_file
+            ),
         )
 
     def send_request_signature_and_response_type_annotation(self, async_mode: bool) -> str:
         send_request_signature = self._send_request_signature(async_mode)
         return utils.method_signature_and_response_type_annotation_template(
-            is_python_3_file=async_mode,
+            is_python3_file=async_mode or self.is_python3_file,
             method_signature=send_request_signature,
             response_type_annotation="Awaitable[AsyncHttpResponse]" if async_mode else "HttpResponse",
         )
@@ -179,11 +186,32 @@ class ClientSerializer:
 
 class ConfigSerializer:
 
-    def __init__(self, code_model: CodeModel) -> None:
+    def __init__(self, code_model: CodeModel, is_python3_file: bool) -> None:
         self.code_model = code_model
+        self.is_python3_file = is_python3_file
+
+    def _init_signature(self, async_mode: bool) -> str:
+        return utils.serialize_method(
+            function_def="def",
+            method_name="__init__",
+            is_in_class=True,
+            method_param_signatures=self.code_model.global_parameters.config_method_signature(
+                async_mode or self.is_python3_file
+            ),
+        )
+
+    def init_signature_and_response_type_annotation(self, async_mode: bool) -> str:
+        init_signature = self._init_signature(async_mode)
+        return utils.method_signature_and_response_type_annotation_template(
+            is_python3_file=async_mode or self.is_python3_file,
+            method_signature=init_signature,
+            response_type_annotation="None",
+        )
 
     def pop_kwargs_from_signature(self, async_mode: bool) -> List[str]:
-        return utils.pop_kwargs_from_signature(self.code_model.global_parameters.config_kwargs_to_pop(async_mode))
+        return utils.pop_kwargs_from_signature(self.code_model.global_parameters.config_kwargs_to_pop(
+            async_mode or self.is_python3_file
+        ))
 
     def set_constants(self) -> List[str]:
         return [

package/autorest/codegen/serializers/general_serializer.py

@@ -54,13 +54,14 @@ class GeneralSerializer:
         ):
             self._correct_credential_parameter()
 
+        python3_only = self.code_model.options["python3_only"]
         return template.render(
             code_model=self.code_model,
             async_mode=self.async_mode,
-            serializer=ClientSerializer(self.code_model),
+            serializer=ClientSerializer(self.code_model, is_python3_file=python3_only),
             imports=FileImportSerializer(
                 self.code_model.service_client.imports(self.async_mode),
-                is_python_3_file=self.async_mode
+                is_python3_file=self.async_mode or python3_only
             ),
         )
 
@@ -80,7 +81,7 @@ class GeneralSerializer:
             code_model=self.code_model,
             imports=FileImportSerializer(
                 file_import,
-                is_python_3_file=self.async_mode,
+                is_python3_file=self.async_mode,
             )
         )
 
@@ -99,15 +100,16 @@ class GeneralSerializer:
             self._correct_credential_parameter()
 
         template = self.env.get_template("config.py.jinja2")
+        python3_only = self.code_model.options["python3_only"]
         return template.render(
             code_model=self.code_model,
             async_mode=self.async_mode,
             imports=FileImportSerializer(
                 config_imports(
                     self.code_model, self.code_model.global_parameters, self.async_mode
-                ), is_python_3_file=self.async_mode
+                ), is_python3_file=self.async_mode or python3_only
             ),
-            serializer=ConfigSerializer(self.code_model),
+            serializer=ConfigSerializer(self.code_model, is_python3_file=python3_only),
             sdk_moniker=sdk_moniker,
         )
 

package/autorest/codegen/serializers/import_serializer.py

@@ -42,9 +42,9 @@ def _get_import_clauses(
 
 
 class FileImportSerializer:
-    def __init__(self, file_import: FileImport, is_python_3_file: bool, async_mode: bool = False) -> None:
+    def __init__(self, file_import: FileImport, is_python3_file: bool, async_mode: bool = False) -> None:
         self._file_import = file_import
-        self.is_python_3_file = is_python_3_file
+        self.is_python3_file = is_python3_file
         self.async_mode = async_mode
 
     def _switch_typing_section_key(self, new_key: TypingSection):
@@ -67,14 +67,14 @@ class FileImportSerializer:
     def _add_type_checking_import(self):
         if (
             self._file_import.imports.get(TypingSection.TYPING) or
-            (not self.is_python_3_file and self._file_import.imports.get(TypingSection.CONDITIONAL))
+            (not self.is_python3_file and self._file_import.imports.get(TypingSection.CONDITIONAL))
         ):
             self._file_import.add_from_import("typing", "TYPE_CHECKING", ImportType.STDLIB)
 
     def _get_typing_definitions(self) -> str:
         if not self._file_import.type_definitions:
             return ""
-        spacing = "" if self.is_python_3_file else "    "
+        spacing = "" if self.is_python3_file else "    "
         declarations: List[str] = [f"\n{spacing}T = TypeVar('T')"]
         declarations.extend([
             "{}{} = {}".format(
@@ -90,7 +90,7 @@ class FileImportSerializer:
         self._add_type_checking_import()
         regular_imports = ""
         regular_imports_dict = self._get_imports_dict(
-            baseline_typing_section=TypingSection.REGULAR, add_conditional_typing=self.is_python_3_file
+            baseline_typing_section=TypingSection.REGULAR, add_conditional_typing=self.is_python3_file
         )
 
         if regular_imports_dict:
@@ -100,7 +100,7 @@ class FileImportSerializer:
 
         typing_imports = ""
         typing_imports_dict = self._get_imports_dict(
-            baseline_typing_section=TypingSection.TYPING, add_conditional_typing=not self.is_python_3_file
+            baseline_typing_section=TypingSection.TYPING, add_conditional_typing=not self.is_python3_file
         )
         if typing_imports_dict:
             typing_imports += "\n\nif TYPE_CHECKING:\n    # pylint: disable=unused-import,ungrouped-imports\n    "

package/autorest/codegen/serializers/metadata_serializer.py

@@ -185,9 +185,9 @@ class MetadataSerializer:
                 config_imports(self.code_model, async_global_parameters, async_mode=True).imports
             ),
             get_async_operation_serializer=functools.partial(
-                get_operation_serializer, code_model=self.code_model, async_mode=True, is_python_3_file=True
+                get_operation_serializer, code_model=self.code_model, async_mode=True, is_python3_file=True
             ),
             get_sync_operation_serializer=functools.partial(
-                get_operation_serializer, code_model=self.code_model, async_mode=False, is_python_3_file=False
+                get_operation_serializer, code_model=self.code_model, async_mode=False, is_python3_file=False
             ),
         )

package/autorest/codegen/serializers/model_base_serializer.py

@@ -24,17 +24,17 @@ def _documentation_string(
 
 
 class ModelBaseSerializer:
-    def __init__(self, code_model: CodeModel, env: Environment, is_python_3_file: bool) -> None:
+    def __init__(self, code_model: CodeModel, env: Environment, is_python3_file: bool) -> None:
         self.code_model = code_model
         self.env = env
-        self.is_python_3_file = is_python_3_file
+        self.is_python3_file = is_python3_file
 
     def serialize(self) -> str:
         # Generate the models
         template = self.env.get_template("model_container.py.jinja2")
         return template.render(
             code_model=self.code_model,
-            imports=FileImportSerializer(self.imports(), is_python_3_file=self.is_python_3_file),
+            imports=FileImportSerializer(self.imports(), is_python3_file=self.is_python3_file),
             str=str,
             init_line=self.init_line,
             init_args=self.init_args,

package/autorest/codegen/serializers/model_generic_serializer.py

@@ -13,7 +13,7 @@ class ModelGenericSerializer(ModelBaseSerializer):
 
     def __init__(self, code_model: CodeModel, env: Environment) -> None:
         super(ModelGenericSerializer, self).__init__(
-            code_model=code_model, env=env, is_python_3_file=False
+            code_model=code_model, env=env, is_python3_file=False
         )
 
     def init_line(self, model: ObjectSchema) -> List[str]:

package/autorest/codegen/serializers/model_python3_serializer.py

@@ -14,7 +14,7 @@ class ModelPython3Serializer(ModelBaseSerializer):
 
     def __init__(self, code_model: CodeModel, env: Environment) -> None:
         super(ModelPython3Serializer, self).__init__(
-            code_model=code_model, env=env, is_python_3_file=True
+            code_model=code_model, env=env, is_python3_file=True
         )
 
     def init_line(self, model: ObjectSchema) -> List[str]:

package/autorest/codegen/serializers/{operation_group_serializer.py → operation_groups_serializer.py}

@@ -3,30 +3,34 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+from typing import Optional
 import functools
-from copy import copy
-from typing import List
 from jinja2 import Environment
 
+from ..models import (
+    CodeModel,
+    OperationGroup,
+    FileImport,
+    LROOperation,
+    PagingOperation
+)
 from .import_serializer import FileImportSerializer
-from ..models import LROOperation, PagingOperation, CodeModel, OperationGroup
 from .builder_serializer import get_operation_serializer, get_request_builder_serializer
 
-
-class OperationGroupSerializer:
+class OperationGroupsSerializer:
     def __init__(
         self,
         code_model: CodeModel,
         env: Environment,
-        operation_groups: List[OperationGroup],
         async_mode: bool,
-        is_python_3_file: bool,
+        is_python3_file: bool,
+        operation_group: Optional[OperationGroup] = None,
     ) -> None:
         self.code_model = code_model
         self.env = env
-        self.operation_groups = operation_groups
         self.async_mode = async_mode
-        self.is_python_3_file = is_python_3_file
+        self.is_python3_file = is_python3_file
+        self.operation_group = operation_group
 
     def serialize(self) -> str:
         def _is_lro(operation):
@@ -34,39 +38,33 @@ class OperationGroupSerializer:
 
         def _is_paging(operation):
             return isinstance(operation, PagingOperation)
+        operation_groups = [self.operation_group] if self.operation_group else self.code_model.operation_groups
+        imports = FileImport()
+        for operation_group in operation_groups:
+            imports.merge(operation_group.imports(
+                async_mode=self.async_mode,
+            ))
 
-        operation_group_template = self.env.get_template("operations_container.py.jinja2")
-        if not self.code_model.options["combine_operation_files"] and self.operation_groups[0].is_empty_operation_group:
-            operation_group_template = self.env.get_template("operations_container_mixin.py.jinja2")
-
-        has_schemas = self.code_model.schemas or self.code_model.enums
-
-        # extract all operations from operation_groups
-        operaions_all = [operation for groups in self.operation_groups for operation in groups.operations]
-        operation_group_temp = copy(self.operation_groups[0])
-        operation_group_temp.operations = operaions_all
-
-        return operation_group_template.render(
+        template = self.env.get_or_select_template("operation_groups_container.py.jinja2")
+        return template.render(
             code_model=self.code_model,
-            operation_groups=self.operation_groups,
+            operation_groups=operation_groups,
             imports=FileImportSerializer(
-                operation_group_temp.imports(
-                    async_mode=self.async_mode,
-                    has_schemas=bool(has_schemas)
-                ), is_python_3_file=self.is_python_3_file,
+                imports,
+                is_python3_file=self.is_python3_file,
                 async_mode=self.async_mode
             ),
             async_mode=self.async_mode,
-            is_python_3_file=self.is_python_3_file,
+            is_python3_file=self.is_python3_file,
             is_lro=_is_lro,
             is_paging=_is_paging,
             get_operation_serializer=functools.partial(
                 get_operation_serializer,
                 code_model=self.code_model,
                 async_mode=self.async_mode,
-                is_python_3_file=self.is_python_3_file,
+                is_python3_file=self.is_python3_file,
             ),
             request_builder_serializer=get_request_builder_serializer(
-                self.code_model, self.is_python_3_file,
+                self.code_model, self.is_python3_file,
             ),
         )

package/autorest/codegen/serializers/operations_init_serializer.py

@@ -3,7 +3,10 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+from typing import List
 from jinja2 import Environment
+
+from autorest.codegen.models.operation_group import OperationGroup
 from ..models import CodeModel
 
 
@@ -13,9 +16,38 @@ class OperationsInitSerializer:
         self.env = env
         self.async_mode = async_mode
 
+    def _operation_group_imports_helper(self, filename_suffix: str = "") -> List[str]:
+        def _get_filename(operation_group: OperationGroup) -> str:
+            prefix = "_operations" if self.code_model.options["combine_operation_files"] else operation_group.filename
+            return prefix + filename_suffix
+        return [
+            f"from .{_get_filename(og)} import {og.class_name}"
+            for og in self.code_model.operation_groups
+        ]
+
+    def operation_group_imports(self) -> List[str]:
+        typed_py3_files = self.code_model.options["add_python3_operation_files"]
+        py3_only = self.code_model.options["python3_only"]
+        if typed_py3_files and not py3_only and not self.async_mode:
+            retval: List[str] = ["try:"]
+            retval.extend([
+                f"    {line}"
+                for line in self._operation_group_imports_helper(filename_suffix="_py3")
+            ])
+            retval.append("except (SyntaxError, ImportError):")
+            retval.extend([
+                f"    {line}"
+                for line in self._operation_group_imports_helper()
+            ])
+            return retval
+        return self._operation_group_imports_helper()
+
     def serialize(self) -> str:
-        operation_group_init_template = self.env.get_template("operations_container_init.py.jinja2")
+        operation_group_init_template = self.env.get_template("operations_folder_init.py.jinja2")
 
         return operation_group_init_template.render(
-            code_model=self.code_model, operation_groups=self.code_model.operation_groups, async_mode=self.async_mode
+            code_model=self.code_model,
+            operation_groups=self.code_model.operation_groups,
+            async_mode=self.async_mode,
+            operation_group_imports=self.operation_group_imports,
         )

package/autorest/codegen/serializers/patch_serializer.py

@@ -0,0 +1,15 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+from jinja2 import Environment
+
+
+class PatchSerializer:
+    def __init__(self, env: Environment) -> None:
+        self.env = env
+
+    def serialize(self) -> str:
+        template = self.env.get_template("patch.py.jinja2")
+        return template.render()

package/autorest/codegen/serializers/rest_serializer.py

@@ -20,6 +20,7 @@ class RestSerializer:
         self.code_model = code_model
         self.env = env
         self.request_builders = request_builders
+        self.builder_group_name = request_builders[0].builder_group_name
 
     def serialize_init(self) -> str:
         template = self.env.get_template("rest_init.py.jinja2")
@@ -33,8 +34,10 @@ class RestPython3Serializer(RestSerializer):
         return template.render(
             code_model=self.code_model,
             request_builders=self.request_builders,
-            imports=FileImportSerializer(self.code_model.rest.imports(), is_python_3_file=True),
-            is_python_3_file=True,
+            imports=FileImportSerializer(self.code_model.rest.imports(
+                self.builder_group_name
+            ), is_python3_file=True),
+            is_python3_file=True,
             request_builder_serializer=RequestBuilderPython3Serializer(self.code_model),
         )
 
@@ -46,7 +49,9 @@ class RestGenericSerializer(RestSerializer):
         return template.render(
             code_model=self.code_model,
             request_builders=self.request_builders,
-            imports=FileImportSerializer(self.code_model.rest.imports(), is_python_3_file=False),
-            is_python_3_file=False,
+            imports=FileImportSerializer(self.code_model.rest.imports(
+                self.builder_group_name
+            ), is_python3_file=False),
+            is_python3_file=False,
             request_builder_serializer=RequestBuilderGenericSerializer(self.code_model),
         )

package/autorest/codegen/serializers/utils.py

@@ -90,11 +90,11 @@ def serialize_path(
 
 def method_signature_and_response_type_annotation_template(
     *,
-    is_python_3_file: bool,
+    is_python3_file: bool,
     method_signature: str,
     response_type_annotation: str,
 ) -> str:
-    if is_python_3_file:
+    if is_python3_file:
         return f"{method_signature} -> {response_type_annotation}:"
     return f"{method_signature}:\n    # type: (...) -> {response_type_annotation}"