amsdal_cli 0.4.13__py3-none-any.whl → 0.4.15__py3-none-any.whl

amsdal_cli/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2023-present
 #
 # SPDX-License-Identifier: AMSDAL End User License Agreement
-__version__ = '0.4.13'
+__version__ = '0.4.15'

amsdal_cli/commands/build/schemas/data_models/options.py

@@ -1,6 +1,6 @@
 from typing import Annotated
 
-from amsdal_utils.schemas.schema import OptionItemData
+from amsdal_utils.models.data_models.core import OptionItemData
 from pydantic import BaseModel
 from pydantic import Field
 

amsdal_cli/commands/generate/utils/tests/model_utils.py

@@ -1,11 +1,13 @@
 import ast
+import importlib
 import json
+import pkgutil
+import sys
 from pathlib import Path
 
 from amsdal_models.schemas.object_schema import model_to_object_schema
 from amsdal_utils.config.manager import AmsdalConfigManager
 from amsdal_utils.schemas.schema import ObjectSchema
-from amsdal_utils.utils.classes import import_class
 from amsdal_utils.utils.text import classify
 from amsdal_utils.utils.text import to_snake_case
 
@@ -17,12 +19,38 @@ from amsdal_cli.utils.cli_config import ModelsFormat
 from amsdal_cli.utils.text import rich_highlight
 
 
+def find_model_class(package: str, class_name: str) -> type:
+    importlib.invalidate_caches()
+
+    prefix = package + '.'
+    for mod_name in list(sys.modules):
+        if mod_name == package or mod_name.startswith(prefix):
+            del sys.modules[mod_name]
+
+    spec = importlib.util.find_spec(package)
+    if not spec or not spec.submodule_search_locations:
+        msg = f"Can't find package {package!r} on disk"
+        raise ImportError(msg)
+
+    paths = spec.submodule_search_locations
+
+    for _, full_name, _ in pkgutil.walk_packages(paths, prefix=prefix):
+        module = importlib.import_module(full_name)
+
+        if hasattr(module, class_name):
+            return getattr(module, class_name)
+
+    msg = f'Could not find class {class_name!r} in package {package!r}'
+    raise ImportError(msg)
+
+
 def get_class_schema(models_dir: Path, class_name: str, cli_config: CliConfig) -> ObjectSchema:
     model_name = classify(class_name)
     name = to_snake_case(model_name)
 
     if cli_config.models_format == ModelsFormat.PY:
-        model_class = import_class(f'models.{name}.{class_name}')
+        # model_class = import_class(f'models.{name}.{class_name}')
+        model_class = find_model_class('models', class_name)
 
         return model_to_object_schema(model_class)
     else:
@@ -80,7 +108,11 @@ def object_init_call(
 ) -> ast.Call:
     from amsdal_cli.commands.generate.utils.tests.type_utils import keywords_for_schema
 
-    imports_set.add((f'models.{model_name_snake_case}', object_schema.title))
+    if cli_config.models_format == ModelsFormat.PY:
+        model_class = find_model_class('models', object_schema.title)
+        imports_set.add((model_class.__module__, object_schema.title))
+    else:
+        imports_set.add((f'models.{model_name_snake_case}', object_schema.title))
 
     return ast.Call(
         func=ast.Name(id=object_schema.title, ctx=ast.Load()),

amsdal_cli/commands/generate/utils/tests/type_utils.py

@@ -1,4 +1,6 @@
 import ast
+from datetime import date
+from datetime import timezone
 from pathlib import Path
 
 import faker
@@ -115,6 +117,27 @@ def _generate_values_for_type(
         if test_data_type == TestDataType.DYNAMIC:
             return _faker_call('pybool')
 
+    elif data_type == 'datetime':
+        if test_data_type == TestDataType.DUMMY:
+            return ast.Constant(value='2023-01-01T00:00:00Z')
+
+        if test_data_type == TestDataType.RANDOM:
+            dt = FAKER.date_time(tzinfo=timezone.utc).replace(hour=0, minute=0, second=0, microsecond=0)
+            return ast.Constant(value=dt)
+        if test_data_type == TestDataType.DYNAMIC:
+            return _faker_call('date_time')
+
+    elif data_type == 'date':
+        if test_data_type == TestDataType.DUMMY:
+            return ast.Constant(value=date(2023, 1, 1))
+
+        if test_data_type == TestDataType.RANDOM:
+            dt = FAKER.date_time(tzinfo=timezone.utc).replace(hour=0, minute=0, second=0, microsecond=0)
+            return ast.Constant(value=dt.date())
+
+        if test_data_type == TestDataType.DYNAMIC:
+            return _faker_call('date')
+
     elif data_type == 'array':
         if not type_data:
             msg = 'Type data is required for array type.'

amsdal_cli/commands/generate/utils/tests/unit.py

@@ -590,6 +590,7 @@ def generate_unit_tests(
 
     # Add necessary imports
     module.body.append(ast.Import(names=[ast.alias(name='pytest', asname=None)]))
+    module.body.append(ast.Import(names=[ast.alias(name='datetime', asname=None)]))
     module.body.append(
         ast.ImportFrom(module='faker', names=[ast.alias(name='Faker')], level=0),
     )

amsdal_cli/commands/migrations/sub_commands/apply.py

@@ -111,7 +111,8 @@ async def _async_sync_apply(
     from amsdal_cli.utils.text import rich_warning
 
     amsdal_manager = AsyncAmsdalManager()
-    await amsdal_manager.setup()
+    if not amsdal_manager.is_setup:
+        await amsdal_manager.setup()
 
     try:
         amsdal_manager.authenticate()

amsdal_cli/commands/migrations/sub_commands/list.py

@@ -16,7 +16,8 @@ def _fetch_migrations(app_migrations_path: Path) -> list['MigrationFile']:
     from amsdal_models.migration.file_migration_store import FileMigrationStore
 
     amsdal_manager = AmsdalManager()
-    amsdal_manager.setup()
+    if not amsdal_manager.is_setup:
+        amsdal_manager.setup()
     amsdal_manager.authenticate()
     amsdal_manager.post_setup()
 
@@ -29,7 +30,8 @@ async def _async_fetch_migrations(app_migrations_path: Path) -> list['MigrationF
     from amsdal_models.migration.file_migration_store import AsyncFileMigrationStore
 
     amsdal_manager = AsyncAmsdalManager()
-    await amsdal_manager.setup()
+    if not amsdal_manager.is_setup:
+        await amsdal_manager.setup()
 
     try:
         amsdal_manager.authenticate()

amsdal_cli/commands/migrations/sub_commands/make.py

@@ -86,7 +86,8 @@ async def _async_make_migrations(
     from amsdal_cli.utils.text import rich_success
 
     amsdal_manager = AsyncAmsdalManager()
-    await amsdal_manager.setup()
+    if not amsdal_manager.is_setup:
+        await amsdal_manager.setup()
     amsdal_manager.authenticate()
     await amsdal_manager.post_setup()
 

amsdal_cli/commands/register_connection/utils/migrate_models.py

@@ -86,7 +86,8 @@ def _migrate_models(config_path: Path) -> None:
     # setup the new manager and connections
     AmsdalConfigManager().load_config(config_path)
     new_manager = AmsdalManager()
-    new_manager.setup()
+    if not new_manager.is_setup:
+        new_manager.setup()
     new_manager.post_setup()
 
     schemas = MigrationSchemas()
@@ -175,7 +176,8 @@ async def _async_migrate_models(config_path: Path) -> None:
     # setup the new manager and connections
     AmsdalConfigManager().load_config(config_path)
     new_manager = AsyncAmsdalManager()
-    await new_manager.setup()
+    if not new_manager.is_setup:
+        await new_manager.setup()
     await new_manager.post_setup()
 
     schemas = MigrationSchemas()
@@ -253,7 +255,8 @@ def _migrate_data(new_connection_name: str) -> None:
     from amsdal_utils.models.enums import ModuleType
 
     origin_manager = AmsdalManager()
-    origin_manager.setup()
+    if not origin_manager.is_setup:
+        origin_manager.setup()
     origin_manager.post_setup()
 
     model_class_loader = ModelClassLoader(settings.USER_MODELS_MODULE)
@@ -305,7 +308,8 @@ async def _async_migrate_data(new_connection_name: str) -> None:
     from amsdal_utils.models.enums import ModuleType
 
     origin_manager = AsyncAmsdalManager()
-    await origin_manager.setup()
+    if not origin_manager.is_setup:
+        await origin_manager.setup()
     await origin_manager.post_setup()
 
     model_class_loader = ModelClassLoader(settings.USER_MODELS_MODULE)

amsdal_cli/commands/restore/command.py

@@ -91,7 +91,8 @@ def _sync_restore_models(app_source_path: Path, cli_config: 'CliConfig') -> None
     from amsdal_cli.utils.text import rich_success
 
     amsdal_manager = AmsdalManager()
-    amsdal_manager.setup()
+    if not amsdal_manager.is_setup:
+        amsdal_manager.setup()
     amsdal_manager.authenticate()
     amsdal_manager.register_internal_classes()
     class_manager = ClassManager()
@@ -187,7 +188,8 @@ async def _async_restore_models(app_source_path: Path, cli_config: 'CliConfig')
     from amsdal_cli.utils.text import rich_success
 
     amsdal_manager = AsyncAmsdalManager()
-    await amsdal_manager.setup()
+    if not amsdal_manager.is_setup:
+        await amsdal_manager.setup()
     amsdal_manager.authenticate()
     amsdal_manager.register_internal_classes()
     class_manager = ClassManager()
@@ -274,27 +276,39 @@ def _restore_state_db(cli_config: 'CliConfig', config_path: Path | None) -> None
     state_connection = _get_state_connection(config_manager.get_config())
 
     class_object_ref, class_object_meta_ref = _get_class_object_reference(lakehouse_connection)
-    model_pks, model_fks = _fetch_model_pks_and_fks(lakehouse_connection, class_object_ref)
-
-    for table_ref, schema in _get_user_schemas(
+    model_pks, model_fks, model_m2ms = _fetch_model_pks_and_fks(lakehouse_connection, class_object_ref)
+    user_schemas = _get_user_schemas(
         lakehouse_connection,
         class_object_ref,
         class_object_meta_ref,
         model_fks=model_fks,
         model_pks=model_pks,  # type: ignore[arg-type]
-    ):
+    )
+    user_scheams_with_tries = [(table_ref, schema, 0) for table_ref, schema in user_schemas]
+    refs_by_name = {table_ref.name: table_ref for table_ref, _ in user_schemas}
+
+    m2m_all_data = []
+    while user_scheams_with_tries:
+        table_ref, schema, current_iteration = user_scheams_with_tries.pop(0)
         rprint(rich_info(f'Restoring {table_ref.name}'))
         glue_schema = object_schema_to_glue_schema(schema, use_foreign_keys=True)
 
-        state_connection.run_schema_command(
-            glue.SchemaCommand(
-                mutations=[
-                    glue.RegisterSchema(
-                        schema=glue_schema,
-                    ),
-                ],
-            ),
-        )
+        try:
+            state_connection.run_schema_command(
+                glue.SchemaCommand(
+                    mutations=[
+                        glue.RegisterSchema(
+                            schema=glue_schema,
+                        ),
+                    ],
+                ),
+            )
+        except Exception:
+            if current_iteration < 3:  # noqa: PLR2004
+                user_scheams_with_tries.append((table_ref, schema, current_iteration + 1))
+                continue
+            else:
+                raise
 
         for item in _get_all_latest_data(lakehouse_connection, table_ref):
             item.pop(SECONDARY_PARTITION_KEY, None)
@@ -302,6 +316,16 @@ def _restore_state_db(cli_config: 'CliConfig', config_path: Path | None) -> None
 
             from amsdal_data.connections.historical.data_query_transform import META_CLASS_NAME
 
+            data, m2m_data = _build_data(
+                item,
+                model_name=table_ref.metadata[META_CLASS_NAME],  # type: ignore[index]
+                model_pks=model_pks,
+                model_fks=model_fks,
+                model_m2ms=model_m2ms,
+                refs_by_name=refs_by_name,
+            )
+
+            m2m_all_data.extend(m2m_data)
             state_connection.run_mutations(
                 mutations=[
                     glue.InsertData(
@@ -310,18 +334,18 @@ def _restore_state_db(cli_config: 'CliConfig', config_path: Path | None) -> None
                             version=glue.Version.LATEST,
                             metadata=table_ref.metadata,
                         ),
-                        data=[
-                            _build_data(
-                                item,
-                                model_name=table_ref.metadata[META_CLASS_NAME],  # type: ignore[index]
-                                model_pks=model_pks,
-                                model_fks=model_fks,
-                            ),
-                        ],
+                        data=[data],
                     ),
                 ],
             )
             rprint('.', end='')
+    rprint('Inserting m2m data...')
+    for _m2m_data in m2m_all_data:
+        try:
+            state_connection.run_mutations(mutations=[_m2m_data])
+        except Exception:
+            rprint('Error inserting m2m data')
+
     rprint(rich_success('Done! All classes are restored.'))
 
 
@@ -330,14 +354,22 @@ def _build_data(
     model_name: str,
     model_pks: dict[str, dict[str, type | glue.Schema | glue.SchemaReference]],
     model_fks: dict[str, Any],
-) -> glue.Data:
+    model_m2ms: dict[str, Any],
+    refs_by_name: dict[str, glue.SchemaReference],
+) -> tuple[glue.Data, list[glue.InsertData]]:
+    from amsdal_data.connections.historical.data_query_transform import META_FOREIGN_KEYS
+    from amsdal_data.connections.historical.data_query_transform import META_PRIMARY_KEY_FIELDS
+
     pks = model_pks[model_name]
     fks = model_fks.get(model_name, {})
+    m2ms = model_m2ms.get(model_name, {})
     data = {}
     foreign_keys_meta = {}
+    m2m_inserts = []
 
     for _name, _value in item.items():
         fk = fks.get(_name)
+        m2m = m2ms.get(_name)
 
         if fk:
             _fields = list(fk[0].keys())
@@ -353,19 +385,73 @@ def _build_data(
 
             for _field, object_id in zip(_fields, _object_id, strict=False):
                 data[_field] = object_id
+        elif m2m:
+            target_model_name = m2m[1]
+
+            m2m_table_name = f'{model_name}{target_model_name}'
+            m2m_table_ref = refs_by_name.get(m2m_table_name)
+            if not m2m_table_ref:
+                continue
+
+            _datas = []
+
+            for _val in _value:
+                _datas.append(
+                    glue.Data(
+                        data={
+                            f'{model_name.lower()}_partition_key': item['partition_key'],
+                            f'{target_model_name.lower()}_partition_key': _val['ref']['object_id'],
+                        },
+                        metadata={
+                            META_PRIMARY_KEY_FIELDS: {
+                                f'{model_name.lower()}_partition_key': str,
+                                f'{target_model_name.lower()}_partition_key': str,
+                            },
+                            META_FOREIGN_KEYS: {
+                                f'{model_name.lower()}_partition_key': {
+                                    'ref': {
+                                        'resource': 'statedb',
+                                        'class_name': model_name,
+                                        'object_id': item['partition_key'],
+                                        'class_version': 'LATEST',
+                                        'object_version': 'LATEST',
+                                    },
+                                },
+                                f'{target_model_name.lower()}_partition_key': {
+                                    'ref': {
+                                        'resource': 'statedb',
+                                        'class_name': target_model_name,
+                                        'object_id': _val['ref']['object_id'],
+                                        'class_version': 'LATEST',
+                                        'object_version': 'LATEST',
+                                    },
+                                },
+                            },
+                        },
+                    )
+                )
+
+            m2m_inserts.append(
+                glue.InsertData(
+                    schema=glue.SchemaReference(
+                        name=m2m_table_ref.name,
+                        version=glue.Version.LATEST,
+                        metadata=m2m_table_ref.metadata,
+                    ),
+                    data=_datas,
+                ),
+            )
         else:
             data[_name] = _value
 
-    from amsdal_data.connections.historical.data_query_transform import META_FOREIGN_KEYS
-    from amsdal_data.connections.historical.data_query_transform import META_PRIMARY_KEY_FIELDS
-
-    return glue.Data(
+    _data = glue.Data(
         data=data,
         metadata={
             META_PRIMARY_KEY_FIELDS: pks,
             META_FOREIGN_KEYS: foreign_keys_meta,
         },
     )
+    return _data, m2m_inserts
 
 
 def _get_lakehouse_connection(config: 'AmsdalConfig') -> glue.SqliteConnection | glue.PostgresConnection:
@@ -399,6 +485,7 @@ def _fetch_model_pks_and_fks(
 ) -> tuple[
     dict[str, dict[str, type | glue.Schema | glue.SchemaReference]],
     dict[str, dict[str, tuple[dict[str, Any], str, list[str]]]],
+    dict[str, dict[str, tuple[dict[str, Any], str, list[str]]]],
 ]:
     from amsdal_data.connections.constants import PRIMARY_PARTITION_KEY
 
@@ -407,33 +494,50 @@ def _fetch_model_pks_and_fks(
     pk_data: dict[str, dict[str, type | glue.Schema | glue.SchemaReference]] = {
         schema[PRIMARY_PARTITION_KEY]: _build_pks(schema, all_schemas=schemas) for schema in schemas
     }
-    fk_data: dict[str, dict[str, tuple[dict[str, Any], str, list[str]]]] = {
-        schema[PRIMARY_PARTITION_KEY]: _build_fks(schema, all_schemas=schemas) for schema in schemas
-    }
+    fk_data: dict[str, dict[str, tuple[dict[str, Any], str, list[str]]]] = {}
+    m2m_data: dict[str, dict[str, tuple[dict[str, Any], str, list[str]]]] = {}
+
+    for schema in schemas:
+        fk_data[schema[PRIMARY_PARTITION_KEY]], m2m_data[schema[PRIMARY_PARTITION_KEY]] = _build_fks(
+            schema, all_schemas=schemas
+        )
 
-    return pk_data, fk_data
+    return pk_data, fk_data, m2m_data
 
 
 def _build_fks(
     schema: dict[str, Any],
     all_schemas: list[dict[str, Any]],
-) -> dict[str, tuple[dict[str, Any], str, list[str]]]:
+) -> tuple[
+    dict[str, tuple[dict[str, Any], str, list[str]]],
+    dict[str, tuple[dict[str, Any], str, list[str]]],
+]:
     fks: dict[str, tuple[dict[str, str], str, list[str]]] = {}
+    m2ms: dict[str, tuple[dict[str, str], str, list[str]]] = {}
 
     for prop_name, prop in schema['properties'].items():
         if prop['type'] == CoreTypes.ARRAY.value:
             _type = prop['items']['type']
+            is_m2m = True
         else:
             _type = prop['type']
+            is_m2m = False
 
         schema_type = get_schema_ref(_type, all_schemas)
         if schema_type:
-            fks[prop_name] = (
-                _build_fields(prop_name, prop.get('db_field'), schema_type, all_schemas),
-                schema_type['table_name'],
-                schema_type['primary_key'],
-            )
-    return fks
+            if is_m2m:
+                m2ms[prop_name] = (
+                    _build_fields(prop_name, prop.get('db_field'), schema_type, all_schemas),
+                    schema_type['table_name'],
+                    schema_type['primary_key'],
+                )
+            else:
+                fks[prop_name] = (
+                    _build_fields(prop_name, prop.get('db_field'), schema_type, all_schemas),
+                    schema_type['table_name'],
+                    schema_type['primary_key'],
+                )
+    return fks, m2ms
 
 
 def _build_pks(
@@ -690,7 +794,10 @@ def _get_user_schemas(
 
         if meta_props:
             for prop in meta_props:
-                schema_data['properties'][prop].update(meta_props[prop])
+                if prop not in schema_data['properties']:
+                    schema_data['properties'][prop] = meta_props[prop]
+                else:
+                    schema_data['properties'][prop].update(meta_props[prop])
 
         for name, prop in schema_data['properties'].items():
             prop['field_name'] = name

amsdal_cli/commands/serve/services/supervisor.py

@@ -351,7 +351,8 @@ class Supervisor:
                 config_manager.load_config(config_path)
 
                 amsdal_manager = AmsdalManager()
-                amsdal_manager.setup()
+                if not amsdal_manager.is_setup:
+                    amsdal_manager.setup()
                 amsdal_manager.authenticate()
                 amsdal_manager.init_classes()
 

amsdal_cli/commands/serve/utils.py

@@ -87,7 +87,8 @@ def build_app_and_check_migrations(
 
     amsdal_manager = AmsdalManager()
     amsdal_manager.pre_setup()
-    amsdal_manager.setup()
+    if not amsdal_manager.is_setup:
+        amsdal_manager.setup()
 
     if skip_migrations_check:
         return amsdal_manager
@@ -345,7 +346,8 @@ async def async_build_app_and_check_migrations(
 
     amsdal_manager = AsyncAmsdalManager()
     amsdal_manager.pre_setup()
-    await amsdal_manager.setup()
+    if not amsdal_manager.is_setup:
+        await amsdal_manager.setup()
 
     if skip_migrations_check:
         return amsdal_manager

amsdal_cli/commands/tests/command.py

@@ -20,7 +20,8 @@ PYTEST_COMMAND = 'pytest'
 
 def _init(cli_config: CliConfig, app_source_path: Path, config_path: Path) -> None:
     manager = AmsdalManager()
-    manager.setup()
+    if not manager.is_setup:
+        manager.setup()
     build_app_and_check_migrations(
         cli_config=cli_config,
         output_path=cli_config.app_directory,
@@ -37,7 +38,8 @@ def _init(cli_config: CliConfig, app_source_path: Path, config_path: Path) -> No
 
 async def _async_init(cli_config: CliConfig, app_source_path: Path, config_path: Path) -> None:
     amsdal_manager = AsyncAmsdalManager()
-    await amsdal_manager.setup()
+    if not amsdal_manager.is_setup:
+        await amsdal_manager.setup()
     await async_build_app_and_check_migrations(
         cli_config=cli_config,
         output_path=cli_config.app_directory,

{amsdal_cli-0.4.13.dist-info → amsdal_cli-0.4.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_cli
-Version: 0.4.13
+Version: 0.4.15
 Summary: CLI for AMSDAL framework
 Project-URL: Documentation, https://pypi.org/project/amsdal_cli/#readme
 Project-URL: Issues, https://pypi.org/project/amsdal_cli/

{amsdal_cli-0.4.13.dist-info → amsdal_cli-0.4.15.dist-info}/RECORD

@@ -1,5 +1,5 @@
 amsdal_cli/Third-Party Materials - AMSDAL Dependencies - License Notices.md,sha256=eHOIhsC6pZv3Wf8aKfaBNJhVi20gM6Rm2PakZTrdIOQ,66641
-amsdal_cli/__about__.py,sha256=Nd7E0uojvIHSHFiXHRMBf8pPjn5cd_XTrdECDmaCIYs,125
+amsdal_cli/__about__.py,sha256=Vt5HE1-j6RiDhtwMPfWimxDBngSXFXCGjWUa7ycqsJY,125
 amsdal_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/app.py,sha256=_ucuLT5ospf1ifFKEG0IMfVnxKjnvPUQ4iMhkvOfCrc,466
 amsdal_cli/main.py,sha256=LtH-BD1eJrAUecjKzC8Gx7kYFUstOMH1erdeJUVqFB8,144
@@ -13,7 +13,7 @@ amsdal_cli/commands/build/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 amsdal_cli/commands/build/schemas/schema_json_loader.py,sha256=l8u3WftSH4l-a9PbWo2jb-Ks6jzOhmYT14Lesm3WB8A,4776
 amsdal_cli/commands/build/schemas/data_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/build/schemas/data_models/custom_code.py,sha256=slXyNHvhYW79CzBU5UH2Lnsj4DZHsoY0VAIl_oe4_JM,977
-amsdal_cli/commands/build/schemas/data_models/options.py,sha256=TFNFir9-yjn6rsyyjN7jgvqs4hZtjOGSmfDgwChH1U8,613
+amsdal_cli/commands/build/schemas/data_models/options.py,sha256=nOf7n-wremduK56G-vMYCezmyo-HnO_fhxepC8mPWps,622
 amsdal_cli/commands/build/schemas/data_models/schemas_directory.py,sha256=E1BonuLhxw4W5upVYKRDH43OcTmmpGk5u_iQjcg0lo0,579
 amsdal_cli/commands/build/schemas/extenders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/build/schemas/extenders/custom_code_extender.py,sha256=wE3jvJkaanPWFiafLWDiIry70WMLxeF6_GEppT1jgvw,1586
@@ -125,9 +125,9 @@ amsdal_cli/commands/generate/utils/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 amsdal_cli/commands/generate/utils/tests/async_mode_utils.py,sha256=iub84Pj5TMa38W90Pr5HgkFQLXpUdbmcm9HOx98Oh6o,309
 amsdal_cli/commands/generate/utils/tests/conftest_utils.py,sha256=8KzHtDh7eQGghhj5aZkY7Mu2rrlkBgM4Khf857iGG1Y,838
 amsdal_cli/commands/generate/utils/tests/function_utils.py,sha256=Bkk9JDbANX2aSreNRr1Bste5rPwVKc2HV5xLFg2dQK4,496
-amsdal_cli/commands/generate/utils/tests/model_utils.py,sha256=UxSfBx_dCHQ0BBTdu6viv-YXeh5oVKjiiFxw00yTkvo,2978
-amsdal_cli/commands/generate/utils/tests/type_utils.py,sha256=FiEyjg8oRKV8RozidjHWoT-fvMvVg0a8fStgstiE-1Q,8320
-amsdal_cli/commands/generate/utils/tests/unit.py,sha256=hVOvNUDPl5LvBfshsfvPiJOWFqMYJNOFH0AJjV20kv4,27657
+amsdal_cli/commands/generate/utils/tests/model_utils.py,sha256=CBfR9AcL6Q1boEejjmOD16F0kgJFdIjYYWNE3vQMkfE,4051
+amsdal_cli/commands/generate/utils/tests/type_utils.py,sha256=PkPmSvLCKOK5wWw1Q9oVMUZ0nUpHEtj6PlBsO7enmzY,9247
+amsdal_cli/commands/generate/utils/tests/unit.py,sha256=KRqBhk_jy_1vp0RZub7HdYxfhn3Bra2v0heDNNPldeE,27741
 amsdal_cli/commands/generate/utils/tests/templates/async/conftest.py,sha256=9GfoV_HzwuWtglI7uz0fP5_pOsPk2f56elaoinuPa80,1632
 amsdal_cli/commands/generate/utils/tests/templates/sync/conftest.py,sha256=wMmnKQnVTSJsS5MdH25ChRcc-aQevQYqIZhXwLnZl0U,1564
 amsdal_cli/commands/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -135,9 +135,9 @@ amsdal_cli/commands/migrations/app.py,sha256=0HsKjZ5D2j9xkOi2Fuvs3VdlhWyQnS8XJ6p
 amsdal_cli/commands/migrations/command.py,sha256=jlpdYZAc02ZUBxSdzGSzkDxEb1nlHNzoq05FdRCSzus,206
 amsdal_cli/commands/migrations/constants.py,sha256=846-DQ-Iqcxw2akd5aBAmbnXHDmRFqEKu6vai2ZFBkU,35
 amsdal_cli/commands/migrations/sub_commands/__init__.py,sha256=_rWbDyY3DPdN-6vE60djCtHejvSkl6d1e2Z4ScM52bo,976
-amsdal_cli/commands/migrations/sub_commands/apply.py,sha256=J4v29EabFmT7IXmu95PFOM26vdSGcMW1RhlS3zUcE7E,9435
-amsdal_cli/commands/migrations/sub_commands/list.py,sha256=AmYd8uR2j7ZCQjZIvg1Y1NwIFkPbb1CZaJc1ZYIkuwM,5359
-amsdal_cli/commands/migrations/sub_commands/make.py,sha256=-CtC-2_5BS1UK9Nrjt_JqDRv1wLACn3QkAncAUi4UVk,6232
+amsdal_cli/commands/migrations/sub_commands/apply.py,sha256=26wMVtzBpJawbFPpiXSUGItmzd1XORymcIBgbonVZgw,9475
+amsdal_cli/commands/migrations/sub_commands/list.py,sha256=xOfonot6JAs3ApXe-QRLKfJf2kVsj7TalEMwK3V_uC4,5439
+amsdal_cli/commands/migrations/sub_commands/make.py,sha256=y-SWaGzWx2apuTA57prStSo09VjH7Q9ZNjzEvbVzwo8,6272
 amsdal_cli/commands/new/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/new/command.py,sha256=NDuDZNwreyuHsv4tbE-yrNOJViB8wk35IcKvGKQXPXo,3302
 amsdal_cli/commands/new/templates/.amsdal-cli,sha256=PdXPovcT8AfPhqwDLI_4EWFYAS6e3J5JcsHVityBdF8,304
@@ -156,22 +156,22 @@ amsdal_cli/commands/register_connection/utils/config_updater.py,sha256=CDsaCuli5
 amsdal_cli/commands/register_connection/utils/credentials.py,sha256=iaAF5STbKJNIoT8vL30DafTn4uzYnrjumtM3XNHuOS8,1066
 amsdal_cli/commands/register_connection/utils/initialize.py,sha256=PMFoqAIxFB1xzY56FFX2-pRJ_CZbwUbgD25m0Pk1b48,1080
 amsdal_cli/commands/register_connection/utils/meta.py,sha256=PDs2miN0SPW2hCATLY8uGe1WOzDyw-D6my90P-mpcl8,709
-amsdal_cli/commands/register_connection/utils/migrate_models.py,sha256=lFarjAgfNG7PIIXpaFOcS5Uqc6U-uaSLEoSlHNvnYXo,13748
+amsdal_cli/commands/register_connection/utils/migrate_models.py,sha256=XN7pPE7KsqEVcQzTCymIn7lIgX4n6UEZkv1v_HlBdgU,13902
 amsdal_cli/commands/register_connection/utils/model_generator.py,sha256=w0vz-i-tMdimcQYmFbtfpOZJF8heTTRIzu1yTdbKBpc,10853
 amsdal_cli/commands/register_connection/utils/tables.py,sha256=FOwbWOpEw485Leoqe8LXCVY5osGKTKlMqWD9oqosapk,474
 amsdal_cli/commands/restore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/commands/restore/command.py,sha256=YtQNebOrCuBlxMs_kTS_hALkt8pFl7hvNonm1idsTyg,28314
+amsdal_cli/commands/restore/command.py,sha256=ya3aHpMLpgF_vMAGSTbBuSHIUwC4FaHhMiwrD6AglTo,32833
 amsdal_cli/commands/restore/enums.py,sha256=6SiKMRGlSjiLyepfbfQFXGAYqlM6Bkoeko2KscntTUQ,307
 amsdal_cli/commands/serve/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/serve/command.py,sha256=tjm1T0yrA2P6nlk_KDNv6Gih2Dkt5nMIN-_WUrLhn58,6541
-amsdal_cli/commands/serve/utils.py,sha256=o9rVLSMXRTGDb6CGTsfgKkNXBhRqbaLyRFNUNYzElkg,17301
+amsdal_cli/commands/serve/utils.py,sha256=h-t6trB0nf7bJyz2vU42AQYdbi5DDmF3qHwtqb5R_Yc,17381
 amsdal_cli/commands/serve/filters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/serve/filters/models_watch_filter.py,sha256=cnoAjrn-PYDAFq5MtgbQ6QeCvJJmcNisVNlA8QtFv4A,170
 amsdal_cli/commands/serve/filters/static_files_watch_filter.py,sha256=jKAF5RHq1au2v0kcOrqaAHP1x5IUjt_KgZURJLm29Tw,552
 amsdal_cli/commands/serve/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/commands/serve/services/supervisor.py,sha256=EsSEDZZ6gPBixhkO88-i95nTptw0eboIGxly81GYBTs,15164
+amsdal_cli/commands/serve/services/supervisor.py,sha256=YAt8pT8qev5DN_u8zpiEsDvAKJpPdoqczxAwSSlSJpU,15216
 amsdal_cli/commands/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/commands/tests/command.py,sha256=Lq-s2JQWQPoCA8nwu2-vh9yUmWAAJvHOw3kSmmyiQsg,3770
+amsdal_cli/commands/tests/command.py,sha256=26fOKdCRzQ54NsrY2pSbqr8g6_J89jCg1f5Rey_UgP0,3843
 amsdal_cli/commands/verify/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/verify/command.py,sha256=Dgg0brt1pBqyI4ZMM02NgBg7GC5oKAwvv298teIUT0I,2242
 amsdal_cli/commands/verify/models.py,sha256=u9kvoRqNv0wbp0hDUi1GvgWbk417RifFmRvT6AVr2NE,444
@@ -199,8 +199,8 @@ amsdal_cli/utils/vcs/base.py,sha256=jC05ExJZDnyHAsW7_4IDf8gQcYgK4dXq3zNlFIX66T4,
 amsdal_cli/utils/vcs/dummy.py,sha256=Lk8MT-b0YlHHUsiXsq5cvmPwcl4jTYdo8piN5_C8ORA,434
 amsdal_cli/utils/vcs/enums.py,sha256=tYR9LN1IOr8BZFbSeX_vDlhn8fPl4IU-Yakii8lRDYs,69
 amsdal_cli/utils/vcs/git.py,sha256=xHynbZcV6p2D3RFCwu1MGGpV9D7eK-pGUtO8kVexTQM,1269
-amsdal_cli-0.4.13.dist-info/METADATA,sha256=TStWnhhl16Er72lM6A9tT6BGHhqIkS1pgG8CZTLPQkk,57050
-amsdal_cli-0.4.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-amsdal_cli-0.4.13.dist-info/entry_points.txt,sha256=GC-8LZsD3W--Pd9_gD4W3tw3ZZyPbSvkZ-qWc9Fx0NI,47
-amsdal_cli-0.4.13.dist-info/licenses/LICENSE.txt,sha256=hG-541PFYfNJi9WRZi_hno91UyqNg7YLK8LR3vLblZA,27355
-amsdal_cli-0.4.13.dist-info/RECORD,,
+amsdal_cli-0.4.15.dist-info/METADATA,sha256=C2wbd4XfyBm4IVkKuOfzMtGjzSixhsnr2ZucwAf-A1E,57050
+amsdal_cli-0.4.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+amsdal_cli-0.4.15.dist-info/entry_points.txt,sha256=GC-8LZsD3W--Pd9_gD4W3tw3ZZyPbSvkZ-qWc9Fx0NI,47
+amsdal_cli-0.4.15.dist-info/licenses/LICENSE.txt,sha256=hG-541PFYfNJi9WRZi_hno91UyqNg7YLK8LR3vLblZA,27355
+amsdal_cli-0.4.15.dist-info/RECORD,,