move _model_base file into models folder (#2603)

* move model_base to models folder

* move model base to models folder

* add changeset

* fix model base imports

* fix formdata import

---------

Co-authored-by: iscai-msft <isabellavcai@gmail.com>

.chronus/changes/move_model_base-2024-4-28-13-45-23.md

@@ -0,0 +1,8 @@
+---
+changeKind: feature
+packages:
+  - "@autorest/python"
+  - "@azure-tools/typespec-python"
+---
+
+move _model_base file into models folder

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

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),

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
 

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
 
 

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,
             )

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(),
             )
 

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,
             )

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,

packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_operations.py

@@ -23,9 +23,9 @@
 from azure.core.utils import case_insensitive_dict
 
 from .. import models as _models
-from .._model_base import _deserialize
 from .._serialization import Serializer
 from .._vendor import ApiKeyClientMixinABC
+from ..models._model_base import _deserialize
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping

packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/aio/_operations/_operations.py

@@ -22,8 +22,8 @@
 from azure.core.tracing.decorator_async import distributed_trace_async
 
 from ... import models as _models
-from ..._model_base import _deserialize
 from ..._operations._operations import build_api_key_invalid_request, build_api_key_valid_request
+from ...models._model_base import _deserialize
 from .._vendor import ApiKeyClientMixinABC
 
 if sys.version_info >= (3, 9):

packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/models/_models.py

@@ -9,8 +9,8 @@
 
 from typing import Any, Mapping, overload
 
-from .. import _model_base
-from .._model_base import rest_field
+from . import _model_base
+from ._model_base import rest_field
 
 
 class InvalidAuth(_model_base.Model):

packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py

@@ -23,9 +23,9 @@
 from azure.core.utils import case_insensitive_dict
 
 from .. import models as _models
-from .._model_base import _deserialize
 from .._serialization import Serializer
 from .._vendor import CustomClientMixinABC
+from ..models._model_base import _deserialize
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping

packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/aio/_operations/_operations.py

@@ -22,8 +22,8 @@
 from azure.core.tracing.decorator_async import distributed_trace_async
 
 from ... import models as _models
-from ..._model_base import _deserialize
 from ..._operations._operations import build_custom_invalid_request, build_custom_valid_request
+from ...models._model_base import _deserialize
 from .._vendor import CustomClientMixinABC
 
 if sys.version_info >= (3, 9):

packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/models/_models.py

@@ -9,8 +9,8 @@
 
 from typing import Any, Mapping, overload
 
-from .. import _model_base
-from .._model_base import rest_field
+from . import _model_base
+from ._model_base import rest_field
 
 
 class InvalidAuth(_model_base.Model):

packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py

@@ -23,9 +23,9 @@
 from azure.core.utils import case_insensitive_dict
 
 from .. import models as _models
-from .._model_base import _deserialize
 from .._serialization import Serializer
 from .._vendor import OAuth2ClientMixinABC
+from ..models._model_base import _deserialize
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping

packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/aio/_operations/_operations.py

@@ -22,8 +22,8 @@
 from azure.core.tracing.decorator_async import distributed_trace_async
 
 from ... import models as _models
-from ..._model_base import _deserialize
 from ..._operations._operations import build_oauth2_invalid_request, build_oauth2_valid_request
+from ...models._model_base import _deserialize
 from .._vendor import OAuth2ClientMixinABC
 
 if sys.version_info >= (3, 9):

packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/models/_models.py

@@ -9,8 +9,8 @@
 
 from typing import Any, Mapping, overload
 
-from .. import _model_base
-from .._model_base import rest_field
+from . import _model_base
+from ._model_base import rest_field
 
 
 class InvalidAuth(_model_base.Model):

packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/operations/_operations.py

@@ -22,7 +22,7 @@
 from azure.core.tracing.decorator_async import distributed_trace_async
 
 from ... import models as _models
-from ..._model_base import _deserialize
+from ...models._model_base import _deserialize
 from ...operations._operations import (
     build_internal_operation_internal_decorator_in_internal_request,
     build_internal_operation_no_decorator_in_internal_request,

packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/models/_models.py

@@ -9,8 +9,8 @@
 
 from typing import Any, Dict, Literal, Mapping, TYPE_CHECKING, overload
 
-from .. import _model_base
-from .._model_base import rest_discriminator, rest_field
+from . import _model_base
+from ._model_base import rest_discriminator, rest_field
 
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports

packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/operations/_operations.py

@@ -23,8 +23,8 @@
 from azure.core.utils import case_insensitive_dict
 
 from .. import models as _models
-from .._model_base import _deserialize
 from .._serialization import Serializer
+from ..models._model_base import _deserialize
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping

packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/operations/_operations.py

@@ -25,7 +25,7 @@
 from azure.core.utils import case_insensitive_dict
 
 from ... import models as _models
-from ..._model_base import SdkJSONEncoder, _deserialize
+from ...models._model_base import SdkJSONEncoder, _deserialize
 from ...operations._operations import (
     build_model_in_operation_input_to_input_output_request,
     build_model_in_operation_output_to_input_output_request,

packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/models/_models.py

@@ -9,8 +9,8 @@
 
 from typing import Any, Mapping, overload
 
-from .. import _model_base
-from .._model_base import rest_field
+from . import _model_base
+from ._model_base import rest_field
 
 
 class InputModel(_model_base.Model):

packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/operations/_operations.py

@@ -25,8 +25,8 @@
 from azure.core.utils import case_insensitive_dict
 
 from .. import models as _models
-from .._model_base import SdkJSONEncoder, _deserialize
 from .._serialization import Serializer
+from ..models._model_base import SdkJSONEncoder, _deserialize
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping

packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/operations/_operations.py

@@ -28,7 +28,7 @@
 from azure.core.utils import case_insensitive_dict
 
 from ... import models as _models
-from ..._model_base import SdkJSONEncoder, _deserialize
+from ...models._model_base import SdkJSONEncoder, _deserialize
 from ...operations._operations import (
     build_basic_create_or_replace_request,
     build_basic_create_or_update_request,

packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/models/_models.py

@@ -9,8 +9,8 @@
 
 from typing import Any, List, Mapping, Optional, TYPE_CHECKING, overload
 
-from .. import _model_base
-from .._model_base import rest_field
+from . import _model_base
+from ._model_base import rest_field
 
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports

packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/operations/_operations.py

@@ -27,9 +27,9 @@
 from azure.core.utils import case_insensitive_dict
 
 from .. import models as _models
-from .._model_base import SdkJSONEncoder, _deserialize
 from .._serialization import Serializer
 from .._vendor import BasicClientMixinABC
+from ..models._model_base import SdkJSONEncoder, _deserialize
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping

packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_operations/_operations.py

@@ -27,9 +27,9 @@
 from azure.core.utils import case_insensitive_dict
 
 from .. import models as _models
-from .._model_base import SdkJSONEncoder, _deserialize
 from .._serialization import Serializer
 from .._vendor import StandardClientMixinABC
+from ..models._model_base import SdkJSONEncoder, _deserialize
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping

packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_operations/_operations.py

@@ -27,12 +27,12 @@
 from azure.core.utils import case_insensitive_dict
 
 from ... import models as _models
-from ..._model_base import SdkJSONEncoder, _deserialize
 from ..._operations._operations import (
     build_standard_create_or_replace_request,
     build_standard_delete_request,
     build_standard_export_request,
 )
+from ...models._model_base import SdkJSONEncoder, _deserialize
 from .._vendor import StandardClientMixinABC
 
 if sys.version_info >= (3, 9):

packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/models/_models.py

@@ -9,8 +9,8 @@
 
 from typing import Any, Mapping, overload
 
-from .. import _model_base
-from .._model_base import rest_field
+from . import _model_base
+from ._model_base import rest_field
 
 
 class ExportedUser(_model_base.Model):

packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/operations/_operations.py

@@ -25,7 +25,7 @@
 from azure.core.utils import case_insensitive_dict
 
 from ... import models as _models
-from ..._model_base import SdkJSONEncoder, _deserialize
+from ...models._model_base import SdkJSONEncoder, _deserialize
 from ...operations._operations import (
     build_azure_location_scalar_get_request,
     build_azure_location_scalar_header_request,

packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/models/_models.py

@@ -9,8 +9,8 @@
 
 from typing import Any, Mapping, overload
 
-from .. import _model_base
-from .._model_base import rest_field
+from . import _model_base
+from ._model_base import rest_field
 
 
 class AzureLocationModel(_model_base.Model):

packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/operations/_operations.py

@@ -25,8 +25,8 @@
 from azure.core.utils import case_insensitive_dict
 
 from .. import models as _models
-from .._model_base import SdkJSONEncoder, _deserialize
 from .._serialization import Serializer
+from ..models._model_base import SdkJSONEncoder, _deserialize
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping

packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_operations/_operations.py

@@ -29,9 +29,9 @@
 from azure.core.utils import case_insensitive_dict
 
 from .. import models as _models
-from .._model_base import SdkJSONEncoder, _deserialize
 from .._serialization import Serializer
 from .._vendor import TraitsClientMixinABC, prep_if_match, prep_if_none_match
+from ..models._model_base import SdkJSONEncoder, _deserialize
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping

packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_operations/_operations.py

@@ -28,8 +28,8 @@
 from azure.core.utils import case_insensitive_dict
 
 from ... import models as _models
-from ..._model_base import SdkJSONEncoder, _deserialize
 from ..._operations._operations import build_traits_repeatable_action_request, build_traits_smoke_test_request
+from ...models._model_base import SdkJSONEncoder, _deserialize
 from .._vendor import TraitsClientMixinABC
 
 if sys.version_info >= (3, 9):

packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/models/_models.py

@@ -9,8 +9,8 @@
 
 from typing import Any, Mapping, Optional, overload
 
-from .. import _model_base
-from .._model_base import rest_field
+from . import _model_base
+from ._model_base import rest_field
 
 
 class User(_model_base.Model):

packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/aio/operations/_operations.py

@@ -31,7 +31,7 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._model_base import SdkJSONEncoder, _deserialize
+from ...models._model_base import SdkJSONEncoder, _deserialize
 from ...operations._operations import (
     build_catalogs_count_devices_request,
     build_catalogs_create_or_update_request,