Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .chronus/changes/multiapi-fix-2025-4-19-14-2-21.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
changeKind: fix
packages:
- "@autorest/python"
---

Revert for `_utils` only for multiapi
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def imports(self, async_mode: bool) -> FileImport:
file_import = FileImport(json.loads(self.default_version_metadata["client"][imports_to_load]))
local_imports = file_import.imports.get(TypingSection.REGULAR, {}).get(ImportType.LOCAL, {})
for key in local_imports:
if re.search("^\\.*_serialization$", key):
if re.search("^\\.*_utils.serialization$", key):
relative_path = ".." if async_mode else "."
local_imports[f"{relative_path}_serialization"] = local_imports.pop(key)
break
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,7 @@ def serialize(self, code_model: CodeModel, no_async: Optional[bool]) -> None:
lstrip_blocks=True,
)
self.write_file(
Path("_utils/__init__.py"),
self.env.get_template("multiapi_utils_init.py.jinja2").render(),
)
self.write_file(
Path("_utils/serialization.py"),
Path("_serialization.py"),
codegen_env.get_template("serialization.py.jinja2").render(
code_model=code_model,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from {{ ".." if async_mode else "." }}_utils.serialization import Serializer, Deserializer
from {{ ".." if async_mode else "." }}_serialization import Serializer, Deserializer
{% if imports %}
{{ imports }}
{% endif %}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin
from ._utils.serialization import Deserializer, Serializer
from ._serialization import Deserializer, Serializer

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from ._utils.serialization import Serializer, Deserializer
from ._serialization import Serializer, Deserializer
from io import IOBase
from typing import Any, IO, Iterator, Optional, Union

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from azure.profiles import KnownProfiles, ProfileDefinition
from azure.profiles.multiapiclient import MultiApiClientMixin

from .._utils.serialization import Deserializer, Serializer
from .._serialization import Deserializer, Serializer
from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from .._utils.serialization import Serializer, Deserializer
from .._serialization import Serializer, Deserializer
from io import IOBase
from typing import Any, AsyncIterator, IO, Optional, Union

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin
from ._utils.serialization import Deserializer, Serializer
from ._serialization import Deserializer, Serializer

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from ._utils.serialization import Serializer, Deserializer
from ._serialization import Serializer, Deserializer
from io import IOBase
from typing import Any, IO, Iterator, Optional, Union

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from azure.profiles import KnownProfiles, ProfileDefinition
from azure.profiles.multiapiclient import MultiApiClientMixin

from .._utils.serialization import Deserializer, Serializer
from .._serialization import Deserializer, Serializer
from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from .._utils.serialization import Serializer, Deserializer
from .._serialization import Serializer, Deserializer
from io import IOBase
from typing import Any, AsyncIterator, IO, Optional, Union

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin
from ._utils.serialization import Deserializer, Serializer
from ._serialization import Deserializer, Serializer

class _SDKClient(object):
def __init__(self, *args, **kwargs):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from ._utils.serialization import Serializer, Deserializer
from ._serialization import Serializer, Deserializer
from io import IOBase
from typing import Any, IO, Iterator, Optional, Union

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from azure.profiles import KnownProfiles, ProfileDefinition
from azure.profiles.multiapiclient import MultiApiClientMixin

from .._utils.serialization import Deserializer, Serializer
from .._serialization import Deserializer, Serializer
from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from .._utils.serialization import Serializer, Deserializer
from .._serialization import Serializer, Deserializer
from io import IOBase
from typing import Any, AsyncIterator, IO, Optional, Union

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

from ._configuration import MultiapiCustomBaseUrlServiceClientConfiguration
from ._operations_mixin import MultiapiCustomBaseUrlServiceClientOperationsMixin
from ._utils.serialization import Deserializer, Serializer
from ._serialization import Deserializer, Serializer

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from ._utils.serialization import Serializer, Deserializer
from ._serialization import Serializer, Deserializer
from typing import Any

from . import models as _models
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from azure.profiles import KnownProfiles, ProfileDefinition
from azure.profiles.multiapiclient import MultiApiClientMixin

from .._utils.serialization import Deserializer, Serializer
from .._serialization import Deserializer, Serializer
from ._configuration import MultiapiCustomBaseUrlServiceClientConfiguration
from ._operations_mixin import MultiapiCustomBaseUrlServiceClientOperationsMixin

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from .._utils.serialization import Serializer, Deserializer
from .._serialization import Serializer, Deserializer
from typing import Any

from .. import models as _models
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin
from ._utils.serialization import Deserializer, Serializer
from ._serialization import Deserializer, Serializer

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from ._utils.serialization import Serializer, Deserializer
from ._serialization import Serializer, Deserializer
from io import IOBase
from typing import Any, IO, Iterator, Optional, Union

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from azure.profiles import KnownProfiles, ProfileDefinition
from azure.profiles.multiapiclient import MultiApiClientMixin

from .._utils.serialization import Deserializer, Serializer
from .._serialization import Deserializer, Serializer
from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from .._utils.serialization import Serializer, Deserializer
from .._serialization import Serializer, Deserializer
from io import IOBase
from typing import Any, AsyncIterator, IO, Optional, Union

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin
from ._utils.serialization import Deserializer, Serializer
from ._serialization import Deserializer, Serializer

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from ._utils.serialization import Serializer, Deserializer
from ._serialization import Serializer, Deserializer
from io import IOBase
from typing import Any, IO, Iterator, Optional, Union

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from azure.profiles import KnownProfiles, ProfileDefinition
from azure.profiles.multiapiclient import MultiApiClientMixin

from .._utils.serialization import Deserializer, Serializer
from .._serialization import Deserializer, Serializer
from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from .._utils.serialization import Serializer, Deserializer
from .._serialization import Serializer, Deserializer
from io import IOBase
from typing import Any, AsyncIterator, IO, Optional, Union

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin
from ._utils.serialization import Deserializer, Serializer
from ._serialization import Deserializer, Serializer

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from ._utils.serialization import Serializer, Deserializer
from ._serialization import Serializer, Deserializer
from io import IOBase
from typing import Any, IO, Iterator, Optional, Union

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin
from ._utils.serialization import Deserializer, Serializer
from ._serialization import Deserializer, Serializer

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from ._utils.serialization import Serializer, Deserializer
from ._serialization import Serializer, Deserializer
from io import IOBase
from typing import Any, IO, Iterator, Optional, Union

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from azure.profiles import KnownProfiles, ProfileDefinition
from azure.profiles.multiapiclient import MultiApiClientMixin

from .._utils.serialization import Deserializer, Serializer
from .._serialization import Deserializer, Serializer
from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from .._utils.serialization import Serializer, Deserializer
from .._serialization import Serializer, Deserializer
from io import IOBase
from typing import Any, AsyncIterator, IO, Optional, Union

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin
from ._utils.serialization import Deserializer, Serializer
from ._serialization import Deserializer, Serializer

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from ._utils.serialization import Serializer, Deserializer
from ._serialization import Serializer, Deserializer
from io import IOBase
from typing import Any, IO, Iterator, Optional, Union

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from azure.profiles import KnownProfiles, ProfileDefinition
from azure.profiles.multiapiclient import MultiApiClientMixin

from .._utils.serialization import Deserializer, Serializer
from .._serialization import Deserializer, Serializer
from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from .._utils.serialization import Serializer, Deserializer
from .._serialization import Serializer, Deserializer
from io import IOBase
from typing import Any, AsyncIterator, IO, Optional, Union

Expand Down
Loading