From 914d09673f422308daaee2087f6d6010271ffffc Mon Sep 17 00:00:00 2001 From: iscai-msft <43154838+iscai-msft@users.noreply.github.com> Date: Wed, 29 May 2024 13:20:43 -0400 Subject: [PATCH] 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 --- .chronus/changes/move_model_base-2024-4-28-13-45-23.md | 8 ++++++++ .../autorest/codegen/models/lro_operation.py | 2 +- .../autorest.python/autorest/codegen/models/model_type.py | 2 +- .../autorest.python/autorest/codegen/models/operation.py | 6 +++--- .../autorest/codegen/models/paging_operation.py | 2 +- .../autorest.python/autorest/codegen/models/property.py | 2 +- .../autorest/codegen/serializers/__init__.py | 2 +- .../autorest/codegen/serializers/general_serializer.py | 4 ++-- .../autorest/codegen/serializers/model_serializer.py | 2 +- .../authentication/apikey/_operations/_operations.py | 2 +- .../authentication/apikey/aio/_operations/_operations.py | 2 +- .../authentication/apikey/{ => models}/_model_base.py | 0 .../authentication/apikey/models/_models.py | 4 ++-- .../authentication/http/custom/_operations/_operations.py | 2 +- .../http/custom/aio/_operations/_operations.py | 2 +- .../http/custom/{ => models}/_model_base.py | 0 .../authentication/http/custom/models/_models.py | 4 ++-- .../authentication/oauth2/_operations/_operations.py | 2 +- .../authentication/oauth2/aio/_operations/_operations.py | 2 +- .../authentication/oauth2/{ => models}/_model_base.py | 0 .../authentication/oauth2/models/_models.py | 4 ++-- .../authentication/union/{ => models}/_model_base.py | 0 .../core/access/aio/operations/_operations.py | 2 +- .../core/access/{ => models}/_model_base.py | 0 .../azure/clientgenerator/core/access/models/_models.py | 4 ++-- .../clientgenerator/core/access/operations/_operations.py | 2 +- .../core/usage/aio/operations/_operations.py | 2 +- .../core/usage/{ => models}/_model_base.py | 0 .../azure/clientgenerator/core/usage/models/_models.py | 4 ++-- .../clientgenerator/core/usage/operations/_operations.py | 2 +- .../specs/azure/core/basic/aio/operations/_operations.py | 2 +- .../specs/azure/core/basic/{ => models}/_model_base.py | 0 .../specs/azure/core/basic/models/_models.py | 4 ++-- .../specs/azure/core/basic/operations/_operations.py | 2 +- .../azure/core/lro/standard/_operations/_operations.py | 2 +- .../core/lro/standard/aio/_operations/_operations.py | 2 +- .../azure/core/lro/standard/{ => models}/_model_base.py | 0 .../specs/azure/core/lro/standard/models/_models.py | 4 ++-- .../specs/azure/core/scalar/aio/operations/_operations.py | 2 +- .../specs/azure/core/scalar/{ => models}/_model_base.py | 0 .../specs/azure/core/scalar/models/_models.py | 4 ++-- .../specs/azure/core/scalar/operations/_operations.py | 2 +- .../specs/azure/core/traits/_operations/_operations.py | 2 +- .../azure/core/traits/aio/_operations/_operations.py | 2 +- .../specs/azure/core/traits/{ => models}/_model_base.py | 0 .../specs/azure/core/traits/models/_models.py | 4 ++-- .../azure/mgmt/spheredpg/aio/operations/_operations.py | 2 +- .../azure/mgmt/spheredpg/{ => models}/_model_base.py | 0 .../azure/mgmt/spheredpg/models/_models.py | 4 ++-- .../azure/mgmt/spheredpg/operations/_operations.py | 2 +- .../xmsclientrequestid/{ => models}/_model_base.py | 0 .../azurecore/lro/rpc/_operations/_operations.py | 2 +- .../azurecore/lro/rpc/aio/_operations/_operations.py | 2 +- .../azurecore/lro/rpc/{ => models}/_model_base.py | 0 .../azurecore-lro-rpc/azurecore/lro/rpc/models/_models.py | 4 ++-- .../client/naming/aio/operations/_operations.py | 2 +- .../client/naming/{ => models}/_model_base.py | 0 .../client-naming/client/naming/models/_models.py | 4 ++-- .../client-naming/client/naming/operations/_operations.py | 2 +- .../client/structure/service/{ => models}/_model_base.py | 0 .../structure/multiclient/{ => models}/_model_base.py | 0 .../renamedoperation/{ => models}/_model_base.py | 0 .../twooperationgroup/{ => models}/_model_base.py | 0 .../encode/bytes/aio/operations/_operations.py | 2 +- .../encode-bytes/encode/bytes/{ => models}/_model_base.py | 0 .../generated/encode-bytes/encode/bytes/models/_models.py | 4 ++-- .../encode-bytes/encode/bytes/operations/_operations.py | 2 +- .../encode/datetime/aio/operations/_operations.py | 2 +- .../encode/datetime/{ => models}/_model_base.py | 0 .../encode-datetime/encode/datetime/models/_models.py | 4 ++-- .../encode/datetime/operations/_operations.py | 2 +- .../encode/duration/aio/operations/_operations.py | 2 +- .../encode/duration/{ => models}/_model_base.py | 0 .../encode-duration/encode/duration/models/_models.py | 4 ++-- .../encode/duration/operations/_operations.py | 2 +- .../headasbooleanfalse/_operations/_operations.py | 2 +- .../headasbooleanfalse/aio/_operations/_operations.py | 2 +- .../headasbooleanfalse/{ => models}/_model_base.py | 0 .../headasbooleanfalse/models/_models.py | 4 ++-- .../headasbooleantrue/_operations/_operations.py | 2 +- .../headasbooleantrue/aio/_operations/_operations.py | 2 +- .../headasbooleantrue/{ => models}/_model_base.py | 0 .../headasbooleantrue/headasbooleantrue/models/_models.py | 4 ++-- .../parameters/basic/aio/operations/_operations.py | 2 +- .../parameters/basic/{ => models}/_model_base.py | 0 .../parameters-basic/parameters/basic/models/_models.py | 4 ++-- .../parameters/basic/operations/_operations.py | 2 +- .../bodyoptionality/aio/operations/_operations.py | 2 +- .../bodyoptionality/{ => models}/_model_base.py | 0 .../parameters/bodyoptionality/models/_models.py | 4 ++-- .../parameters/bodyoptionality/operations/_operations.py | 2 +- .../collectionformat/{ => models}/_model_base.py | 0 .../parameters/spread/aio/operations/_operations.py | 2 +- .../parameters/spread/{ => models}/_model_base.py | 0 .../parameters-spread/parameters/spread/models/_models.py | 4 ++-- .../parameters/spread/operations/_operations.py | 2 +- .../contentnegotiation/aio/operations/_operations.py | 2 +- .../contentnegotiation/{ => models}/_model_base.py | 0 .../payload/contentnegotiation/models/_models.py | 4 ++-- .../payload/contentnegotiation/operations/_operations.py | 2 +- .../payload/jsonmergepatch/_operations/_operations.py | 2 +- .../payload/jsonmergepatch/aio/_operations/_operations.py | 2 +- .../payload/jsonmergepatch/{ => models}/_model_base.py | 0 .../payload/jsonmergepatch/models/_models.py | 4 ++-- .../payload/mediatype/aio/operations/_operations.py | 2 +- .../payload/mediatype/{ => models}/_model_base.py | 0 .../payload/mediatype/operations/_operations.py | 2 +- .../payload-multipart/payload/multipart/_vendor.py | 2 +- .../payload/multipart/aio/operations/_operations.py | 3 ++- .../payload/multipart/{ => models}/_model_base.py | 0 .../payload-multipart/payload/multipart/models/_models.py | 4 ++-- .../payload/multipart/operations/_operations.py | 3 ++- .../payload/pageable/_operations/_operations.py | 2 +- .../payload/pageable/aio/_operations/_operations.py | 2 +- .../payload/pageable/{ => models}/_model_base.py | 0 .../payload-pageable/payload/pageable/models/_models.py | 4 ++-- .../resiliency/srv/driven1/{ => models}/_model_base.py | 0 .../resiliency/srv/driven2/{ => models}/_model_base.py | 0 .../encodedname/json/aio/operations/_operations.py | 2 +- .../encodedname/json/{ => models}/_model_base.py | 0 .../serialization/encodedname/json/models/_models.py | 4 ++-- .../encodedname/json/operations/_operations.py | 2 +- .../endpoint/notdefined/{ => models}/_model_base.py | 0 .../server/path/multiple/{ => models}/_model_base.py | 0 .../server/path/single/{ => models}/_model_base.py | 0 .../versions/notversioned/{ => models}/_model_base.py | 0 .../server/versions/versioned/{ => models}/_model_base.py | 0 .../conditionalrequest/{ => models}/_model_base.py | 0 .../repeatability/{ => models}/_model_base.py | 0 .../specialwords/aio/operations/_operations.py | 2 +- .../specialwords/{ => models}/_model_base.py | 0 .../special-words/specialwords/models/_models.py | 4 ++-- .../special-words/specialwords/operations/_operations.py | 2 +- .../typetest/array/aio/operations/_operations.py | 2 +- .../typetest/array/{ => models}/_model_base.py | 0 .../typetest-array/typetest/array/models/_models.py | 4 ++-- .../typetest/array/operations/_operations.py | 2 +- .../typetest/dictionary/aio/operations/_operations.py | 2 +- .../typetest/dictionary/{ => models}/_model_base.py | 0 .../typetest/dictionary/models/_models.py | 4 ++-- .../typetest/dictionary/operations/_operations.py | 2 +- .../enum/extensible/aio/operations/_operations.py | 2 +- .../typetest/enum/extensible/{ => models}/_model_base.py | 0 .../typetest/enum/extensible/operations/_operations.py | 2 +- .../typetest/enum/fixed/aio/operations/_operations.py | 2 +- .../typetest/enum/fixed/{ => models}/_model_base.py | 0 .../typetest/enum/fixed/operations/_operations.py | 2 +- .../typetest/model/empty/_operations/_operations.py | 2 +- .../typetest/model/empty/aio/_operations/_operations.py | 2 +- .../typetest/model/empty/{ => models}/_model_base.py | 0 .../typetest/model/empty/models/_models.py | 2 +- .../model/enumdiscriminator/_operations/_operations.py | 2 +- .../enumdiscriminator/aio/_operations/_operations.py | 2 +- .../model/enumdiscriminator/{ => models}/_model_base.py | 0 .../typetest/model/enumdiscriminator/models/_models.py | 4 ++-- .../typetest/model/flatten/_operations/_operations.py | 2 +- .../typetest/model/flatten/aio/_operations/_operations.py | 2 +- .../typetest/model/flatten/{ => models}/_model_base.py | 0 .../typetest/model/flatten/models/_models.py | 4 ++-- .../model/nesteddiscriminator/_operations/_operations.py | 2 +- .../nesteddiscriminator/aio/_operations/_operations.py | 2 +- .../model/nesteddiscriminator/{ => models}/_model_base.py | 0 .../typetest/model/nesteddiscriminator/models/_models.py | 4 ++-- .../model/notdiscriminated/_operations/_operations.py | 2 +- .../model/notdiscriminated/aio/_operations/_operations.py | 2 +- .../model/notdiscriminated/{ => models}/_model_base.py | 0 .../typetest/model/notdiscriminated/models/_models.py | 4 ++-- .../typetest/model/recursive/_operations/_operations.py | 2 +- .../model/recursive/aio/_operations/_operations.py | 2 +- .../typetest/model/recursive/{ => models}/_model_base.py | 0 .../typetest/model/recursive/models/_models.py | 4 ++-- .../model/singlediscriminator/_operations/_operations.py | 2 +- .../singlediscriminator/aio/_operations/_operations.py | 2 +- .../model/singlediscriminator/{ => models}/_model_base.py | 0 .../typetest/model/singlediscriminator/models/_models.py | 4 ++-- .../typetest/model/usage/_operations/_operations.py | 2 +- .../typetest/model/usage/aio/_operations/_operations.py | 2 +- .../typetest/model/usage/{ => models}/_model_base.py | 0 .../typetest/model/usage/models/_models.py | 4 ++-- .../typetest/model/visibility/_operations/_operations.py | 2 +- .../model/visibility/aio/_operations/_operations.py | 2 +- .../typetest/model/visibility/{ => models}/_model_base.py | 0 .../typetest/model/visibility/models/_models.py | 4 ++-- .../additionalproperties/aio/operations/_operations.py | 2 +- .../additionalproperties/{ => models}/_model_base.py | 0 .../property/additionalproperties/models/_models.py | 4 ++-- .../additionalproperties/operations/_operations.py | 2 +- .../property/nullable/aio/operations/_operations.py | 2 +- .../property/nullable/{ => models}/_model_base.py | 0 .../typetest/property/nullable/models/_models.py | 4 ++-- .../typetest/property/nullable/operations/_operations.py | 2 +- .../property/optional/aio/operations/_operations.py | 2 +- .../property/optional/{ => models}/_model_base.py | 0 .../typetest/property/optional/models/_models.py | 4 ++-- .../typetest/property/optional/operations/_operations.py | 2 +- .../property/valuetypes/aio/operations/_operations.py | 2 +- .../property/valuetypes/{ => models}/_model_base.py | 0 .../typetest/property/valuetypes/models/_models.py | 4 ++-- .../property/valuetypes/operations/_operations.py | 2 +- .../typetest/scalar/aio/operations/_operations.py | 2 +- .../typetest/scalar/{ => models}/_model_base.py | 0 .../typetest/scalar/operations/_operations.py | 2 +- .../typetest/union/aio/operations/_operations.py | 2 +- .../typetest/union/{ => models}/_model_base.py | 0 .../typetest-union/typetest/union/models/_models.py | 4 ++-- .../typetest/union/operations/_operations.py | 2 +- .../versioning/added/aio/operations/_operations.py | 2 +- .../versioning/added/{ => models}/_model_base.py | 0 .../versioning-added/versioning/added/models/_models.py | 4 ++-- .../versioning/added/operations/_operations.py | 2 +- .../versioning/madeoptional/_operations/_operations.py | 2 +- .../madeoptional/aio/_operations/_operations.py | 2 +- .../versioning/madeoptional/{ => models}/_model_base.py | 0 .../versioning/madeoptional/models/_models.py | 4 ++-- .../versioning/removed/_operations/_operations.py | 2 +- .../versioning/removed/aio/_operations/_operations.py | 2 +- .../versioning/removed/{ => models}/_model_base.py | 0 .../versioning/removed/models/_models.py | 4 ++-- .../versioning/renamedfrom/aio/operations/_operations.py | 2 +- .../versioning/renamedfrom/{ => models}/_model_base.py | 0 .../versioning/renamedfrom/models/_models.py | 4 ++-- .../versioning/renamedfrom/operations/_operations.py | 2 +- .../returntypechangedfrom/_operations/_operations.py | 2 +- .../returntypechangedfrom/aio/_operations/_operations.py | 2 +- .../returntypechangedfrom/{ => models}/_model_base.py | 0 .../versioning/typechangedfrom/_operations/_operations.py | 2 +- .../typechangedfrom/aio/_operations/_operations.py | 2 +- .../typechangedfrom/{ => models}/_model_base.py | 0 .../versioning/typechangedfrom/models/_models.py | 4 ++-- .../test/azure/mock_api_tests/test_mgmt_models_mode.py | 3 +-- .../asynctests/test_typetest_property_nullable_async.py | 2 +- .../test_typetest_property_nullable.py | 2 +- .../unittests/test_model_base_serialization.py | 2 +- .../authentication/apikey/_operations/_operations.py | 2 +- .../authentication/apikey/aio/_operations/_operations.py | 2 +- .../authentication/apikey/{ => models}/_model_base.py | 0 .../authentication/apikey/models/_models.py | 4 ++-- .../authentication/http/custom/_operations/_operations.py | 2 +- .../http/custom/aio/_operations/_operations.py | 2 +- .../http/custom/{ => models}/_model_base.py | 0 .../authentication/http/custom/models/_models.py | 4 ++-- .../authentication/oauth2/_operations/_operations.py | 2 +- .../authentication/oauth2/aio/_operations/_operations.py | 2 +- .../authentication/oauth2/{ => models}/_model_base.py | 0 .../authentication/oauth2/models/_models.py | 4 ++-- .../authentication/union/{ => models}/_model_base.py | 0 .../client/naming/aio/operations/_operations.py | 2 +- .../client/naming/{ => models}/_model_base.py | 0 .../client-naming/client/naming/models/_models.py | 4 ++-- .../client-naming/client/naming/operations/_operations.py | 2 +- .../client/structure/service/{ => models}/_model_base.py | 0 .../structure/multiclient/{ => models}/_model_base.py | 0 .../renamedoperation/{ => models}/_model_base.py | 0 .../twooperationgroup/{ => models}/_model_base.py | 0 .../encode/bytes/aio/operations/_operations.py | 2 +- .../encode-bytes/encode/bytes/{ => models}/_model_base.py | 0 .../generated/encode-bytes/encode/bytes/models/_models.py | 4 ++-- .../encode-bytes/encode/bytes/operations/_operations.py | 2 +- .../encode/datetime/aio/operations/_operations.py | 2 +- .../encode/datetime/{ => models}/_model_base.py | 0 .../encode-datetime/encode/datetime/models/_models.py | 4 ++-- .../encode/datetime/operations/_operations.py | 2 +- .../encode/duration/aio/operations/_operations.py | 2 +- .../encode/duration/{ => models}/_model_base.py | 0 .../encode-duration/encode/duration/models/_models.py | 4 ++-- .../encode/duration/operations/_operations.py | 2 +- .../headasbooleanfalse/_operations/_operations.py | 2 +- .../headasbooleanfalse/aio/_operations/_operations.py | 2 +- .../headasbooleanfalse/{ => models}/_model_base.py | 0 .../headasbooleanfalse/models/_models.py | 4 ++-- .../headasbooleantrue/_operations/_operations.py | 2 +- .../headasbooleantrue/aio/_operations/_operations.py | 2 +- .../headasbooleantrue/{ => models}/_model_base.py | 0 .../headasbooleantrue/headasbooleantrue/models/_models.py | 4 ++-- .../parameters/basic/aio/operations/_operations.py | 2 +- .../parameters/basic/{ => models}/_model_base.py | 0 .../parameters-basic/parameters/basic/models/_models.py | 4 ++-- .../parameters/basic/operations/_operations.py | 2 +- .../bodyoptionality/aio/operations/_operations.py | 2 +- .../bodyoptionality/{ => models}/_model_base.py | 0 .../parameters/bodyoptionality/models/_models.py | 4 ++-- .../parameters/bodyoptionality/operations/_operations.py | 2 +- .../collectionformat/{ => models}/_model_base.py | 0 .../parameters/spread/aio/operations/_operations.py | 2 +- .../parameters/spread/{ => models}/_model_base.py | 0 .../parameters-spread/parameters/spread/models/_models.py | 4 ++-- .../parameters/spread/operations/_operations.py | 2 +- .../contentnegotiation/aio/operations/_operations.py | 2 +- .../contentnegotiation/{ => models}/_model_base.py | 0 .../payload/contentnegotiation/models/_models.py | 4 ++-- .../payload/contentnegotiation/operations/_operations.py | 2 +- .../payload/jsonmergepatch/_operations/_operations.py | 2 +- .../payload/jsonmergepatch/aio/_operations/_operations.py | 2 +- .../payload/jsonmergepatch/{ => models}/_model_base.py | 0 .../payload/jsonmergepatch/models/_models.py | 4 ++-- .../payload/mediatype/aio/operations/_operations.py | 2 +- .../payload/mediatype/{ => models}/_model_base.py | 0 .../payload/mediatype/operations/_operations.py | 2 +- .../payload-multipart/payload/multipart/_vendor.py | 2 +- .../payload/multipart/aio/operations/_operations.py | 3 ++- .../payload/multipart/{ => models}/_model_base.py | 0 .../payload-multipart/payload/multipart/models/_models.py | 4 ++-- .../payload/multipart/operations/_operations.py | 3 ++- .../payload/pageable/_operations/_operations.py | 2 +- .../payload/pageable/aio/_operations/_operations.py | 2 +- .../payload/pageable/{ => models}/_model_base.py | 0 .../payload-pageable/payload/pageable/models/_models.py | 4 ++-- .../resiliency/srv/driven1/{ => models}/_model_base.py | 0 .../resiliency/srv/driven2/{ => models}/_model_base.py | 0 .../encodedname/json/aio/operations/_operations.py | 2 +- .../encodedname/json/{ => models}/_model_base.py | 0 .../serialization/encodedname/json/models/_models.py | 4 ++-- .../encodedname/json/operations/_operations.py | 2 +- .../endpoint/notdefined/{ => models}/_model_base.py | 0 .../server/path/multiple/{ => models}/_model_base.py | 0 .../server/path/single/{ => models}/_model_base.py | 0 .../versions/notversioned/{ => models}/_model_base.py | 0 .../server/versions/versioned/{ => models}/_model_base.py | 0 .../conditionalrequest/{ => models}/_model_base.py | 0 .../repeatability/{ => models}/_model_base.py | 0 .../specialwords/aio/operations/_operations.py | 2 +- .../specialwords/{ => models}/_model_base.py | 0 .../special-words/specialwords/models/_models.py | 4 ++-- .../special-words/specialwords/operations/_operations.py | 2 +- .../typetest/array/aio/operations/_operations.py | 2 +- .../typetest/array/{ => models}/_model_base.py | 0 .../typetest-array/typetest/array/models/_models.py | 4 ++-- .../typetest/array/operations/_operations.py | 2 +- .../typetest/dictionary/aio/operations/_operations.py | 2 +- .../typetest/dictionary/{ => models}/_model_base.py | 0 .../typetest/dictionary/models/_models.py | 4 ++-- .../typetest/dictionary/operations/_operations.py | 2 +- .../enum/extensible/aio/operations/_operations.py | 2 +- .../typetest/enum/extensible/{ => models}/_model_base.py | 0 .../typetest/enum/extensible/operations/_operations.py | 2 +- .../typetest/enum/fixed/aio/operations/_operations.py | 2 +- .../typetest/enum/fixed/{ => models}/_model_base.py | 0 .../typetest/enum/fixed/operations/_operations.py | 2 +- .../typetest/model/empty/_operations/_operations.py | 2 +- .../typetest/model/empty/aio/_operations/_operations.py | 2 +- .../typetest/model/empty/{ => models}/_model_base.py | 0 .../typetest/model/empty/models/_models.py | 2 +- .../model/enumdiscriminator/_operations/_operations.py | 2 +- .../enumdiscriminator/aio/_operations/_operations.py | 2 +- .../model/enumdiscriminator/{ => models}/_model_base.py | 0 .../typetest/model/enumdiscriminator/models/_models.py | 4 ++-- .../typetest/model/flatten/_operations/_operations.py | 2 +- .../typetest/model/flatten/aio/_operations/_operations.py | 2 +- .../typetest/model/flatten/{ => models}/_model_base.py | 0 .../typetest/model/flatten/models/_models.py | 4 ++-- .../model/nesteddiscriminator/_operations/_operations.py | 2 +- .../nesteddiscriminator/aio/_operations/_operations.py | 2 +- .../model/nesteddiscriminator/{ => models}/_model_base.py | 0 .../typetest/model/nesteddiscriminator/models/_models.py | 4 ++-- .../model/notdiscriminated/_operations/_operations.py | 2 +- .../model/notdiscriminated/aio/_operations/_operations.py | 2 +- .../model/notdiscriminated/{ => models}/_model_base.py | 0 .../typetest/model/notdiscriminated/models/_models.py | 4 ++-- .../typetest/model/recursive/_operations/_operations.py | 2 +- .../model/recursive/aio/_operations/_operations.py | 2 +- .../typetest/model/recursive/{ => models}/_model_base.py | 0 .../typetest/model/recursive/models/_models.py | 4 ++-- .../model/singlediscriminator/_operations/_operations.py | 2 +- .../singlediscriminator/aio/_operations/_operations.py | 2 +- .../model/singlediscriminator/{ => models}/_model_base.py | 0 .../typetest/model/singlediscriminator/models/_models.py | 4 ++-- .../typetest/model/usage/_operations/_operations.py | 2 +- .../typetest/model/usage/aio/_operations/_operations.py | 2 +- .../typetest/model/usage/{ => models}/_model_base.py | 0 .../typetest/model/usage/models/_models.py | 4 ++-- .../typetest/model/visibility/_operations/_operations.py | 2 +- .../model/visibility/aio/_operations/_operations.py | 2 +- .../typetest/model/visibility/{ => models}/_model_base.py | 0 .../typetest/model/visibility/models/_models.py | 4 ++-- .../additionalproperties/aio/operations/_operations.py | 2 +- .../additionalproperties/{ => models}/_model_base.py | 0 .../property/additionalproperties/models/_models.py | 4 ++-- .../additionalproperties/operations/_operations.py | 2 +- .../property/nullable/aio/operations/_operations.py | 2 +- .../property/nullable/{ => models}/_model_base.py | 0 .../typetest/property/nullable/models/_models.py | 4 ++-- .../typetest/property/nullable/operations/_operations.py | 2 +- .../property/optional/aio/operations/_operations.py | 2 +- .../property/optional/{ => models}/_model_base.py | 0 .../typetest/property/optional/models/_models.py | 4 ++-- .../typetest/property/optional/operations/_operations.py | 2 +- .../property/valuetypes/aio/operations/_operations.py | 2 +- .../property/valuetypes/{ => models}/_model_base.py | 0 .../typetest/property/valuetypes/models/_models.py | 4 ++-- .../property/valuetypes/operations/_operations.py | 2 +- .../typetest/scalar/aio/operations/_operations.py | 2 +- .../typetest/scalar/{ => models}/_model_base.py | 0 .../typetest/scalar/operations/_operations.py | 2 +- .../typetest/union/aio/operations/_operations.py | 2 +- .../typetest/union/{ => models}/_model_base.py | 0 .../typetest-union/typetest/union/models/_models.py | 4 ++-- .../typetest/union/operations/_operations.py | 2 +- .../versioning/added/aio/operations/_operations.py | 2 +- .../versioning/added/{ => models}/_model_base.py | 0 .../versioning-added/versioning/added/models/_models.py | 4 ++-- .../versioning/added/operations/_operations.py | 2 +- .../versioning/madeoptional/_operations/_operations.py | 2 +- .../madeoptional/aio/_operations/_operations.py | 2 +- .../versioning/madeoptional/{ => models}/_model_base.py | 0 .../versioning/madeoptional/models/_models.py | 4 ++-- .../versioning/removed/_operations/_operations.py | 2 +- .../versioning/removed/aio/_operations/_operations.py | 2 +- .../versioning/removed/{ => models}/_model_base.py | 0 .../versioning/removed/models/_models.py | 4 ++-- .../versioning/renamedfrom/aio/operations/_operations.py | 2 +- .../versioning/renamedfrom/{ => models}/_model_base.py | 0 .../versioning/renamedfrom/models/_models.py | 4 ++-- .../versioning/renamedfrom/operations/_operations.py | 2 +- .../returntypechangedfrom/_operations/_operations.py | 2 +- .../returntypechangedfrom/aio/_operations/_operations.py | 2 +- .../returntypechangedfrom/{ => models}/_model_base.py | 0 .../versioning/typechangedfrom/_operations/_operations.py | 2 +- .../typechangedfrom/aio/_operations/_operations.py | 2 +- .../typechangedfrom/{ => models}/_model_base.py | 0 .../versioning/typechangedfrom/models/_models.py | 4 ++-- 420 files changed, 391 insertions(+), 380 deletions(-) create mode 100644 .chronus/changes/move_model_base-2024-4-28-13-45-23.md rename packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/authentication-union/authentication/union/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/client-naming/client/naming/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/client-structure-multiclient/client/structure/multiclient/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/client-structure-renamedoperation/client/structure/renamedoperation/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/client-structure-twooperationgroup/client/structure/twooperationgroup/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/encode-duration/encode/duration/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/resiliency-srv-driven1/resiliency/srv/driven1/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/resiliency-srv-driven2/resiliency/srv/driven2/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/server-endpoint-not-defined/server/endpoint/notdefined/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/server-path-multiple/server/path/multiple/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/server-path-single/server/path/single/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/server-versions-not-versioned/server/versions/notversioned/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/server-versions-versioned/server/versions/versioned/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/special-words/specialwords/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-array/typetest/array/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-enum-extensible/typetest/enum/extensible/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-enum-fixed/typetest/enum/fixed/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/usage/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/typetest-union/typetest/union/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/versioning-added/versioning/added/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/authentication-union/authentication/union/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/client-naming/client/naming/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/client-structure-default/client/structure/service/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/client-structure-multiclient/client/structure/multiclient/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/client-structure-renamedoperation/client/structure/renamedoperation/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/client-structure-twooperationgroup/client/structure/twooperationgroup/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/parameters-collection-format/parameters/collectionformat/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/payload-media-type/payload/mediatype/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/resiliency-srv-driven1/resiliency/srv/driven1/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/resiliency-srv-driven2/resiliency/srv/driven2/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/server-endpoint-not-defined/server/endpoint/notdefined/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/server-path-multiple/server/path/multiple/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/server-path-single/server/path/single/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/server-versions-not-versioned/server/versions/notversioned/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/server-versions-versioned/server/versions/versioned/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/special-headers-conditional-request/specialheaders/conditionalrequest/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/special-headers-repeatability/specialheaders/repeatability/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/special-words/specialwords/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/typetest/enum/extensible/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/typetest/enum/fixed/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/usage/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-scalar/typetest/scalar/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/{ => models}/_model_base.py (100%) rename packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/{ => models}/_model_base.py (100%) diff --git a/.chronus/changes/move_model_base-2024-4-28-13-45-23.md b/.chronus/changes/move_model_base-2024-4-28-13-45-23.md new file mode 100644 index 00000000000..73a8e3acd12 --- /dev/null +++ b/.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 \ No newline at end of file diff --git a/packages/autorest.python/autorest/codegen/models/lro_operation.py b/packages/autorest.python/autorest/codegen/models/lro_operation.py index 2e127df9d3b..d8dfbc9e255 100644 --- 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 index f113ac7604b..342ea10fd0b 100644 --- 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 index 09136058537..c6db8167190 100644 --- 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 index 554b72d4431..9e8b4d75029 100644 --- 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 index bdda254c248..4657fcc335a 100644 --- 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 index 377a6b20ad1..6a3bf79ad32 100644 --- 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 index f70f00a38f0..04d234386c6 100644 --- 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 index b42d35e9709..fc8430c858e 100644 --- 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, diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_operations.py index c813deaa7ef..e7d636b8de1 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_operations.py +++ b/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 diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/aio/_operations/_operations.py index e718bf8c87f..0e2cbcd1f69 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/aio/_operations/_operations.py +++ b/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): diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_model_base.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_model_base.py rename to packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/models/_models.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/models/_models.py index 628c2d9047c..2cfd72a166a 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/models/_models.py +++ b/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): diff --git a/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py index 4ce61101cde..bb175768eec 100644 --- a/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py +++ b/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 diff --git a/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/aio/_operations/_operations.py index 52db39bfff8..230b00f7e60 100644 --- a/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/aio/_operations/_operations.py +++ b/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): diff --git a/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/_model_base.py b/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/_model_base.py rename to packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/models/_models.py b/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/models/_models.py index 628c2d9047c..2cfd72a166a 100644 --- a/packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/models/_models.py +++ b/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): diff --git a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py index da76436dd84..6f22f8c9a74 100644 --- a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py +++ b/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 diff --git a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/aio/_operations/_operations.py index a2a177acca5..c20b940f357 100644 --- a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/aio/_operations/_operations.py +++ b/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): diff --git a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_model_base.py b/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_model_base.py rename to packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/models/_models.py b/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/models/_models.py index 628c2d9047c..2cfd72a166a 100644 --- a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/models/_models.py +++ b/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): diff --git a/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/_model_base.py b/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/authentication-union/authentication/union/_model_base.py rename to packages/typespec-python/test/azure/generated/authentication-union/authentication/union/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/operations/_operations.py index 5a096a9c735..a4a5fe96e6c 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/aio/operations/_operations.py +++ b/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, diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_model_base.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/models/_models.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/models/_models.py index dcba9bfb323..b682e07bb50 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/models/_models.py +++ b/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 diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/operations/_operations.py index 0fd32334f2c..eb5155b453a 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/operations/_operations.py +++ b/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 diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/operations/_operations.py index 9e8c17f0903..63557e57aec 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/aio/operations/_operations.py +++ b/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, diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/_model_base.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/models/_models.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/models/_models.py index ebc9839722c..7686e1fd8f7 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/models/_models.py +++ b/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): diff --git a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/operations/_operations.py index 99b96a26c39..a184e7c0a23 100644 --- a/packages/typespec-python/test/azure/generated/azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/operations/_operations.py +++ b/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 diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/operations/_operations.py index 64fd45cce49..83b3bc25681 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/aio/operations/_operations.py +++ b/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, diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_model_base.py b/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/models/_models.py b/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/models/_models.py index f0743b767f6..660e804848d 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/models/_models.py +++ b/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 diff --git a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/operations/_operations.py index ecd1e483ad9..7a291e0f87f 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-basic/specs/azure/core/basic/operations/_operations.py +++ b/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 diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_operations/_operations.py index 6df6a511156..3c4c1566208 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_operations/_operations.py +++ b/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 diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_operations/_operations.py index dfb10e4315d..8e63f7c1848 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/aio/_operations/_operations.py +++ b/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): diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_model_base.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/models/_models.py b/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/models/_models.py index 3ff18586a68..fe1dab51b6c 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-standard/specs/azure/core/lro/standard/models/_models.py +++ b/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): diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/operations/_operations.py index 17d0c946b52..fdc2a816d90 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/aio/operations/_operations.py +++ b/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, diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/_model_base.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/models/_models.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/models/_models.py index 116670ccf71..885ff2d7ab4 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/models/_models.py +++ b/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): diff --git a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/operations/_operations.py index a1adf3dd59a..565a8da26cb 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-scalar/specs/azure/core/scalar/operations/_operations.py +++ b/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 diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_operations/_operations.py index c716456dd88..60dfc0fa629 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_operations/_operations.py +++ b/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 diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_operations/_operations.py index fd7ecfa4e98..2bcd2c41e22 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/aio/_operations/_operations.py +++ b/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): diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_model_base.py b/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/models/_models.py b/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/models/_models.py index 63310893e8e..f4860a5c4e1 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-traits/specs/azure/core/traits/models/_models.py +++ b/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): diff --git a/packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/aio/operations/_operations.py index 7b86f22f589..07a278e96f2 100644 --- a/packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/aio/operations/_operations.py +++ b/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, diff --git a/packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/_model_base.py b/packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/models/_models.py b/packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/models/_models.py index 28ab6462388..48e3a3e3cf3 100644 --- a/packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/models/_models.py @@ -10,8 +10,8 @@ import datetime from typing import Any, Dict, List, Mapping, Optional, TYPE_CHECKING, Union, 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 diff --git a/packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/operations/_operations.py index dab1eb134cf..b3d73fecb37 100644 --- a/packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-mgmt-spheredpg/azure/mgmt/spheredpg/operations/_operations.py @@ -30,8 +30,8 @@ from azure.mgmt.core.polling.arm_polling import ARMPolling 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 diff --git a/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_model_base.py b/packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_model_base.py rename to packages/typespec-python/test/azure/generated/azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/_operations/_operations.py index 22e8a7faa15..f7065138964 100644 --- a/packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/_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 RpcClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/aio/_operations/_operations.py index 3ef5933f15c..525b19f63a9 100644 --- a/packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/aio/_operations/_operations.py @@ -27,8 +27,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_rpc_long_running_rpc_request +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import RpcClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/_model_base.py b/packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/_model_base.py rename to packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/models/_models.py b/packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/models/_models.py index ccd4d53fd8e..3b186eb0cdb 100644 --- a/packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/models/_models.py +++ b/packages/typespec-python/test/azure/generated/azurecore-lro-rpc/azurecore/lro/rpc/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, List, Mapping, Optional, TYPE_CHECKING, Union, 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 diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/operations/_operations.py index fb89e56b8ec..c2aa3e05b98 100644 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/client-naming/client/naming/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 +from ...models._model_base import SdkJSONEncoder from ...operations._operations import ( build_model_client_request, build_model_language_request, diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_model_base.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/client-naming/client/naming/_model_base.py rename to packages/typespec-python/test/azure/generated/client-naming/client/naming/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/models/_models.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/models/_models.py index 71b5a1e60a2..6684d327df2 100644 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/models/_models.py +++ b/packages/typespec-python/test/azure/generated/client-naming/client/naming/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 ClientModel(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/operations/_operations.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/operations/_operations.py index 24ae66ea21b..da8de01e20d 100644 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/client-naming/client/naming/operations/_operations.py @@ -25,9 +25,9 @@ from azure.core.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder from .._serialization import Serializer from .._vendor import NamingClientMixinABC +from ..models._model_base import SdkJSONEncoder if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/_model_base.py b/packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/_model_base.py rename to packages/typespec-python/test/azure/generated/client-structure-default/client/structure/service/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/client-structure-multiclient/client/structure/multiclient/_model_base.py b/packages/typespec-python/test/azure/generated/client-structure-multiclient/client/structure/multiclient/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/client-structure-multiclient/client/structure/multiclient/_model_base.py rename to packages/typespec-python/test/azure/generated/client-structure-multiclient/client/structure/multiclient/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/client-structure-renamedoperation/client/structure/renamedoperation/_model_base.py b/packages/typespec-python/test/azure/generated/client-structure-renamedoperation/client/structure/renamedoperation/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/client-structure-renamedoperation/client/structure/renamedoperation/_model_base.py rename to packages/typespec-python/test/azure/generated/client-structure-renamedoperation/client/structure/renamedoperation/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/client-structure-twooperationgroup/client/structure/twooperationgroup/_model_base.py b/packages/typespec-python/test/azure/generated/client-structure-twooperationgroup/client/structure/twooperationgroup/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/client-structure-twooperationgroup/client/structure/twooperationgroup/_model_base.py rename to packages/typespec-python/test/azure/generated/client-structure-twooperationgroup/client/structure/twooperationgroup/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/aio/operations/_operations.py index afabbefbc4c..743fb29514e 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/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_header_base64_request, build_header_base64url_array_request, diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/_model_base.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/_model_base.py rename to packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/models/_models.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/models/_models.py index 3c2fca7ae0b..07e919e8af5 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/models/_models.py +++ b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, List, Mapping, overload -from .. import _model_base -from .._model_base import rest_field +from . import _model_base +from ._model_base import rest_field class Base64BytesProperty(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/operations/_operations.py index d3471cc12b5..407ee3c4fa5 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/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 diff --git a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/aio/operations/_operations.py index d1a52676743..c834595777e 100644 --- a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/aio/operations/_operations.py @@ -26,7 +26,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_header_default_request, build_header_rfc3339_request, diff --git a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/_model_base.py b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/_model_base.py rename to packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/models/_models.py b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/models/_models.py index ee0e5e064a4..5d66a4bc953 100644 --- a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/models/_models.py +++ b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/models/_models.py @@ -10,8 +10,8 @@ import datetime from typing import Any, List, Mapping, overload -from .. import _model_base -from .._model_base import rest_field +from . import _model_base +from ._model_base import rest_field class DefaultDatetimeProperty(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/operations/_operations.py index 0f8156f356d..a4585a3d87d 100644 --- a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/operations/_operations.py @@ -26,8 +26,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 diff --git a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/aio/operations/_operations.py index 6caf7a9a109..55cba4d0194 100644 --- a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/aio/operations/_operations.py @@ -26,7 +26,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_header_default_request, build_header_float64_seconds_request, diff --git a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/_model_base.py b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/encode-duration/encode/duration/_model_base.py rename to packages/typespec-python/test/azure/generated/encode-duration/encode/duration/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/models/_models.py b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/models/_models.py index c56a43c7b31..2e84dd82fb7 100644 --- a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/models/_models.py +++ b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/models/_models.py @@ -10,8 +10,8 @@ import datetime from typing import Any, List, Mapping, overload -from .. import _model_base -from .._model_base import rest_field +from . import _model_base +from ._model_base import rest_field class DefaultDurationProperty(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/operations/_operations.py index f9370826d0e..5fd0828dbcb 100644 --- a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/operations/_operations.py @@ -26,8 +26,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 diff --git a/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/_operations/_operations.py b/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/_operations/_operations.py index 141e244bfe1..0ac2c0e481c 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/_operations/_operations.py @@ -25,9 +25,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 VisibilityClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/aio/_operations/_operations.py index 7f745e12126..b42ed165d00 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/aio/_operations/_operations.py @@ -25,7 +25,6 @@ from azure.core.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_visibility_delete_model_request, build_visibility_get_model_request, @@ -34,6 +33,7 @@ build_visibility_post_model_request, build_visibility_put_model_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import VisibilityClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/_model_base.py b/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/_model_base.py rename to packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py b/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py index 43c44190e97..911d680a090 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py +++ b/packages/typespec-python/test/azure/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, List, Mapping, overload -from .. import _model_base -from .._model_base import rest_field +from . import _model_base +from ._model_base import rest_field class VisibilityModel(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/_operations/_operations.py b/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/_operations/_operations.py index 76dfeb45325..26919fb4b9b 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/_operations/_operations.py @@ -25,9 +25,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 VisibilityClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/aio/_operations/_operations.py index ddc7d9e57b0..233d0de3139 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/aio/_operations/_operations.py @@ -25,7 +25,6 @@ from azure.core.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_visibility_delete_model_request, build_visibility_get_model_request, @@ -34,6 +33,7 @@ build_visibility_post_model_request, build_visibility_put_model_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import VisibilityClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/_model_base.py b/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/_model_base.py rename to packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/models/_models.py b/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/models/_models.py index 43c44190e97..911d680a090 100644 --- a/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/models/_models.py +++ b/packages/typespec-python/test/azure/generated/headasbooleantrue/headasbooleantrue/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, List, Mapping, overload -from .. import _model_base -from .._model_base import rest_field +from . import _model_base +from ._model_base import rest_field class VisibilityModel(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/aio/operations/_operations.py index ab541db093a..5da3c4e22ba 100644 --- a/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/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 +from ...models._model_base import SdkJSONEncoder from ...operations._operations import build_explicit_body_simple_request, build_implicit_body_simple_request if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/_model_base.py b/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/_model_base.py rename to packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/models/_models.py b/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/models/_models.py index ef701bc9426..1ea6290a6f8 100644 --- a/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/models/_models.py +++ b/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/models/_models.py @@ -10,8 +10,8 @@ import sys 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 if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/operations/_operations.py index 128d59b04bf..87ab51cbd81 100644 --- a/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/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 from .._serialization import Serializer +from ..models._model_base import SdkJSONEncoder if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/aio/operations/_operations.py index 9faafe9d3e6..83a97e634f0 100644 --- a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/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 +from ...models._model_base import SdkJSONEncoder from ...operations._operations import ( build_body_optionality_required_explicit_request, build_body_optionality_required_implicit_request, diff --git a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/_model_base.py b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/_model_base.py rename to packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/models/_models.py b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/models/_models.py index faa01103044..418bb59acd6 100644 --- a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/models/_models.py +++ b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/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 BodyModel(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/operations/_operations.py index fd950a840f4..750bf481b2e 100644 --- a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/operations/_operations.py @@ -25,9 +25,9 @@ from azure.core.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder from .._serialization import Serializer from .._vendor import BodyOptionalityClientMixinABC +from ..models._model_base import SdkJSONEncoder if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/_model_base.py b/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/_model_base.py rename to packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/aio/operations/_operations.py index 92ba5a188e2..10b169fef7a 100644 --- a/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/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 +from ...models._model_base import SdkJSONEncoder from ...operations._operations import ( build_alias_spread_as_request_body_request, build_alias_spread_as_request_parameter_request, diff --git a/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/_model_base.py b/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/_model_base.py rename to packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/models/_models.py b/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/models/_models.py index be2d49fb3c1..cd03a2cd88a 100644 --- a/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/models/_models.py +++ b/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/models/_models.py @@ -10,8 +10,8 @@ import sys 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 if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/operations/_operations.py index bdba1b62712..e65712d7e20 100644 --- a/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/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 from .._serialization import Serializer +from ..models._model_base import SdkJSONEncoder if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/aio/operations/_operations.py index a327654f4f9..c026063c3a3 100644 --- a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/aio/operations/_operations.py @@ -23,7 +23,7 @@ from azure.core.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import _deserialize +from ...models._model_base import _deserialize from ...operations._operations import ( build_different_body_get_avatar_as_json_request, build_different_body_get_avatar_as_png_request, diff --git a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/_model_base.py b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/_model_base.py rename to packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/models/_models.py b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/models/_models.py index 3830cdebf9d..fc0036af052 100644 --- a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/models/_models.py +++ b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/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 PngImageAsJson(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/operations/_operations.py index 97a89ad7cfc..b339ce7b6ff 100644 --- a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/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 diff --git a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_operations/_operations.py index 2fb256cfa2c..c4e34caa37e 100644 --- a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_operations/_operations.py @@ -25,9 +25,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 JsonMergePatchClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/aio/_operations/_operations.py index b8d050e542d..4e8df0e2ab6 100644 --- a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/aio/_operations/_operations.py @@ -25,12 +25,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_json_merge_patch_create_resource_request, build_json_merge_patch_update_optional_resource_request, build_json_merge_patch_update_resource_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import JsonMergePatchClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_model_base.py b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_model_base.py rename to packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/models/_models.py b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/models/_models.py index 8d9317193a6..999ae04fc35 100644 --- a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/models/_models.py +++ b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, Dict, 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 diff --git a/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/aio/operations/_operations.py index 755ff4644ac..c61e0e88ed8 100644 --- a/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/aio/operations/_operations.py @@ -23,7 +23,7 @@ from azure.core.tracing.decorator_async import distributed_trace_async from azure.core.utils import case_insensitive_dict -from ..._model_base import SdkJSONEncoder, _deserialize +from ...models._model_base import SdkJSONEncoder, _deserialize from ...operations._operations import ( build_string_body_get_as_json_request, build_string_body_get_as_text_request, diff --git a/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/_model_base.py b/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/_model_base.py rename to packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/operations/_operations.py index bd30008cc58..f2ad25cce5c 100644 --- a/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/operations/_operations.py @@ -23,8 +23,8 @@ from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict -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 diff --git a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_vendor.py b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_vendor.py index ab863f3898e..df69b256233 100644 --- a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_vendor.py +++ b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_vendor.py @@ -8,7 +8,7 @@ import json from typing import Any, Dict, IO, List, Mapping, Optional, Sequence, Tuple, Union -from ._model_base import Model, SdkJSONEncoder +from .models._model_base import Model, SdkJSONEncoder # file-like tuple could be `(filename, IO (or bytes))` or `(filename, IO (or bytes), content_type)` diff --git a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/aio/operations/_operations.py index ebe54e6b439..bafebf62b16 100644 --- a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/aio/operations/_operations.py @@ -21,8 +21,9 @@ from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.core.tracing.decorator_async import distributed_trace_async -from ... import _model_base, models as _models +from ... import models as _models from ..._vendor import prepare_multipart_form_data +from ...models import _model_base from ...operations._operations import ( build_form_data_anonymous_model_request, build_form_data_basic_request, diff --git a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_model_base.py b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_model_base.py rename to packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/models/_models.py b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/models/_models.py index d27c3919dee..4ed569517f2 100644 --- a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/models/_models.py +++ b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/models/_models.py @@ -10,9 +10,9 @@ import sys 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 .._vendor import FileType +from ._model_base import rest_field if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/operations/_operations.py index f2d0406b16a..1969c705d21 100644 --- a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/operations/_operations.py @@ -22,9 +22,10 @@ from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict -from .. import _model_base, models as _models +from .. import models as _models from .._serialization import Serializer from .._vendor import prepare_multipart_form_data +from ..models import _model_base if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/_operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/_operations/_operations.py index e3c26520e02..1bacab4d21b 100644 --- a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/_operations/_operations.py @@ -24,10 +24,10 @@ from azure.core.utils import case_insensitive_dict from .. import models as _models -from .._model_base import _deserialize from .._serialization import Serializer from .._validation import api_version_validation from .._vendor import PageableClientMixinABC +from ..models._model_base import _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/aio/_operations/_operations.py index f42debf579e..c9f098ab749 100644 --- a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/aio/_operations/_operations.py @@ -23,9 +23,9 @@ from azure.core.tracing.decorator import distributed_trace from ... import models as _models -from ..._model_base import _deserialize from ..._operations._operations import build_pageable_list_request from ..._validation import api_version_validation +from ...models._model_base import _deserialize from .._vendor import PageableClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/_model_base.py b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/_model_base.py rename to packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/models/_models.py b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/models/_models.py index 6526110ff37..11cafb0ceb5 100644 --- a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/models/_models.py +++ b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/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 User(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/resiliency-srv-driven1/resiliency/srv/driven1/_model_base.py b/packages/typespec-python/test/azure/generated/resiliency-srv-driven1/resiliency/srv/driven1/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/resiliency-srv-driven1/resiliency/srv/driven1/_model_base.py rename to packages/typespec-python/test/azure/generated/resiliency-srv-driven1/resiliency/srv/driven1/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/resiliency-srv-driven2/resiliency/srv/driven2/_model_base.py b/packages/typespec-python/test/azure/generated/resiliency-srv-driven2/resiliency/srv/driven2/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/resiliency-srv-driven2/resiliency/srv/driven2/_model_base.py rename to packages/typespec-python/test/azure/generated/resiliency-srv-driven2/resiliency/srv/driven2/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/aio/operations/_operations.py index 81c4b5b8530..21850a61c13 100644 --- a/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/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_property_get_request, build_property_send_request if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/_model_base.py b/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/_model_base.py rename to packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/models/_models.py b/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/models/_models.py index d67d5fb9c52..ed726c2205b 100644 --- a/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/models/_models.py +++ b/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/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 JsonEncodedNameModel(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/operations/_operations.py b/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/operations/_operations.py index ac504c1a142..b451453b87d 100644 --- a/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/serialization-encoded-name-json/serialization/encodedname/json/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 diff --git a/packages/typespec-python/test/azure/generated/server-endpoint-not-defined/server/endpoint/notdefined/_model_base.py b/packages/typespec-python/test/azure/generated/server-endpoint-not-defined/server/endpoint/notdefined/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/server-endpoint-not-defined/server/endpoint/notdefined/_model_base.py rename to packages/typespec-python/test/azure/generated/server-endpoint-not-defined/server/endpoint/notdefined/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/server-path-multiple/server/path/multiple/_model_base.py b/packages/typespec-python/test/azure/generated/server-path-multiple/server/path/multiple/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/server-path-multiple/server/path/multiple/_model_base.py rename to packages/typespec-python/test/azure/generated/server-path-multiple/server/path/multiple/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/server-path-single/server/path/single/_model_base.py b/packages/typespec-python/test/azure/generated/server-path-single/server/path/single/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/server-path-single/server/path/single/_model_base.py rename to packages/typespec-python/test/azure/generated/server-path-single/server/path/single/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/server-versions-not-versioned/server/versions/notversioned/_model_base.py b/packages/typespec-python/test/azure/generated/server-versions-not-versioned/server/versions/notversioned/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/server-versions-not-versioned/server/versions/notversioned/_model_base.py rename to packages/typespec-python/test/azure/generated/server-versions-not-versioned/server/versions/notversioned/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/server-versions-versioned/server/versions/versioned/_model_base.py b/packages/typespec-python/test/azure/generated/server-versions-versioned/server/versions/versioned/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/server-versions-versioned/server/versions/versioned/_model_base.py rename to packages/typespec-python/test/azure/generated/server-versions-versioned/server/versions/versioned/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/_model_base.py b/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/_model_base.py rename to packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/_model_base.py b/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/_model_base.py rename to packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/special-words/specialwords/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/special-words/specialwords/aio/operations/_operations.py index 4c171921e6f..43dd5a192bd 100644 --- a/packages/typespec-python/test/azure/generated/special-words/specialwords/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/special-words/specialwords/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 +from ...models._model_base import SdkJSONEncoder from ...operations._operations import ( build_model_properties_same_as_model_request, build_models_with_and_request, diff --git a/packages/typespec-python/test/azure/generated/special-words/specialwords/_model_base.py b/packages/typespec-python/test/azure/generated/special-words/specialwords/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/special-words/specialwords/_model_base.py rename to packages/typespec-python/test/azure/generated/special-words/specialwords/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/special-words/specialwords/models/_models.py b/packages/typespec-python/test/azure/generated/special-words/specialwords/models/_models.py index ccc554198c5..2de75dda1f4 100644 --- a/packages/typespec-python/test/azure/generated/special-words/specialwords/models/_models.py +++ b/packages/typespec-python/test/azure/generated/special-words/specialwords/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 AndModel(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/special-words/specialwords/operations/_operations.py b/packages/typespec-python/test/azure/generated/special-words/specialwords/operations/_operations.py index 16ddcca0ece..038e9f8b381 100644 --- a/packages/typespec-python/test/azure/generated/special-words/specialwords/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/special-words/specialwords/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 from .._serialization import Serializer +from ..models._model_base import SdkJSONEncoder if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/aio/operations/_operations.py index 53074749aec..a517a8863f9 100644 --- a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/aio/operations/_operations.py @@ -26,7 +26,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_boolean_value_get_request, build_boolean_value_put_request, diff --git a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-array/typetest/array/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-array/typetest/array/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/models/_models.py index 4223014b01d..7630ccc38c7 100644 --- a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/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 diff --git a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/operations/_operations.py index 2bfaae98bc7..c170ce51a7d 100644 --- a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/operations/_operations.py @@ -26,8 +26,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 diff --git a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/aio/operations/_operations.py index fad7da00d69..18a02b5f54e 100644 --- a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/aio/operations/_operations.py @@ -26,7 +26,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_boolean_value_get_request, build_boolean_value_put_request, diff --git a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/models/_models.py index 5892514e7f4..fb84e285690 100644 --- a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, Dict, 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 diff --git a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/operations/_operations.py index 04de7f817a1..84a9fbc71ee 100644 --- a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/operations/_operations.py @@ -26,8 +26,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 diff --git a/packages/typespec-python/test/azure/generated/typetest-enum-extensible/typetest/enum/extensible/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-enum-extensible/typetest/enum/extensible/aio/operations/_operations.py index 7a240cda2ad..423092cc1bc 100644 --- a/packages/typespec-python/test/azure/generated/typetest-enum-extensible/typetest/enum/extensible/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-enum-extensible/typetest/enum/extensible/aio/operations/_operations.py @@ -24,7 +24,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_string_get_known_value_request, build_string_get_unknown_value_request, diff --git a/packages/typespec-python/test/azure/generated/typetest-enum-extensible/typetest/enum/extensible/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-enum-extensible/typetest/enum/extensible/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-enum-extensible/typetest/enum/extensible/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-enum-extensible/typetest/enum/extensible/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-enum-extensible/typetest/enum/extensible/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-enum-extensible/typetest/enum/extensible/operations/_operations.py index 5a318b8144f..85c5e69edad 100644 --- a/packages/typespec-python/test/azure/generated/typetest-enum-extensible/typetest/enum/extensible/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-enum-extensible/typetest/enum/extensible/operations/_operations.py @@ -24,8 +24,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 diff --git a/packages/typespec-python/test/azure/generated/typetest-enum-fixed/typetest/enum/fixed/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-enum-fixed/typetest/enum/fixed/aio/operations/_operations.py index 0409b987dda..e4b858cac62 100644 --- a/packages/typespec-python/test/azure/generated/typetest-enum-fixed/typetest/enum/fixed/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-enum-fixed/typetest/enum/fixed/aio/operations/_operations.py @@ -24,7 +24,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_string_get_known_value_request, build_string_put_known_value_request, diff --git a/packages/typespec-python/test/azure/generated/typetest-enum-fixed/typetest/enum/fixed/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-enum-fixed/typetest/enum/fixed/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-enum-fixed/typetest/enum/fixed/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-enum-fixed/typetest/enum/fixed/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-enum-fixed/typetest/enum/fixed/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-enum-fixed/typetest/enum/fixed/operations/_operations.py index 48a555847d4..e3acdb17d5c 100644 --- a/packages/typespec-python/test/azure/generated/typetest-enum-fixed/typetest/enum/fixed/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-enum-fixed/typetest/enum/fixed/operations/_operations.py @@ -24,8 +24,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 diff --git a/packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/_operations/_operations.py index b1904a60d44..6cbbe5de5ed 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/_operations/_operations.py @@ -25,9 +25,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 EmptyClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/aio/_operations/_operations.py index f75ad824a68..e13df536f8c 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/aio/_operations/_operations.py @@ -25,12 +25,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_empty_get_empty_request, build_empty_post_round_trip_empty_request, build_empty_put_empty_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import EmptyClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/models/_models.py index b2b8bc0cf6e..14bbf7785e4 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-empty/typetest/model/empty/models/_models.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from .. import _model_base +from . import _model_base class EmptyInput(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/_operations/_operations.py index 1a050a673d0..d621a3a2d09 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/_operations/_operations.py @@ -25,9 +25,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 EnumDiscriminatorClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/aio/_operations/_operations.py index 8980550ad5f..1f042106edd 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/aio/_operations/_operations.py @@ -25,7 +25,6 @@ from azure.core.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_enum_discriminator_get_extensible_model_missing_discriminator_request, build_enum_discriminator_get_extensible_model_request, @@ -36,6 +35,7 @@ build_enum_discriminator_put_extensible_model_request, build_enum_discriminator_put_fixed_model_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import EnumDiscriminatorClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/models/_models.py index f2b985084e9..1baa2151823 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/models/_models.py @@ -9,9 +9,9 @@ from typing import Any, Dict, Literal, Mapping, overload -from .. import _model_base -from .._model_base import rest_discriminator, rest_field +from . import _model_base from ._enums import DogKind, SnakeKind +from ._model_base import rest_discriminator, rest_field class Snake(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_operations/_operations.py index 4a71538268b..b384c8475ba 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_operations/_operations.py @@ -25,9 +25,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 FlattenClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_operations.py index 34d603cb8fb..c90c6f9c922 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_operations.py @@ -25,11 +25,11 @@ from azure.core.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_flatten_put_flatten_model_request, build_flatten_put_nested_flatten_model_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import FlattenClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/models/_models.py index d862a3b8907..da3f7375b11 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-flatten/typetest/model/flatten/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, Mapping, 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 diff --git a/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/_operations/_operations.py index e97bfb187a0..933d9fa1727 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/_operations/_operations.py @@ -25,9 +25,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 NestedDiscriminatorClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/aio/_operations/_operations.py index ad9aaff554d..26402b30500 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/aio/_operations/_operations.py @@ -25,7 +25,6 @@ from azure.core.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_nested_discriminator_get_missing_discriminator_request, build_nested_discriminator_get_model_request, @@ -34,6 +33,7 @@ build_nested_discriminator_put_model_request, build_nested_discriminator_put_recursive_model_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import NestedDiscriminatorClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/models/_models.py index 64c2b258865..2cfeb4bb7dd 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, Dict, List, Literal, Mapping, Optional, 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 diff --git a/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/_operations/_operations.py index 0066e31ad73..21b0f946dda 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/_operations/_operations.py @@ -25,9 +25,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 NotDiscriminatedClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/aio/_operations/_operations.py index 19966c06e2c..c77c82b5be4 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/aio/_operations/_operations.py @@ -25,12 +25,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_not_discriminated_get_valid_request, build_not_discriminated_post_valid_request, build_not_discriminated_put_valid_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import NotDiscriminatedClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/models/_models.py index 4f7366dd90f..14a8bff8347 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/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 Pet(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/_operations/_operations.py index bb9008b8ba4..1d193dbfc3c 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/_operations/_operations.py @@ -25,9 +25,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 RecursiveClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/aio/_operations/_operations.py index 204aad13714..5802d44d2f5 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/aio/_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 ..._operations._operations import build_recursive_get_request, build_recursive_put_request +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import RecursiveClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/models/_models.py index fe5ab7928b4..cb2e85a23dc 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-recursive/typetest/model/recursive/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 diff --git a/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/_operations/_operations.py index 9f64335b662..c4872ea6a4c 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/_operations/_operations.py @@ -25,9 +25,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 SingleDiscriminatorClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/aio/_operations/_operations.py index 1945ffdb8a6..59beec45b25 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/aio/_operations/_operations.py @@ -25,7 +25,6 @@ from azure.core.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_single_discriminator_get_legacy_model_request, build_single_discriminator_get_missing_discriminator_request, @@ -35,6 +34,7 @@ build_single_discriminator_put_model_request, build_single_discriminator_put_recursive_model_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import SingleDiscriminatorClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/models/_models.py index da760f45728..4b1b71ae765 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, Dict, List, Literal, Mapping, Optional, 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 diff --git a/packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/usage/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/usage/_operations/_operations.py index 74a9cf631ed..df244056238 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/usage/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/usage/_operations/_operations.py @@ -25,9 +25,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 UsageClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/usage/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/usage/aio/_operations/_operations.py index 3666d31cf16..d338086e956 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/usage/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/usage/aio/_operations/_operations.py @@ -25,12 +25,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_usage_input_and_output_request, build_usage_input_request, build_usage_output_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import UsageClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/usage/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/usage/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/usage/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/usage/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/usage/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/usage/models/_models.py index 9cb337ae741..a3d38d2efb2 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/usage/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-usage/typetest/model/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 InputOutputRecord(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/_operations/_operations.py index 0c1cd553fe7..aa555449a29 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/_operations/_operations.py @@ -25,9 +25,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 VisibilityClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/aio/_operations/_operations.py index b51f569f3ad..6b520d2966b 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/aio/_operations/_operations.py @@ -25,7 +25,6 @@ from azure.core.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_visibility_delete_model_request, build_visibility_get_model_request, @@ -34,6 +33,7 @@ build_visibility_post_model_request, build_visibility_put_model_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import VisibilityClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py index 43c44190e97..911d680a090 100644 --- a/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, List, Mapping, overload -from .. import _model_base -from .._model_base import rest_field +from . import _model_base +from ._model_base import rest_field class VisibilityModel(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/aio/operations/_operations.py index a1c5cd976f7..ebe394b38a1 100644 --- a/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/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_extends_different_spread_float_get_request, build_extends_different_spread_float_put_request, diff --git a/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/models/_models.py index 73c4fbad20e..2b94a363a39 100644 --- a/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/models/_models.py @@ -10,8 +10,8 @@ import datetime from typing import Any, Dict, List, Literal, Mapping, Optional, 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 diff --git a/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/operations/_operations.py index ec390429896..611dc18fff1 100644 --- a/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/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 diff --git a/packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/aio/operations/_operations.py index 324234d4541..e923728b03e 100644 --- a/packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/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_bytes_get_non_null_request, build_bytes_get_null_request, diff --git a/packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/models/_models.py index 8190e2a53f8..f1d1110ac25 100644 --- a/packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/models/_models.py @@ -10,8 +10,8 @@ import datetime from typing import Any, List, Mapping, 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 diff --git a/packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/operations/_operations.py index 9af8b4fec95..2ad5f635aa5 100644 --- a/packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-property-nullable/typetest/property/nullable/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 diff --git a/packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/aio/operations/_operations.py index c1b46d845a1..1b67a5ba0a3 100644 --- a/packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/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_boolean_literal_get_all_request, build_boolean_literal_get_default_request, diff --git a/packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/models/_models.py index 007584bab4f..0fa785344e0 100644 --- a/packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/models/_models.py @@ -10,8 +10,8 @@ import datetime from typing import Any, List, Literal, 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 diff --git a/packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/operations/_operations.py index 2434b2fa2f8..f93745af049 100644 --- a/packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-property-optional/typetest/property/optional/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 diff --git a/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/aio/operations/_operations.py index 11409f2c7d5..40c886303a5 100644 --- a/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/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_boolean_get_request, build_boolean_literal_get_request, diff --git a/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/models/_models.py index 566b7958e92..bbeb1a2d04d 100644 --- a/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/models/_models.py @@ -11,9 +11,9 @@ import decimal from typing import Any, Dict, List, Literal, Mapping, TYPE_CHECKING, Union, overload -from .. import _model_base -from .._model_base import rest_field +from . import _model_base from ._enums import ExtendedEnum +from ._model_base import rest_field if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports diff --git a/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/operations/_operations.py index f221997c839..5f4198e6667 100644 --- a/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-property-valuetypes/typetest/property/valuetypes/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 diff --git a/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/aio/operations/_operations.py index e0c3527708a..e9fefd0894b 100644 --- a/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/aio/operations/_operations.py @@ -24,7 +24,7 @@ from azure.core.tracing.decorator_async import distributed_trace_async from azure.core.utils import case_insensitive_dict -from ..._model_base import SdkJSONEncoder, _deserialize +from ...models._model_base import SdkJSONEncoder, _deserialize from ...operations._operations import ( build_boolean_get_request, build_boolean_put_request, diff --git a/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/operations/_operations.py index f5caaead110..392721e21f7 100644 --- a/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/operations/_operations.py @@ -24,8 +24,8 @@ from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict -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 diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/operations/_operations.py index 4b31542445d..ce27e515838 100644 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/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_enums_only_get_request, build_enums_only_send_request, diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_model_base.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_model_base.py rename to packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/_models.py index 85dedd6982c..4329ef30daa 100644 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/_models.py @@ -10,8 +10,8 @@ import sys from typing import Any, List, Literal, Mapping, TYPE_CHECKING, Union, overload -from .. import _model_base -from .._model_base import rest_field +from . import _model_base +from ._model_base import rest_field if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/operations/_operations.py index 39b2a753d8d..f364b82490d 100644 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/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 diff --git a/packages/typespec-python/test/azure/generated/versioning-added/versioning/added/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/versioning-added/versioning/added/aio/operations/_operations.py index ca097a11089..fba5b85b878 100644 --- a/packages/typespec-python/test/azure/generated/versioning-added/versioning/added/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/versioning-added/versioning/added/aio/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 ..._validation import api_version_validation +from ...models._model_base import SdkJSONEncoder, _deserialize from ...operations._operations import ( build_added_v1_request, build_added_v2_request, diff --git a/packages/typespec-python/test/azure/generated/versioning-added/versioning/added/_model_base.py b/packages/typespec-python/test/azure/generated/versioning-added/versioning/added/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/versioning-added/versioning/added/_model_base.py rename to packages/typespec-python/test/azure/generated/versioning-added/versioning/added/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/versioning-added/versioning/added/models/_models.py b/packages/typespec-python/test/azure/generated/versioning-added/versioning/added/models/_models.py index a169212a84f..74f909911f8 100644 --- a/packages/typespec-python/test/azure/generated/versioning-added/versioning/added/models/_models.py +++ b/packages/typespec-python/test/azure/generated/versioning-added/versioning/added/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, Mapping, TYPE_CHECKING, Union, 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 diff --git a/packages/typespec-python/test/azure/generated/versioning-added/versioning/added/operations/_operations.py b/packages/typespec-python/test/azure/generated/versioning-added/versioning/added/operations/_operations.py index 572fa86ef03..26e04e88707 100644 --- a/packages/typespec-python/test/azure/generated/versioning-added/versioning/added/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/versioning-added/versioning/added/operations/_operations.py @@ -25,10 +25,10 @@ from azure.core.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._validation import api_version_validation from .._vendor import AddedClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/_operations/_operations.py b/packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/_operations/_operations.py index 967508d2fa8..94a173acbe6 100644 --- a/packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/_operations/_operations.py @@ -25,9 +25,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 MadeOptionalClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/aio/_operations/_operations.py index d4198306112..e33357dd04e 100644 --- a/packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/aio/_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 ..._operations._operations import build_made_optional_test_request +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import MadeOptionalClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/_model_base.py b/packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/_model_base.py rename to packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/models/_models.py b/packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/models/_models.py index 56c321bbdd2..a648f531db9 100644 --- a/packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/models/_models.py +++ b/packages/typespec-python/test/azure/generated/versioning-madeOptional/versioning/madeoptional/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 TestModel(_model_base.Model): diff --git a/packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/_operations/_operations.py b/packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/_operations/_operations.py index b153022119e..2e8947736c0 100644 --- a/packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/_operations/_operations.py @@ -25,9 +25,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 RemovedClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/aio/_operations/_operations.py index 87a572f1b0e..19bbc1ea593 100644 --- a/packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/aio/_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 ..._operations._operations import build_removed_v2_request +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import RemovedClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/_model_base.py b/packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/_model_base.py rename to packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/models/_models.py b/packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/models/_models.py index f45acfaf0d4..be069e70ac5 100644 --- a/packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/models/_models.py +++ b/packages/typespec-python/test/azure/generated/versioning-removed/versioning/removed/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, Mapping, TYPE_CHECKING, Union, 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 diff --git a/packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/aio/operations/_operations.py index a93a9c3474c..5b92b9470f2 100644 --- a/packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/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_new_interface_new_op_in_new_interface_request, build_renamed_from_new_op_request, diff --git a/packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/_model_base.py b/packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/_model_base.py rename to packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/models/_models.py b/packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/models/_models.py index 8a5fb567216..14912bbf3d5 100644 --- a/packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/models/_models.py +++ b/packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, Mapping, TYPE_CHECKING, Union, 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 diff --git a/packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/operations/_operations.py b/packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/operations/_operations.py index 6f1668de08b..a3d765818b1 100644 --- a/packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/versioning-renamedFrom/versioning/renamedfrom/operations/_operations.py @@ -25,9 +25,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 RenamedFromClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/_operations/_operations.py b/packages/typespec-python/test/azure/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/_operations/_operations.py index 03ec9e95e36..8ca6b823716 100644 --- a/packages/typespec-python/test/azure/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/_operations/_operations.py @@ -23,9 +23,9 @@ from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import ReturnTypeChangedFromClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/aio/_operations/_operations.py index 48e44138ad2..febe1478f4a 100644 --- a/packages/typespec-python/test/azure/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/aio/_operations/_operations.py @@ -23,8 +23,8 @@ from azure.core.tracing.decorator_async import distributed_trace_async from azure.core.utils import case_insensitive_dict -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import build_return_type_changed_from_test_request +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import ReturnTypeChangedFromClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/_model_base.py b/packages/typespec-python/test/azure/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/_model_base.py rename to packages/typespec-python/test/azure/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/_operations/_operations.py b/packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/_operations/_operations.py index 2b4ca123765..34e2f7c2c42 100644 --- a/packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/_operations/_operations.py @@ -25,9 +25,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 TypeChangedFromClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/aio/_operations/_operations.py index 44c23091cc7..acbd53d3c22 100644 --- a/packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/aio/_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 ..._operations._operations import build_type_changed_from_test_request +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import TypeChangedFromClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/_model_base.py b/packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/_model_base.py rename to packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/models/_model_base.py diff --git a/packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/models/_models.py b/packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/models/_models.py index 770416a98c2..ed84e54b94d 100644 --- a/packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/models/_models.py +++ b/packages/typespec-python/test/azure/generated/versioning-typeChangedFrom/versioning/typechangedfrom/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 TestModel(_model_base.Model): diff --git a/packages/typespec-python/test/azure/mock_api_tests/test_mgmt_models_mode.py b/packages/typespec-python/test/azure/mock_api_tests/test_mgmt_models_mode.py index a81a5c67139..a8bcb0b049c 100644 --- a/packages/typespec-python/test/azure/mock_api_tests/test_mgmt_models_mode.py +++ b/packages/typespec-python/test/azure/mock_api_tests/test_mgmt_models_mode.py @@ -21,7 +21,6 @@ def test_client_signature(): def test_model_mode(): - from azure.mgmt.spheredpg import _model_base - from azure.mgmt.spheredpg.models import Resource + from azure.mgmt.spheredpg.models import Resource, _model_base assert isinstance(Resource(id="", type=""), _model_base.Model) diff --git a/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_typetest_property_nullable_async.py b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_typetest_property_nullable_async.py index ee66bc278a7..fb5388aa74a 100644 --- a/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_typetest_property_nullable_async.py +++ b/packages/typespec-python/test/generic_mock_api_tests/asynctests/test_typetest_property_nullable_async.py @@ -7,7 +7,7 @@ import pytest from typetest.property.nullable import models from typetest.property.nullable.aio import NullableClient -from typetest.property.nullable._model_base import ( # pylint: disable=protected-access +from typetest.property.nullable.models._model_base import ( # pylint: disable=protected-access SdkJSONEncoder, ) diff --git a/packages/typespec-python/test/generic_mock_api_tests/test_typetest_property_nullable.py b/packages/typespec-python/test/generic_mock_api_tests/test_typetest_property_nullable.py index 4c9e3d1c24c..39d31110e06 100644 --- a/packages/typespec-python/test/generic_mock_api_tests/test_typetest_property_nullable.py +++ b/packages/typespec-python/test/generic_mock_api_tests/test_typetest_property_nullable.py @@ -6,7 +6,7 @@ import json import pytest from typetest.property.nullable import NullableClient, models -from typetest.property.nullable._model_base import ( # pylint: disable=protected-access +from typetest.property.nullable.models._model_base import ( # pylint: disable=protected-access SdkJSONEncoder, ) diff --git a/packages/typespec-python/test/generic_mock_api_tests/unittests/test_model_base_serialization.py b/packages/typespec-python/test/generic_mock_api_tests/unittests/test_model_base_serialization.py index a2ef0ae0d68..6380cf49f9a 100644 --- a/packages/typespec-python/test/generic_mock_api_tests/unittests/test_model_base_serialization.py +++ b/packages/typespec-python/test/generic_mock_api_tests/unittests/test_model_base_serialization.py @@ -26,7 +26,7 @@ import sys from enum import Enum -from specialwords._model_base import ( +from specialwords.models._model_base import ( SdkJSONEncoder, Model, rest_field, diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_operations/_operations.py index 95c7f37973b..c52b056daf6 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_operations/_operations.py @@ -22,9 +22,9 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/aio/_operations/_operations.py index 15416c4139c..5d8d41a2834 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/aio/_operations/_operations.py @@ -21,8 +21,8 @@ from corehttp.runtime.pipeline import PipelineResponse 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): diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_model_base.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/_model_base.py rename to packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/models/_models.py b/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/models/_models.py index 37896dc9605..5dc657e3b4f 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-api-key/authentication/apikey/models/_models.py +++ b/packages/typespec-python/test/unbranded/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): diff --git a/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py index 29ac8434b78..8baa869bd28 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/_operations/_operations.py @@ -22,9 +22,9 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/aio/_operations/_operations.py index c7b907500ba..d8f98e3803f 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/aio/_operations/_operations.py @@ -21,8 +21,8 @@ from corehttp.runtime.pipeline import PipelineResponse 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): diff --git a/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/_model_base.py b/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/_model_base.py rename to packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/models/_models.py b/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/models/_models.py index 37896dc9605..5dc657e3b4f 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-http-custom/authentication/http/custom/models/_models.py +++ b/packages/typespec-python/test/unbranded/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): diff --git a/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py index 7e6328c695c..160d0ded620 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py @@ -22,9 +22,9 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/aio/_operations/_operations.py index b2c4462eec3..c087896eaa8 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/aio/_operations/_operations.py @@ -21,8 +21,8 @@ from corehttp.runtime.pipeline import PipelineResponse 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): diff --git a/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/_model_base.py b/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/_model_base.py rename to packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/models/_models.py b/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/models/_models.py index 37896dc9605..5dc657e3b4f 100644 --- a/packages/typespec-python/test/unbranded/generated/authentication-oauth2/authentication/oauth2/models/_models.py +++ b/packages/typespec-python/test/unbranded/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): diff --git a/packages/typespec-python/test/unbranded/generated/authentication-union/authentication/union/_model_base.py b/packages/typespec-python/test/unbranded/generated/authentication-union/authentication/union/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/authentication-union/authentication/union/_model_base.py rename to packages/typespec-python/test/unbranded/generated/authentication-union/authentication/union/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/client-naming/client/naming/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/client-naming/client/naming/aio/operations/_operations.py index 6b6d50d2296..4a06100b646 100644 --- a/packages/typespec-python/test/unbranded/generated/client-naming/client/naming/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/client-naming/client/naming/aio/operations/_operations.py @@ -24,7 +24,7 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder +from ...models._model_base import SdkJSONEncoder from ...operations._operations import ( build_model_client_request, build_model_language_request, diff --git a/packages/typespec-python/test/unbranded/generated/client-naming/client/naming/_model_base.py b/packages/typespec-python/test/unbranded/generated/client-naming/client/naming/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/client-naming/client/naming/_model_base.py rename to packages/typespec-python/test/unbranded/generated/client-naming/client/naming/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/client-naming/client/naming/models/_models.py b/packages/typespec-python/test/unbranded/generated/client-naming/client/naming/models/_models.py index c8856d6b2f1..99b5653e4c3 100644 --- a/packages/typespec-python/test/unbranded/generated/client-naming/client/naming/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/client-naming/client/naming/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 ClientModel(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/client-naming/client/naming/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/client-naming/client/naming/operations/_operations.py index 65afba58fa2..085078c0feb 100644 --- a/packages/typespec-python/test/unbranded/generated/client-naming/client/naming/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/client-naming/client/naming/operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder from .._serialization import Serializer from .._vendor import NamingClientMixinABC +from ..models._model_base import SdkJSONEncoder if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/client-structure-default/client/structure/service/_model_base.py b/packages/typespec-python/test/unbranded/generated/client-structure-default/client/structure/service/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/client-structure-default/client/structure/service/_model_base.py rename to packages/typespec-python/test/unbranded/generated/client-structure-default/client/structure/service/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/client-structure-multiclient/client/structure/multiclient/_model_base.py b/packages/typespec-python/test/unbranded/generated/client-structure-multiclient/client/structure/multiclient/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/client-structure-multiclient/client/structure/multiclient/_model_base.py rename to packages/typespec-python/test/unbranded/generated/client-structure-multiclient/client/structure/multiclient/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/client-structure-renamedoperation/client/structure/renamedoperation/_model_base.py b/packages/typespec-python/test/unbranded/generated/client-structure-renamedoperation/client/structure/renamedoperation/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/client-structure-renamedoperation/client/structure/renamedoperation/_model_base.py rename to packages/typespec-python/test/unbranded/generated/client-structure-renamedoperation/client/structure/renamedoperation/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/client-structure-twooperationgroup/client/structure/twooperationgroup/_model_base.py b/packages/typespec-python/test/unbranded/generated/client-structure-twooperationgroup/client/structure/twooperationgroup/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/client-structure-twooperationgroup/client/structure/twooperationgroup/_model_base.py rename to packages/typespec-python/test/unbranded/generated/client-structure-twooperationgroup/client/structure/twooperationgroup/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/aio/operations/_operations.py index 7d9437f61ff..f5912ca050a 100644 --- a/packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/aio/operations/_operations.py @@ -24,7 +24,7 @@ from corehttp.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_header_base64_request, build_header_base64url_array_request, diff --git a/packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/_model_base.py b/packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/_model_base.py rename to packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/models/_models.py b/packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/models/_models.py index 4fd923708b0..9ea00db1722 100644 --- a/packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, List, Mapping, overload -from .. import _model_base -from .._model_base import rest_field +from . import _model_base +from ._model_base import rest_field class Base64BytesProperty(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/operations/_operations.py index 7cd507c4f19..073e393c1ef 100644 --- a/packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/encode-bytes/encode/bytes/operations/_operations.py @@ -24,8 +24,8 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/aio/operations/_operations.py index 7469800ba2e..8668b3c99c5 100644 --- a/packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/aio/operations/_operations.py @@ -25,7 +25,7 @@ from corehttp.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_header_default_request, build_header_rfc3339_request, diff --git a/packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/_model_base.py b/packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/_model_base.py rename to packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/models/_models.py b/packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/models/_models.py index cd7ed395b89..0edc292af1c 100644 --- a/packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/models/_models.py @@ -10,8 +10,8 @@ import datetime from typing import Any, List, Mapping, overload -from .. import _model_base -from .._model_base import rest_field +from . import _model_base +from ._model_base import rest_field class DefaultDatetimeProperty(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/operations/_operations.py index 74c6f38e5a7..4e9d2df6492 100644 --- a/packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/encode-datetime/encode/datetime/operations/_operations.py @@ -25,8 +25,8 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/aio/operations/_operations.py index ecba6837582..41349bc3f7d 100644 --- a/packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/aio/operations/_operations.py @@ -25,7 +25,7 @@ from corehttp.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_header_default_request, build_header_float64_seconds_request, diff --git a/packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/_model_base.py b/packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/_model_base.py rename to packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/models/_models.py b/packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/models/_models.py index 7b7c8af4560..9f42902ae39 100644 --- a/packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/models/_models.py @@ -10,8 +10,8 @@ import datetime from typing import Any, List, Mapping, overload -from .. import _model_base -from .._model_base import rest_field +from . import _model_base +from ._model_base import rest_field class DefaultDurationProperty(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/operations/_operations.py index ee2692e525b..c55ef0d9de9 100644 --- a/packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/encode-duration/encode/duration/operations/_operations.py @@ -25,8 +25,8 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/_operations/_operations.py index 820be082b02..1ac47f904c8 100644 --- a/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/_operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import VisibilityClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/aio/_operations/_operations.py index d34a27a6da0..6c505f0bd5a 100644 --- a/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/aio/_operations/_operations.py @@ -24,7 +24,6 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_visibility_delete_model_request, build_visibility_get_model_request, @@ -33,6 +32,7 @@ build_visibility_post_model_request, build_visibility_put_model_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import VisibilityClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/_model_base.py b/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/_model_base.py rename to packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py b/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py index 4dd2fd01d19..22336098de2 100644 --- a/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/headasbooleanfalse/headasbooleanfalse/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, List, Mapping, overload -from .. import _model_base -from .._model_base import rest_field +from . import _model_base +from ._model_base import rest_field class VisibilityModel(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/_operations/_operations.py index 668d945d43a..7d5bd7d5c6a 100644 --- a/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/_operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import VisibilityClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/aio/_operations/_operations.py index b076dc87a03..c99cdbd7e91 100644 --- a/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/aio/_operations/_operations.py @@ -24,7 +24,6 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_visibility_delete_model_request, build_visibility_get_model_request, @@ -33,6 +32,7 @@ build_visibility_post_model_request, build_visibility_put_model_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import VisibilityClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/_model_base.py b/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/_model_base.py rename to packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/models/_models.py b/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/models/_models.py index 4dd2fd01d19..22336098de2 100644 --- a/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/headasbooleantrue/headasbooleantrue/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, List, Mapping, overload -from .. import _model_base -from .._model_base import rest_field +from . import _model_base +from ._model_base import rest_field class VisibilityModel(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/aio/operations/_operations.py index 84073114c67..ed96b3e52bd 100644 --- a/packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/aio/operations/_operations.py @@ -24,7 +24,7 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder +from ...models._model_base import SdkJSONEncoder from ...operations._operations import build_explicit_body_simple_request, build_implicit_body_simple_request if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/_model_base.py b/packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/_model_base.py rename to packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/models/_models.py b/packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/models/_models.py index 9c791ed15d7..57489eddbbe 100644 --- a/packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/models/_models.py @@ -10,8 +10,8 @@ import sys 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 if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/operations/_operations.py index 488cbe57fd7..f5d457d4a61 100644 --- a/packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/parameters-basic/parameters/basic/operations/_operations.py @@ -24,8 +24,8 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder from .._serialization import Serializer +from ..models._model_base import SdkJSONEncoder if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/aio/operations/_operations.py index 857cdb2184d..fafecc1ca92 100644 --- a/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/aio/operations/_operations.py @@ -24,7 +24,7 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder +from ...models._model_base import SdkJSONEncoder from ...operations._operations import ( build_body_optionality_required_explicit_request, build_body_optionality_required_implicit_request, diff --git a/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/_model_base.py b/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/_model_base.py rename to packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/models/_models.py b/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/models/_models.py index bf1906c55b6..825b8fa17b9 100644 --- a/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/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 BodyModel(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/operations/_operations.py index ba18ee1a2f2..1c8f85c684a 100644 --- a/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/parameters-body-optionality/parameters/bodyoptionality/operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder from .._serialization import Serializer from .._vendor import BodyOptionalityClientMixinABC +from ..models._model_base import SdkJSONEncoder if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/parameters-collection-format/parameters/collectionformat/_model_base.py b/packages/typespec-python/test/unbranded/generated/parameters-collection-format/parameters/collectionformat/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/parameters-collection-format/parameters/collectionformat/_model_base.py rename to packages/typespec-python/test/unbranded/generated/parameters-collection-format/parameters/collectionformat/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/aio/operations/_operations.py index cf492026ecb..af898c39a93 100644 --- a/packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/aio/operations/_operations.py @@ -24,7 +24,7 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder +from ...models._model_base import SdkJSONEncoder from ...operations._operations import ( build_alias_spread_as_request_body_request, build_alias_spread_as_request_parameter_request, diff --git a/packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/_model_base.py b/packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/_model_base.py rename to packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/models/_models.py b/packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/models/_models.py index befce1b9449..d6d88ea101c 100644 --- a/packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/models/_models.py @@ -10,8 +10,8 @@ import sys 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 if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/operations/_operations.py index 11d259b38d5..bb1c66ba282 100644 --- a/packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/parameters-spread/parameters/spread/operations/_operations.py @@ -24,8 +24,8 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder from .._serialization import Serializer +from ..models._model_base import SdkJSONEncoder if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/aio/operations/_operations.py index 32ba8693df0..5247a62a6ef 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/aio/operations/_operations.py @@ -22,7 +22,7 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import _deserialize +from ...models._model_base import _deserialize from ...operations._operations import ( build_different_body_get_avatar_as_json_request, build_different_body_get_avatar_as_png_request, diff --git a/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/_model_base.py b/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/_model_base.py rename to packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/models/_models.py b/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/models/_models.py index d307971ead0..b9764dc1f8f 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/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 PngImageAsJson(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/operations/_operations.py index 93183eaceab..339bd6291ea 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/payload-content-negotiation/payload/contentnegotiation/operations/_operations.py @@ -22,8 +22,8 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/_operations/_operations.py index 16a2b16d2a2..96c8d2c08c8 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/_operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import JsonMergePatchClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/aio/_operations/_operations.py index 378b2abe12b..3e401fbb43d 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/aio/_operations/_operations.py @@ -24,12 +24,12 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_json_merge_patch_create_resource_request, build_json_merge_patch_update_optional_resource_request, build_json_merge_patch_update_resource_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import JsonMergePatchClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/_model_base.py b/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/_model_base.py rename to packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/models/_models.py b/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/models/_models.py index 1e14069cf37..48ab6008915 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/payload-json-merge-patch/payload/jsonmergepatch/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, Dict, 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 diff --git a/packages/typespec-python/test/unbranded/generated/payload-media-type/payload/mediatype/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/payload-media-type/payload/mediatype/aio/operations/_operations.py index 5e12b43861f..ffbd3db472f 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-media-type/payload/mediatype/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/payload-media-type/payload/mediatype/aio/operations/_operations.py @@ -22,7 +22,7 @@ from corehttp.runtime.pipeline import PipelineResponse from corehttp.utils import case_insensitive_dict -from ..._model_base import SdkJSONEncoder, _deserialize +from ...models._model_base import SdkJSONEncoder, _deserialize from ...operations._operations import ( build_string_body_get_as_json_request, build_string_body_get_as_text_request, diff --git a/packages/typespec-python/test/unbranded/generated/payload-media-type/payload/mediatype/_model_base.py b/packages/typespec-python/test/unbranded/generated/payload-media-type/payload/mediatype/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/payload-media-type/payload/mediatype/_model_base.py rename to packages/typespec-python/test/unbranded/generated/payload-media-type/payload/mediatype/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/payload-media-type/payload/mediatype/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/payload-media-type/payload/mediatype/operations/_operations.py index 9850c980f55..ea572b4e61a 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-media-type/payload/mediatype/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/payload-media-type/payload/mediatype/operations/_operations.py @@ -22,8 +22,8 @@ from corehttp.runtime.pipeline import PipelineResponse from corehttp.utils import case_insensitive_dict -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 diff --git a/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/_vendor.py b/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/_vendor.py index 4bd173651f5..00aba4bb539 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/_vendor.py +++ b/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/_vendor.py @@ -8,7 +8,7 @@ import json from typing import Any, Dict, IO, List, Mapping, Optional, Sequence, Tuple, Union -from ._model_base import Model, SdkJSONEncoder +from .models._model_base import Model, SdkJSONEncoder # file-like tuple could be `(filename, IO (or bytes))` or `(filename, IO (or bytes), content_type)` diff --git a/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/aio/operations/_operations.py index dfa40939b62..992348306d2 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/aio/operations/_operations.py @@ -20,8 +20,9 @@ from corehttp.rest import AsyncHttpResponse, HttpRequest from corehttp.runtime.pipeline import PipelineResponse -from ... import _model_base, models as _models +from ... import models as _models from ..._vendor import prepare_multipart_form_data +from ...models import _model_base from ...operations._operations import ( build_form_data_anonymous_model_request, build_form_data_basic_request, diff --git a/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/_model_base.py b/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/_model_base.py rename to packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/models/_models.py b/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/models/_models.py index 40e458bc247..26ea61853ca 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/models/_models.py @@ -10,9 +10,9 @@ import sys 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 .._vendor import FileType +from ._model_base import rest_field if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/operations/_operations.py index 2699fc916a3..93580eb8cb2 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/payload-multipart/payload/multipart/operations/_operations.py @@ -21,9 +21,10 @@ from corehttp.runtime.pipeline import PipelineResponse from corehttp.utils import case_insensitive_dict -from .. import _model_base, models as _models +from .. import models as _models from .._serialization import Serializer from .._vendor import prepare_multipart_form_data +from ..models import _model_base if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/_operations/_operations.py index 17cb4b64ced..0c2c5d603e4 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/_operations/_operations.py @@ -23,10 +23,10 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import _deserialize from .._serialization import Serializer from .._validation import api_version_validation from .._vendor import PageableClientMixinABC +from ..models._model_base import _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/aio/_operations/_operations.py index cc4196b8fdc..58ba301fd88 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/aio/_operations/_operations.py @@ -22,9 +22,9 @@ from corehttp.runtime.pipeline import PipelineResponse from ... import models as _models -from ..._model_base import _deserialize from ..._operations._operations import build_pageable_list_request from ..._validation import api_version_validation +from ...models._model_base import _deserialize from .._vendor import PageableClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/_model_base.py b/packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/_model_base.py rename to packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/models/_models.py b/packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/models/_models.py index 85a995323c5..99f4125f459 100644 --- a/packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/payload-pageable/payload/pageable/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 User(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/resiliency-srv-driven1/resiliency/srv/driven1/_model_base.py b/packages/typespec-python/test/unbranded/generated/resiliency-srv-driven1/resiliency/srv/driven1/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/resiliency-srv-driven1/resiliency/srv/driven1/_model_base.py rename to packages/typespec-python/test/unbranded/generated/resiliency-srv-driven1/resiliency/srv/driven1/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/resiliency-srv-driven2/resiliency/srv/driven2/_model_base.py b/packages/typespec-python/test/unbranded/generated/resiliency-srv-driven2/resiliency/srv/driven2/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/resiliency-srv-driven2/resiliency/srv/driven2/_model_base.py rename to packages/typespec-python/test/unbranded/generated/resiliency-srv-driven2/resiliency/srv/driven2/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/aio/operations/_operations.py index 42e131c6aeb..d5bb2d74242 100644 --- a/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/aio/operations/_operations.py @@ -24,7 +24,7 @@ from corehttp.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_property_get_request, build_property_send_request if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/_model_base.py b/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/_model_base.py rename to packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/models/_models.py b/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/models/_models.py index 21a9405175f..b2d8f3c7b53 100644 --- a/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/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 JsonEncodedNameModel(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/operations/_operations.py index 363d1633548..daee55621fe 100644 --- a/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/serialization-encoded-name-json/serialization/encodedname/json/operations/_operations.py @@ -24,8 +24,8 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/server-endpoint-not-defined/server/endpoint/notdefined/_model_base.py b/packages/typespec-python/test/unbranded/generated/server-endpoint-not-defined/server/endpoint/notdefined/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/server-endpoint-not-defined/server/endpoint/notdefined/_model_base.py rename to packages/typespec-python/test/unbranded/generated/server-endpoint-not-defined/server/endpoint/notdefined/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/server-path-multiple/server/path/multiple/_model_base.py b/packages/typespec-python/test/unbranded/generated/server-path-multiple/server/path/multiple/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/server-path-multiple/server/path/multiple/_model_base.py rename to packages/typespec-python/test/unbranded/generated/server-path-multiple/server/path/multiple/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/server-path-single/server/path/single/_model_base.py b/packages/typespec-python/test/unbranded/generated/server-path-single/server/path/single/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/server-path-single/server/path/single/_model_base.py rename to packages/typespec-python/test/unbranded/generated/server-path-single/server/path/single/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/server-versions-not-versioned/server/versions/notversioned/_model_base.py b/packages/typespec-python/test/unbranded/generated/server-versions-not-versioned/server/versions/notversioned/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/server-versions-not-versioned/server/versions/notversioned/_model_base.py rename to packages/typespec-python/test/unbranded/generated/server-versions-not-versioned/server/versions/notversioned/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/server-versions-versioned/server/versions/versioned/_model_base.py b/packages/typespec-python/test/unbranded/generated/server-versions-versioned/server/versions/versioned/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/server-versions-versioned/server/versions/versioned/_model_base.py rename to packages/typespec-python/test/unbranded/generated/server-versions-versioned/server/versions/versioned/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/special-headers-conditional-request/specialheaders/conditionalrequest/_model_base.py b/packages/typespec-python/test/unbranded/generated/special-headers-conditional-request/specialheaders/conditionalrequest/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/special-headers-conditional-request/specialheaders/conditionalrequest/_model_base.py rename to packages/typespec-python/test/unbranded/generated/special-headers-conditional-request/specialheaders/conditionalrequest/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/special-headers-repeatability/specialheaders/repeatability/_model_base.py b/packages/typespec-python/test/unbranded/generated/special-headers-repeatability/specialheaders/repeatability/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/special-headers-repeatability/specialheaders/repeatability/_model_base.py rename to packages/typespec-python/test/unbranded/generated/special-headers-repeatability/specialheaders/repeatability/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/special-words/specialwords/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/special-words/specialwords/aio/operations/_operations.py index 237f0151bc9..39029e27471 100644 --- a/packages/typespec-python/test/unbranded/generated/special-words/specialwords/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/special-words/specialwords/aio/operations/_operations.py @@ -24,7 +24,7 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder +from ...models._model_base import SdkJSONEncoder from ...operations._operations import ( build_model_properties_same_as_model_request, build_models_with_and_request, diff --git a/packages/typespec-python/test/unbranded/generated/special-words/specialwords/_model_base.py b/packages/typespec-python/test/unbranded/generated/special-words/specialwords/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/special-words/specialwords/_model_base.py rename to packages/typespec-python/test/unbranded/generated/special-words/specialwords/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/special-words/specialwords/models/_models.py b/packages/typespec-python/test/unbranded/generated/special-words/specialwords/models/_models.py index e0cf4a93c9e..9d80d8367ae 100644 --- a/packages/typespec-python/test/unbranded/generated/special-words/specialwords/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/special-words/specialwords/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 AndModel(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/special-words/specialwords/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/special-words/specialwords/operations/_operations.py index 8ba298b0c9c..4bef41e4758 100644 --- a/packages/typespec-python/test/unbranded/generated/special-words/specialwords/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/special-words/specialwords/operations/_operations.py @@ -24,8 +24,8 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder from .._serialization import Serializer +from ..models._model_base import SdkJSONEncoder if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/aio/operations/_operations.py index e18e7f5ea65..229910be596 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/aio/operations/_operations.py @@ -25,7 +25,7 @@ from corehttp.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_boolean_value_get_request, build_boolean_value_put_request, diff --git a/packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/models/_models.py index da56c3634f0..e717f9c9c4f 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/operations/_operations.py index 811033b48cc..64f4ec939d2 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-array/typetest/array/operations/_operations.py @@ -25,8 +25,8 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/aio/operations/_operations.py index 2cc831637ab..7fbfca74c3a 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/aio/operations/_operations.py @@ -25,7 +25,7 @@ from corehttp.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_boolean_value_get_request, build_boolean_value_put_request, diff --git a/packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/models/_models.py index 7ff84d1bdbb..758b903291d 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, Dict, 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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/operations/_operations.py index e29fe1f7169..df0c0598ed0 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-dictionary/typetest/dictionary/operations/_operations.py @@ -25,8 +25,8 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/typetest/enum/extensible/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/typetest/enum/extensible/aio/operations/_operations.py index 73adff10311..5a929cca3dd 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/typetest/enum/extensible/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/typetest/enum/extensible/aio/operations/_operations.py @@ -23,7 +23,7 @@ from corehttp.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_string_get_known_value_request, build_string_get_unknown_value_request, diff --git a/packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/typetest/enum/extensible/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/typetest/enum/extensible/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/typetest/enum/extensible/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/typetest/enum/extensible/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/typetest/enum/extensible/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/typetest/enum/extensible/operations/_operations.py index 53d1c8ff226..d9ef766d196 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/typetest/enum/extensible/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-enum-extensible/typetest/enum/extensible/operations/_operations.py @@ -23,8 +23,8 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/typetest/enum/fixed/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/typetest/enum/fixed/aio/operations/_operations.py index a99c87df69c..bb530ca0c65 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/typetest/enum/fixed/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/typetest/enum/fixed/aio/operations/_operations.py @@ -23,7 +23,7 @@ from corehttp.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_string_get_known_value_request, build_string_put_known_value_request, diff --git a/packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/typetest/enum/fixed/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/typetest/enum/fixed/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/typetest/enum/fixed/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/typetest/enum/fixed/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/typetest/enum/fixed/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/typetest/enum/fixed/operations/_operations.py index 25c3954e5f9..26a3a614b1b 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/typetest/enum/fixed/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-enum-fixed/typetest/enum/fixed/operations/_operations.py @@ -23,8 +23,8 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/_operations/_operations.py index f936e4dc1af..ec506cdbdf0 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/_operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import EmptyClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/aio/_operations/_operations.py index 85727ae6ea5..d3e31c8de7d 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/aio/_operations/_operations.py @@ -24,12 +24,12 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_empty_get_empty_request, build_empty_post_round_trip_empty_request, build_empty_put_empty_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import EmptyClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/models/_models.py index 222acdb3b5d..7fac815b706 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-empty/typetest/model/empty/models/_models.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from .. import _model_base +from . import _model_base class EmptyInput(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/_operations/_operations.py index 4080aa5c7de..d1a5d9dfdff 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/_operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import EnumDiscriminatorClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/aio/_operations/_operations.py index 67ce2d5cf31..2c281f55418 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/aio/_operations/_operations.py @@ -24,7 +24,6 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_enum_discriminator_get_extensible_model_missing_discriminator_request, build_enum_discriminator_get_extensible_model_request, @@ -35,6 +34,7 @@ build_enum_discriminator_put_extensible_model_request, build_enum_discriminator_put_fixed_model_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import EnumDiscriminatorClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/models/_models.py index 72221fd7b6f..26e22208898 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/models/_models.py @@ -9,9 +9,9 @@ from typing import Any, Dict, Literal, Mapping, overload -from .. import _model_base -from .._model_base import rest_discriminator, rest_field +from . import _model_base from ._enums import DogKind, SnakeKind +from ._model_base import rest_discriminator, rest_field class Snake(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_operations/_operations.py index 57e6f70d1c1..78700d3c3d2 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import FlattenClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_operations.py index 57923f15cb3..4ebb606d9d9 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/aio/_operations/_operations.py @@ -24,11 +24,11 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_flatten_put_flatten_model_request, build_flatten_put_nested_flatten_model_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import FlattenClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/models/_models.py index 769988d693f..44cb4a049cb 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-flatten/typetest/model/flatten/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, Mapping, 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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/_operations/_operations.py index 448d1732541..b6fe889ce7c 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/_operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import NestedDiscriminatorClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/aio/_operations/_operations.py index 68143a7dcba..777ce95ecae 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/aio/_operations/_operations.py @@ -24,7 +24,6 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_nested_discriminator_get_missing_discriminator_request, build_nested_discriminator_get_model_request, @@ -33,6 +32,7 @@ build_nested_discriminator_put_model_request, build_nested_discriminator_put_recursive_model_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import NestedDiscriminatorClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/models/_models.py index 1954cd35460..b3c95c81cd4 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, Dict, List, Literal, Mapping, Optional, 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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/_operations/_operations.py index 6b714c4ee20..b6b6e5f7017 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/_operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import NotDiscriminatedClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/aio/_operations/_operations.py index b8954d350ea..a27f5c7356a 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/aio/_operations/_operations.py @@ -24,12 +24,12 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_not_discriminated_get_valid_request, build_not_discriminated_post_valid_request, build_not_discriminated_put_valid_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import NotDiscriminatedClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/models/_models.py index fd92bc66fb2..92748d8c50a 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-notdiscriminated/typetest/model/notdiscriminated/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 Pet(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/_operations/_operations.py index 48fe2b8eb28..7b65e4b5285 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/_operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import RecursiveClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/aio/_operations/_operations.py index 0dfb09b4c9e..327b61e5aae 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/aio/_operations/_operations.py @@ -24,8 +24,8 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import build_recursive_get_request, build_recursive_put_request +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import RecursiveClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/models/_models.py index 5845575ad6c..dbdb9d6854e 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-recursive/typetest/model/recursive/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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/_operations/_operations.py index 73425742522..877b6b68a2a 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/_operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import SingleDiscriminatorClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/aio/_operations/_operations.py index 58d6dd657b0..4f65bc8d017 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/aio/_operations/_operations.py @@ -24,7 +24,6 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_single_discriminator_get_legacy_model_request, build_single_discriminator_get_missing_discriminator_request, @@ -34,6 +33,7 @@ build_single_discriminator_put_model_request, build_single_discriminator_put_recursive_model_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import SingleDiscriminatorClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/models/_models.py index cfb6aa70c36..9619a54b79b 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-singlediscriminator/typetest/model/singlediscriminator/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, Dict, List, Literal, Mapping, Optional, 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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/usage/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/usage/_operations/_operations.py index c514f7d37dd..75a6673340b 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/usage/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/usage/_operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import UsageClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/usage/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/usage/aio/_operations/_operations.py index 6e55321641b..5f44149efd9 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/usage/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/usage/aio/_operations/_operations.py @@ -24,12 +24,12 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_usage_input_and_output_request, build_usage_input_request, build_usage_output_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import UsageClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/usage/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/usage/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/usage/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/usage/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/usage/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/usage/models/_models.py index 3358e746dc1..49a0fb58e6c 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/usage/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-usage/typetest/model/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 InputOutputRecord(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/_operations/_operations.py index 7c9b3275b42..ce90c2d861a 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/_operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import VisibilityClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/aio/_operations/_operations.py index d85a125fed9..80e80f505fd 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/aio/_operations/_operations.py @@ -24,7 +24,6 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import ( build_visibility_delete_model_request, build_visibility_get_model_request, @@ -33,6 +32,7 @@ build_visibility_post_model_request, build_visibility_put_model_request, ) +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import VisibilityClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py index 4dd2fd01d19..22336098de2 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-model-visibility/typetest/model/visibility/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, List, Mapping, overload -from .. import _model_base -from .._model_base import rest_field +from . import _model_base +from ._model_base import rest_field class VisibilityModel(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/aio/operations/_operations.py index b6fc4f132d4..710169a483f 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/aio/operations/_operations.py @@ -24,7 +24,7 @@ from corehttp.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_extends_different_spread_float_get_request, build_extends_different_spread_float_put_request, diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/models/_models.py index c23054b77a2..64f024e68d5 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/models/_models.py @@ -10,8 +10,8 @@ import datetime from typing import Any, Dict, List, Literal, Mapping, Optional, 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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/operations/_operations.py index 390d96db7dd..27df606e56f 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-property-additionalproperties/typetest/property/additionalproperties/operations/_operations.py @@ -24,8 +24,8 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/aio/operations/_operations.py index 32eae668615..0a8a51121b3 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/aio/operations/_operations.py @@ -24,7 +24,7 @@ from corehttp.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_bytes_get_non_null_request, build_bytes_get_null_request, diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/models/_models.py index 95b7764f58a..ae5c102dfc7 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/models/_models.py @@ -10,8 +10,8 @@ import datetime from typing import Any, List, Mapping, 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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/operations/_operations.py index 1195fe8f083..bd980979853 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-property-nullable/typetest/property/nullable/operations/_operations.py @@ -24,8 +24,8 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/aio/operations/_operations.py index a242daa86aa..ce7d9b3c771 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/aio/operations/_operations.py @@ -24,7 +24,7 @@ from corehttp.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_boolean_literal_get_all_request, build_boolean_literal_get_default_request, diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/models/_models.py index 849b406c150..ff6f147ba8c 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/models/_models.py @@ -10,8 +10,8 @@ import datetime from typing import Any, List, Literal, 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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/operations/_operations.py index 1390d8f6057..a0087f17db6 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-property-optional/typetest/property/optional/operations/_operations.py @@ -24,8 +24,8 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/aio/operations/_operations.py index 2194022f6bc..4a39f9c13f5 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/aio/operations/_operations.py @@ -24,7 +24,7 @@ from corehttp.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_boolean_get_request, build_boolean_literal_get_request, diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/models/_models.py index b70a30032c7..570ec514e96 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/models/_models.py @@ -11,9 +11,9 @@ import decimal from typing import Any, Dict, List, Literal, Mapping, TYPE_CHECKING, Union, overload -from .. import _model_base -from .._model_base import rest_field +from . import _model_base from ._enums import ExtendedEnum +from ._model_base import rest_field if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports diff --git a/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/operations/_operations.py index 7c46c28a928..72e9616799d 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-property-valuetypes/typetest/property/valuetypes/operations/_operations.py @@ -24,8 +24,8 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-scalar/typetest/scalar/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-scalar/typetest/scalar/aio/operations/_operations.py index 1e9336c17d5..1678fcceeda 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-scalar/typetest/scalar/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-scalar/typetest/scalar/aio/operations/_operations.py @@ -23,7 +23,7 @@ from corehttp.runtime.pipeline import PipelineResponse from corehttp.utils import case_insensitive_dict -from ..._model_base import SdkJSONEncoder, _deserialize +from ...models._model_base import SdkJSONEncoder, _deserialize from ...operations._operations import ( build_boolean_get_request, build_boolean_put_request, diff --git a/packages/typespec-python/test/unbranded/generated/typetest-scalar/typetest/scalar/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-scalar/typetest/scalar/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-scalar/typetest/scalar/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-scalar/typetest/scalar/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-scalar/typetest/scalar/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-scalar/typetest/scalar/operations/_operations.py index d3d84bf60c7..2bab235632a 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-scalar/typetest/scalar/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-scalar/typetest/scalar/operations/_operations.py @@ -23,8 +23,8 @@ from corehttp.runtime.pipeline import PipelineResponse from corehttp.utils import case_insensitive_dict -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 diff --git a/packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/aio/operations/_operations.py index f83b93676cd..5ff04a1ec03 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/aio/operations/_operations.py @@ -24,7 +24,7 @@ from corehttp.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_enums_only_get_request, build_enums_only_send_request, diff --git a/packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/_model_base.py b/packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/_model_base.py rename to packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/models/_models.py b/packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/models/_models.py index d0e37edd9c2..a74927a4e38 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/models/_models.py @@ -10,8 +10,8 @@ import sys from typing import Any, List, Literal, Mapping, TYPE_CHECKING, Union, overload -from .. import _model_base -from .._model_base import rest_field +from . import _model_base +from ._model_base import rest_field if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/operations/_operations.py index 0120579c538..0cb8bc81a71 100644 --- a/packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/typetest-union/typetest/union/operations/_operations.py @@ -24,8 +24,8 @@ from corehttp.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 diff --git a/packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/aio/operations/_operations.py index cd6f54f107c..43cfb8e4712 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/aio/operations/_operations.py @@ -24,8 +24,8 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._validation import api_version_validation +from ...models._model_base import SdkJSONEncoder, _deserialize from ...operations._operations import ( build_added_v1_request, build_added_v2_request, diff --git a/packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/_model_base.py b/packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/_model_base.py rename to packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/models/_models.py b/packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/models/_models.py index d09d845ddf4..fd4c468e9c9 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, Mapping, TYPE_CHECKING, Union, 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 diff --git a/packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/operations/_operations.py index 0e438122aa5..b856d4f920f 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-added/versioning/added/operations/_operations.py @@ -24,10 +24,10 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._validation import api_version_validation from .._vendor import AddedClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/_operations/_operations.py index aed07c98220..f5cf1e976de 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/_operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import MadeOptionalClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/aio/_operations/_operations.py index d251dea9bd4..96a05c28d79 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/aio/_operations/_operations.py @@ -24,8 +24,8 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import build_made_optional_test_request +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import MadeOptionalClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/_model_base.py b/packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/_model_base.py rename to packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/models/_models.py b/packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/models/_models.py index 574589fcbe7..3f552e132fe 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-madeOptional/versioning/madeoptional/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 TestModel(_model_base.Model): diff --git a/packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/_operations/_operations.py index 521d13dcc23..18dfe64ce19 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/_operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import RemovedClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/aio/_operations/_operations.py index 34ddeae0396..64e1b6bcae4 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/aio/_operations/_operations.py @@ -24,8 +24,8 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import build_removed_v2_request +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import RemovedClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/_model_base.py b/packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/_model_base.py rename to packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/models/_models.py b/packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/models/_models.py index a149dae82cd..ed09c18e4ac 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-removed/versioning/removed/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, Mapping, TYPE_CHECKING, Union, 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 diff --git a/packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/aio/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/aio/operations/_operations.py index 7756ef6013a..533b6129980 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/aio/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/aio/operations/_operations.py @@ -24,7 +24,7 @@ from corehttp.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_new_interface_new_op_in_new_interface_request, build_renamed_from_new_op_request, diff --git a/packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/_model_base.py b/packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/_model_base.py rename to packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/models/_models.py b/packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/models/_models.py index 68fb9ad9712..3cde2ca4d7d 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/models/_models.py @@ -9,8 +9,8 @@ from typing import Any, Mapping, TYPE_CHECKING, Union, 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 diff --git a/packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/operations/_operations.py b/packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/operations/_operations.py index 7e2f7b0c72a..0e2e3ff82ac 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-renamedFrom/versioning/renamedfrom/operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import RenamedFromClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/_operations/_operations.py index ce9a7a57dcc..deb99b026b3 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/_operations/_operations.py @@ -22,9 +22,9 @@ from corehttp.runtime.pipeline import PipelineResponse from corehttp.utils import case_insensitive_dict -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import ReturnTypeChangedFromClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/aio/_operations/_operations.py index b37cc1cdcf5..33379adfc11 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/aio/_operations/_operations.py @@ -22,8 +22,8 @@ from corehttp.runtime.pipeline import PipelineResponse from corehttp.utils import case_insensitive_dict -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import build_return_type_changed_from_test_request +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import ReturnTypeChangedFromClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/_model_base.py b/packages/typespec-python/test/unbranded/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/_model_base.py rename to packages/typespec-python/test/unbranded/generated/versioning-returnTypeChangedFrom/versioning/returntypechangedfrom/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/_operations/_operations.py index 62cd2de23e0..7cdff47d1ed 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/_operations/_operations.py @@ -24,9 +24,9 @@ from corehttp.utils import case_insensitive_dict from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize from .._serialization import Serializer from .._vendor import TypeChangedFromClientMixinABC +from ..models._model_base import SdkJSONEncoder, _deserialize if sys.version_info >= (3, 9): from collections.abc import MutableMapping diff --git a/packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/aio/_operations/_operations.py b/packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/aio/_operations/_operations.py index 28290bbce3c..b77b117a98d 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/aio/_operations/_operations.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/aio/_operations/_operations.py @@ -24,8 +24,8 @@ from corehttp.utils import case_insensitive_dict from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize from ..._operations._operations import build_type_changed_from_test_request +from ...models._model_base import SdkJSONEncoder, _deserialize from .._vendor import TypeChangedFromClientMixinABC if sys.version_info >= (3, 9): diff --git a/packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/_model_base.py b/packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/models/_model_base.py similarity index 100% rename from packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/_model_base.py rename to packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/models/_model_base.py diff --git a/packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/models/_models.py b/packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/models/_models.py index a6325956cca..3a0a70276f5 100644 --- a/packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/models/_models.py +++ b/packages/typespec-python/test/unbranded/generated/versioning-typeChangedFrom/versioning/typechangedfrom/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 TestModel(_model_base.Model):