move model_base to models folder

Azure · May 28, 2024 · 1e59473 · 1e59473
1 parent 9c34dcf
commit 1e59473
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/packages/autorest.python/autorest/codegen/models/lro_operation.py b/packages/autorest.python/autorest/codegen/models/lro_operation.py
@@ -134,7 +134,7 @@ def imports(self, async_mode: bool, **kwargs: Any) -> FileImport:
             # used in the case if initial operation returns none
             # but final call returns a model
             relative_path = "..." if async_mode else ".."
-            file_import.add_submodule_import(f"{relative_path}_model_base", "_deserialize", ImportType.LOCAL)
+            file_import.add_submodule_import(f"{relative_path}models._model_base", "_deserialize", ImportType.LOCAL)
         file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.CONDITIONAL)
         file_import.add_submodule_import("typing", "cast", ImportType.STDLIB)
         return file_import

diff --git a/packages/autorest.python/autorest/codegen/models/model_type.py b/packages/autorest.python/autorest/codegen/models/model_type.py
@@ -303,7 +303,7 @@ def imports(self, **kwargs: Any) -> FileImport:
             )
             if self.is_form_data:
                 file_import.add_submodule_import(
-                    relative_path,
+                    f"{relative_path}.models",
                     "_model_base",
                     ImportType.LOCAL,
                     typing_section=(TypingSection.TYPING if kwargs.get("model_typing") else TypingSection.REGULAR),

diff --git a/packages/autorest.python/autorest/codegen/models/operation.py b/packages/autorest.python/autorest/codegen/models/operation.py
@@ -425,7 +425,7 @@ def imports(  # pylint: disable=too-many-branches, disable=too-many-statements
         if self.overloads:
             file_import.add_submodule_import("typing", "overload", ImportType.STDLIB)
         if self.non_default_errors and self.code_model.options["models_mode"] == "dpg":
-            file_import.add_submodule_import(f"{relative_path}_model_base", "_deserialize", ImportType.LOCAL)
+            file_import.add_submodule_import(f"{relative_path}models._model_base", "_deserialize", ImportType.LOCAL)
         return file_import
 
     def get_response_from_status(self, status_code: Optional[Union[str, int]]) -> ResponseType:
@@ -503,13 +503,13 @@ def imports(self, async_mode: bool, **kwargs: Any) -> FileImport:
             if self.parameters.has_body:
                 if not self.has_form_data_body:
                     file_import.add_submodule_import(
-                        f"{relative_path}_model_base",
+                        f"{relative_path}models._model_base",
                         "SdkJSONEncoder",
                         ImportType.LOCAL,
                     )
                     file_import.add_import("json", ImportType.STDLIB)
             if self.default_error_deserialization or any(r.type for r in self.responses):
-                file_import.add_submodule_import(f"{relative_path}_model_base", "_deserialize", ImportType.LOCAL)
+                file_import.add_submodule_import(f"{relative_path}models._model_base", "_deserialize", ImportType.LOCAL)
 
         return file_import
 

diff --git a/packages/autorest.python/autorest/codegen/models/paging_operation.py b/packages/autorest.python/autorest/codegen/models/paging_operation.py
@@ -149,7 +149,7 @@ def imports(self, async_mode: bool, **kwargs: Any) -> FileImport:
             relative_path = "..." if async_mode else ".."
             file_import.merge(self.item_type.imports(**kwargs))
             if self.default_error_deserialization or any(r.type for r in self.responses):
-                file_import.add_submodule_import(f"{relative_path}_model_base", "_deserialize", ImportType.LOCAL)
+                file_import.add_submodule_import(f"{relative_path}models._model_base", "_deserialize", ImportType.LOCAL)
         return file_import
 
 

diff --git a/packages/autorest.python/autorest/codegen/models/property.py b/packages/autorest.python/autorest/codegen/models/property.py
@@ -159,7 +159,7 @@ def imports(self, **kwargs) -> FileImport:
             file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB)
         if self.code_model.options["models_mode"] == "dpg":
             file_import.add_submodule_import(
-                ".._model_base",
+                "._model_base",
                 "rest_discriminator" if self.is_discriminator else "rest_field",
                 ImportType.LOCAL,
             )

diff --git a/packages/autorest.python/autorest/codegen/serializers/__init__.py b/packages/autorest.python/autorest/codegen/serializers/__init__.py
@@ -439,7 +439,7 @@ def _serialize_and_write_top_level_folder(
             )
         if self.code_model.options["models_mode"] == "dpg":
             self.write_file(
-                namespace_path / Path("_model_base.py"),
+                namespace_path / "models" / "_model_base.py",
                 general_serializer.serialize_model_base_file(),
             )
 

diff --git a/packages/autorest.python/autorest/codegen/serializers/general_serializer.py b/packages/autorest.python/autorest/codegen/serializers/general_serializer.py
@@ -135,12 +135,12 @@ def serialize_vendor_file(self, clients: List[Client]) -> str:
             file_import.add_submodule_import("typing", "Any", ImportType.STDLIB)
             file_import.add_submodule_import("typing", "List", ImportType.STDLIB)
             file_import.add_submodule_import(
-                "._model_base",
+                ".models._model_base",
                 "SdkJSONEncoder",
                 ImportType.LOCAL,
             )
             file_import.add_submodule_import(
-                "._model_base",
+                ".models._model_base",
                 "Model",
                 ImportType.LOCAL,
             )

diff --git a/packages/autorest.python/autorest/codegen/serializers/model_serializer.py b/packages/autorest.python/autorest/codegen/serializers/model_serializer.py
@@ -187,7 +187,7 @@ def super_call(self, model: ModelType) -> List[str]:
     def imports(self) -> FileImport:
         file_import = FileImport(self.code_model)
         file_import.add_submodule_import(
-            "..",
+            ".",
             "_model_base",
             ImportType.LOCAL,
             TypingSection.REGULAR,