amsdal_cli 0.4.16__py3-none-any.whl → 0.5.1__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.16'
+__version__ = '0.5.1'

amsdal_cli/commands/build/services/mixin.py

@@ -49,7 +49,7 @@ class BuildMixin:
 
         shutil.copytree(
             models_source_path,
-            settings.USER_MODELS_MODULE_PATH,
+            settings.USER_MODELS_MODULE_PATH,  # type: ignore[arg-type]
             dirs_exist_ok=True,
         )
 

amsdal_cli/commands/cloud/deploy/sub_commands/deploy_new.py

@@ -246,7 +246,6 @@ def _check_missing_generated_migrations(
     from amsdal.configs.constants import CORE_MIGRATIONS_PATH
     from amsdal.configs.main import settings
     from amsdal_models.migration.file_migration_generator import FileMigrationGenerator
-    from amsdal_utils.models.enums import ModuleType
 
     from amsdal_cli.commands.migrations.constants import MIGRATIONS_DIR_NAME
     from amsdal_cli.utils.cli_config import ModelsFormat
@@ -261,7 +260,7 @@ def _check_missing_generated_migrations(
     if not amsdal_manager.is_authenticated:
         amsdal_manager.authenticate()
 
-    amsdal_manager.post_setup()
+    amsdal_manager.post_setup()  # type: ignore[call-arg]
     migrations_dir = app_source_path / MIGRATIONS_DIR_NAME
     cli_config.models_format = ModelsFormat.PY
     schema_repository = build_schema_repository(cli_config=cli_config)
@@ -270,8 +269,9 @@ def _check_missing_generated_migrations(
         app_migrations_path=migrations_dir,
         contrib_migrations_directory_name=settings.CONTRIB_MODELS_PACKAGE_NAME,
     )
+    generator.init_state()
 
-    operations = generator.generate_operations(schema_repository.user_schemas, ModuleType.USER)
+    operations = generator.app_file_migration_generator.generate_operations(schema_repository.user_schemas)
 
     if operations:
         rprint(rich_error('Missing generated migrations. Use `amsdal migrations new` to fix. Exiting...'))
@@ -295,7 +295,6 @@ async def _async_check_missing_generated_migrations(
     from amsdal.configs.constants import CORE_MIGRATIONS_PATH
     from amsdal.configs.main import settings
     from amsdal_models.migration.file_migration_generator import AsyncFileMigrationGenerator
-    from amsdal_utils.models.enums import ModuleType
 
     from amsdal_cli.commands.migrations.constants import MIGRATIONS_DIR_NAME
     from amsdal_cli.utils.cli_config import ModelsFormat
@@ -310,7 +309,7 @@ async def _async_check_missing_generated_migrations(
     if not amsdal_manager.is_authenticated:
         amsdal_manager.authenticate()
 
-    await amsdal_manager.post_setup()
+    await amsdal_manager.post_setup()  # type: ignore[call-arg, misc]
 
     migrations_dir = app_source_path / MIGRATIONS_DIR_NAME
 
@@ -321,8 +320,9 @@ async def _async_check_missing_generated_migrations(
         app_migrations_path=migrations_dir,
         contrib_migrations_directory_name=settings.CONTRIB_MODELS_PACKAGE_NAME,
     )
+    await generator.init_state()
 
-    operations = await generator.generate_operations(schema_repository.user_schemas, ModuleType.USER)
+    operations = generator.app_file_migration_generator.generate_operations(schema_repository.user_schemas)
 
     if operations:
         rprint(rich_error('Missing generated migrations. Use `amsdal migrations new` to fix. Exiting...'))

amsdal_cli/commands/generate/sub_commands/generate_model.py

@@ -105,7 +105,7 @@ def generate_model(
 
     if unique_attrs:
         _unique = json_schema.setdefault('unique', [])
-        _unique.extend(unique_attrs)  # type: ignore[attr-defined]
+        _unique.extend(unique_attrs)
 
     for attr in parsed_attrs:
         property_info: dict[str, Any] = {

amsdal_cli/commands/migrations/sub_commands/apply.py

@@ -30,6 +30,7 @@ def _sync_apply(
     from amsdal_models.migration.file_migration_executor import FileMigrationExecutorManager
     from amsdal_models.migration.migrations import MigrationSchemas
     from amsdal_models.migration.migrations_loader import MigrationsLoader
+    from amsdal_models.migration.utils import build_migrations_module_name
 
     from amsdal_cli.commands.migrations.constants import MIGRATIONS_DIR_NAME
     from amsdal_cli.utils.text import rich_info
@@ -42,11 +43,15 @@ def _sync_apply(
         amsdal_manager.setup()
 
     amsdal_manager.authenticate()
-    amsdal_manager.post_setup()
+    amsdal_manager.post_setup()  # type: ignore[call-arg]
 
     app_migrations_loader = MigrationsLoader(
         migrations_dir=build_dir / MIGRATIONS_DIR_NAME,
         module_type=ModuleType.USER,
+        module_name=build_migrations_module_name(
+            None,
+            MIGRATIONS_DIR_NAME,
+        ),
     )
     schemas = MigrationSchemas()
 
@@ -101,9 +106,9 @@ async def _async_sync_apply(
     from amsdal_models.migration.data_classes import MigrationResult
     from amsdal_models.migration.executors.default_executor import DefaultAsyncMigrationExecutor
     from amsdal_models.migration.file_migration_executor import AsyncFileMigrationExecutorManager
-    from amsdal_models.migration.file_migration_store import AsyncFileMigrationStore
     from amsdal_models.migration.migrations import MigrationSchemas
     from amsdal_models.migration.migrations_loader import MigrationsLoader
+    from amsdal_models.migration.utils import build_migrations_module_name
 
     from amsdal_cli.commands.migrations.constants import MIGRATIONS_DIR_NAME
     from amsdal_cli.utils.text import rich_info
@@ -116,14 +121,16 @@ async def _async_sync_apply(
 
     try:
         amsdal_manager.authenticate()
-        store = AsyncFileMigrationStore(build_dir / MIGRATIONS_DIR_NAME)
 
-        await store.init_migration_table()
-        await amsdal_manager.post_setup()
+        await amsdal_manager.post_setup()  # type: ignore[call-arg, misc]
 
         app_migrations_loader = MigrationsLoader(
             migrations_dir=build_dir / MIGRATIONS_DIR_NAME,
             module_type=ModuleType.USER,
+            module_name=build_migrations_module_name(
+                None,
+                MIGRATIONS_DIR_NAME,
+            ),
         )
         schemas = MigrationSchemas()
 

amsdal_cli/commands/migrations/sub_commands/list.py

@@ -19,9 +19,11 @@ def _fetch_migrations(app_migrations_path: Path) -> list['MigrationFile']:
     if not amsdal_manager.is_setup:
         amsdal_manager.setup()
     amsdal_manager.authenticate()
-    amsdal_manager.post_setup()
+    amsdal_manager.post_setup()  # type: ignore[call-arg]
 
     store = FileMigrationStore(app_migrations_path)
+    store.init_migration_table()
+
     return store.fetch_migrations()
 
 
@@ -35,7 +37,7 @@ async def _async_fetch_migrations(app_migrations_path: Path) -> list['MigrationF
 
     try:
         amsdal_manager.authenticate()
-        await amsdal_manager.post_setup()
+        await amsdal_manager.post_setup()  # type: ignore[call-arg,misc]
 
         store = AsyncFileMigrationStore(app_migrations_path)
         await store.init_migration_table()
@@ -58,6 +60,7 @@ def list_migrations(
     from amsdal.configs.main import settings
     from amsdal_models.migration.data_classes import ModuleType
     from amsdal_models.migration.migrations_loader import MigrationsLoader
+    from amsdal_models.migration.utils import build_migrations_module_name
     from amsdal_models.migration.utils import contrib_to_module_root_path
     from amsdal_utils.config.manager import AmsdalConfigManager
 
@@ -94,6 +97,10 @@ def list_migrations(
     core_loader = MigrationsLoader(
         migrations_dir=CORE_MIGRATIONS_PATH,
         module_type=ModuleType.CORE,
+        module_name=build_migrations_module_name(
+            'amsdal',
+            '__migrations__',
+        ),
     )
     contrib_loaders: list[tuple[str, MigrationsLoader]] = []
 
@@ -106,7 +113,10 @@ def list_migrations(
                 MigrationsLoader(
                     migrations_dir=contrib_root_path / settings.CONTRIB_MIGRATIONS_DIRECTORY_NAME,
                     module_type=ModuleType.CONTRIB,
-                    module_name=contrib,
+                    module_name=build_migrations_module_name(
+                        '.'.join(contrib.split('.')[:-2]),
+                        settings.CONTRIB_MIGRATIONS_DIRECTORY_NAME,
+                    ),
                 ),
             ),
         )
@@ -114,6 +124,10 @@ def list_migrations(
     app_migrations_loader = MigrationsLoader(
         migrations_dir=build_dir / MIGRATIONS_DIR_NAME,
         module_type=ModuleType.USER,
+        module_name=build_migrations_module_name(
+            None,
+            MIGRATIONS_DIR_NAME,
+        ),
     )
 
     rprint(rich_success('Core:'))
@@ -126,7 +140,11 @@ def list_migrations(
     rprint(rich_success('Contrib:'))
     for _contrib, _loader in contrib_loaders:
         _contrib_name = _contrib.rsplit('.', 2)[0]
-        _applied_numbers = _contrib_applied_numbers[_contrib]
+        _contrib_module_name = build_migrations_module_name(
+            '.'.join(_contrib.split('.')[:-2]),
+            settings.CONTRIB_MIGRATIONS_DIRECTORY_NAME,
+        )
+        _applied_numbers = _contrib_applied_numbers[_contrib_module_name]
 
         for _migration in _loader:
             _is_migrated = 'x' if _migration.number in _applied_numbers else ' '

amsdal_cli/commands/migrations/sub_commands/make.py

@@ -36,7 +36,7 @@ def _sync_make_migrations(
     if not amsdal_manager._is_setup:
         amsdal_manager.setup()
     amsdal_manager.authenticate()
-    amsdal_manager.post_setup()
+    amsdal_manager.post_setup()  # type: ignore[call-arg]
 
     schema_repository = build_schema_repository(cli_config=cli_config)
     migrations_dir: Path = cli_config.app_directory / SOURCES_DIR / MIGRATIONS_DIR_NAME
@@ -44,7 +44,7 @@ def _sync_make_migrations(
     generator = FileMigrationGenerator(
         core_migrations_path=CORE_MIGRATIONS_PATH,
         app_migrations_path=migrations_dir,
-        contrib_migrations_directory_name=settings.CONTRIB_MODELS_PACKAGE_NAME,
+        contrib_migrations_directory_name=settings.CONTRIB_MIGRATIONS_DIRECTORY_NAME,
     )
 
     try:
@@ -89,7 +89,7 @@ async def _async_make_migrations(
     if not amsdal_manager.is_setup:
         await amsdal_manager.setup()
     amsdal_manager.authenticate()
-    await amsdal_manager.post_setup()
+    await amsdal_manager.post_setup()  # type: ignore[call-arg, misc]
 
     schema_repository = build_schema_repository(cli_config=cli_config)
     migrations_dir: Path = cli_config.app_directory / SOURCES_DIR / MIGRATIONS_DIR_NAME

amsdal_cli/commands/register_connection/utils/initialize.py

@@ -11,6 +11,10 @@ async def init_amsdal(config_path: Path, temp_dir: Path) -> None:
         USER_MODELS_MODULE_PATH=temp_dir / 'models',
     )
 
+    if not settings.USER_MODELS_MODULE_PATH:
+        msg = 'USER_MODELS_MODULE_PATH must be set in settings.'
+        raise ValueError(msg)
+
     settings.USER_MODELS_MODULE_PATH.mkdir(parents=True, exist_ok=True)
     (settings.USER_MODELS_MODULE_PATH / '__init__.py').touch(exist_ok=True)
 
@@ -25,7 +29,7 @@ async def init_amsdal(config_path: Path, temp_dir: Path) -> None:
         amsdal_manager = AmsdalManager()
         amsdal_manager.setup()
         amsdal_manager.authenticate()
-        amsdal_manager.post_setup()
+        amsdal_manager.post_setup()  # type: ignore[call-arg]
 
 
 async def _async_init() -> None:
@@ -34,4 +38,4 @@ async def _async_init() -> None:
     amsdal_manager = AsyncAmsdalManager()
     await amsdal_manager.setup()
     amsdal_manager.authenticate()
-    await amsdal_manager.post_setup()
+    await amsdal_manager.post_setup()  # type: ignore[call-arg, misc]

amsdal_cli/commands/register_connection/utils/migrate_models.py

@@ -50,7 +50,7 @@ async def migrate_models_to_lakehouse(
             build_dir=temp_dir,
         )
 
-        sys.path.insert(0, str(settings.USER_MODELS_MODULE_PATH.absolute()))
+        sys.path.insert(0, str(settings.USER_MODELS_MODULE_PATH.absolute()))  # type: ignore[union-attr]
 
         if config_manager.get_config().async_mode:
             await _async_migrate_models(config_path)
@@ -72,7 +72,7 @@ def _migrate_models(config_path: Path) -> None:
     from amsdal_models.classes.class_loader import ModelClassLoader
     from amsdal_models.migration import migrations
     from amsdal_models.migration.executors.default_executor import DefaultMigrationExecutor
-    from amsdal_models.migration.file_migration_generator import FileMigrationGenerator
+    from amsdal_models.migration.file_migration_generator import BaseFileMigrationGenerator
     from amsdal_models.migration.file_migration_writer import FileMigrationWriter
     from amsdal_models.migration.migrations import MigrationSchemas
     from amsdal_models.schemas.class_schema_loader import ClassSchemaLoader
@@ -88,7 +88,7 @@ def _migrate_models(config_path: Path) -> None:
     new_manager = AmsdalManager()
     if not new_manager.is_setup:
         new_manager.setup()
-    new_manager.post_setup()
+    new_manager.post_setup()  # type: ignore[call-arg]
 
     schemas = MigrationSchemas()
     executor = DefaultMigrationExecutor(schemas, use_foreign_keys=True)
@@ -121,7 +121,7 @@ def _migrate_models(config_path: Path) -> None:
     _schemas_map = {_schema.title: _schema for _schema in _schemas}
 
     for object_schema in _schemas:
-        for _operation_data in FileMigrationGenerator.build_operations(
+        for _operation_data in BaseFileMigrationGenerator.build_operations(
             ModuleType.USER,
             object_schema,
             None,
@@ -136,7 +136,7 @@ def _migrate_models(config_path: Path) -> None:
             _operation.forward(executor)
 
     for object_schema in _cycle_schemas:
-        for _operation_data in FileMigrationGenerator.build_operations(
+        for _operation_data in BaseFileMigrationGenerator.build_operations(
             ModuleType.USER,
             object_schema,
             _schemas_map[object_schema.title],
@@ -163,7 +163,7 @@ async def _async_migrate_models(config_path: Path) -> None:
     from amsdal_models.classes.class_loader import ModelClassLoader
     from amsdal_models.migration import migrations
     from amsdal_models.migration.executors.default_executor import DefaultAsyncMigrationExecutor
-    from amsdal_models.migration.file_migration_generator import AsyncFileMigrationGenerator
+    from amsdal_models.migration.file_migration_generator import BaseFileMigrationGenerator
     from amsdal_models.migration.file_migration_writer import FileMigrationWriter
     from amsdal_models.migration.migrations import MigrationSchemas
     from amsdal_models.schemas.class_schema_loader import ClassSchemaLoader
@@ -178,7 +178,7 @@ async def _async_migrate_models(config_path: Path) -> None:
     new_manager = AsyncAmsdalManager()
     if not new_manager.is_setup:
         await new_manager.setup()
-    await new_manager.post_setup()
+    await new_manager.post_setup()  # type: ignore[call-arg, misc]
 
     schemas = MigrationSchemas()
     executor = DefaultAsyncMigrationExecutor(schemas, use_foreign_keys=True)
@@ -211,7 +211,7 @@ async def _async_migrate_models(config_path: Path) -> None:
     _schemas_map = {_schema.title: _schema for _schema in _schemas}
 
     for object_schema in _schemas:
-        for _operation_data in AsyncFileMigrationGenerator.build_operations(
+        for _operation_data in BaseFileMigrationGenerator.build_operations(
             ModuleType.USER,
             object_schema,
             None,
@@ -226,7 +226,7 @@ async def _async_migrate_models(config_path: Path) -> None:
             _operation.forward(executor)
 
     for object_schema in _cycle_schemas:
-        for _operation_data in AsyncFileMigrationGenerator.build_operations(
+        for _operation_data in BaseFileMigrationGenerator.build_operations(
             ModuleType.USER,
             object_schema,
             _schemas_map[object_schema.title],
@@ -257,7 +257,7 @@ def _migrate_data(new_connection_name: str) -> None:
     origin_manager = AmsdalManager()
     if not origin_manager.is_setup:
         origin_manager.setup()
-    origin_manager.post_setup()
+    origin_manager.post_setup()  # type: ignore[call-arg]
 
     model_class_loader = ModelClassLoader(settings.USER_MODELS_MODULE)
     tables_for_connection = _resolve_tables_for_connection(new_connection_name)
@@ -310,7 +310,7 @@ async def _async_migrate_data(new_connection_name: str) -> None:
     origin_manager = AsyncAmsdalManager()
     if not origin_manager.is_setup:
         await origin_manager.setup()
-    await origin_manager.post_setup()
+    await origin_manager.post_setup()  # type: ignore[call-arg, misc]
 
     model_class_loader = ModelClassLoader(settings.USER_MODELS_MODULE)
     tables_for_connection = _resolve_tables_for_connection(new_connection_name)
@@ -346,7 +346,7 @@ async def _async_migrate_data(new_connection_name: str) -> None:
                         force_insert = True
                         lakehouse_item = model_class(**item.model_dump_refs())
 
-                    await lakehouse_item.asave(
+                    await lakehouse_item.asave(  # type: ignore[misc]
                         force_insert=force_insert,
                         using=LAKEHOUSE_DB_ALIAS,
                     )

amsdal_cli/commands/serve/command.py

@@ -45,7 +45,7 @@ async def _async_serve(
             async def on_event_async(self, *args: Any, **kwargs: Any) -> None:  # noqa: ARG002
                 if not amsdal_manager._is_setup:
                     await amsdal_manager.setup()
-                    await amsdal_manager.post_setup()
+                    await amsdal_manager.post_setup()  # type: ignore[call-arg, misc]
 
                 if not amsdal_manager.is_authenticated:
                     amsdal_manager.authenticate()
@@ -159,7 +159,7 @@ def serve_command(
                     def on_event(self, *args: Any, **kwargs: Any) -> None:  # noqa: ARG002
                         if not amsdal_manager._is_setup:
                             amsdal_manager.setup()
-                            amsdal_manager.post_setup()
+                            amsdal_manager.post_setup()  # type: ignore[call-arg]
 
                         if not amsdal_manager.is_authenticated:
                             amsdal_manager.authenticate()

amsdal_cli/commands/serve/utils.py

@@ -122,13 +122,13 @@ def build_app_and_check_migrations(
         if not amsdal_manager.is_setup:
             amsdal_manager.setup()
 
-        amsdal_manager.post_setup()
+        amsdal_manager.post_setup()  # type: ignore[call-arg]
         amsdal_manager.init_classes()
 
         if not amsdal_manager.is_authenticated:
             amsdal_manager.authenticate()
 
-        amsdal_manager.apply_fixtures()
+        amsdal_manager.apply_fixtures()  # type: ignore[call-arg]
         rprint(rich_success('OK!'))
 
     return amsdal_manager
@@ -158,7 +158,7 @@ def check_migrations_generated_and_applied(
     if not amsdal_manager.is_authenticated:
         amsdal_manager.authenticate()
 
-    amsdal_manager.post_setup()
+    amsdal_manager.post_setup()  # type: ignore[call-arg]
 
     has_unapplied_migrations = _check_has_unapplied_migrations(build_dir=build_dir)
 
@@ -175,7 +175,6 @@ def _check_migrations_generated_and_applied(
     from amsdal.configs.constants import CORE_MIGRATIONS_PATH
     from amsdal.configs.main import settings
     from amsdal_models.migration.file_migration_generator import FileMigrationGenerator
-    from amsdal_utils.models.enums import ModuleType
 
     from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.commands.migrations.constants import MIGRATIONS_DIR_NAME
@@ -192,10 +191,11 @@ def _check_migrations_generated_and_applied(
     generator = FileMigrationGenerator(
         core_migrations_path=CORE_MIGRATIONS_PATH,
         app_migrations_path=migrations_dir,
-        contrib_migrations_directory_name=settings.CONTRIB_MODELS_PACKAGE_NAME,
+        contrib_migrations_directory_name=settings.CONTRIB_MIGRATIONS_DIRECTORY_NAME,
     )
+    generator.init_state()
 
-    operations = generator.generate_operations(schemas=schema_repository.user_schemas, module_type=ModuleType.USER)
+    operations = generator.app_file_migration_generator.generate_operations(schemas=schema_repository.user_schemas)
 
     if operations:
         rprint(
@@ -216,6 +216,7 @@ def _check_has_unapplied_migrations(
     from amsdal_models.migration.base_migration_schemas import DefaultMigrationSchemas
     from amsdal_models.migration.file_migration_store import FileMigrationStore
     from amsdal_models.migration.migrations_loader import MigrationsLoader
+    from amsdal_models.migration.utils import build_migrations_module_name
     from amsdal_models.migration.utils import contrib_to_module_root_path
     from amsdal_utils.models.enums import ModuleType
 
@@ -226,6 +227,10 @@ def _check_has_unapplied_migrations(
     core_loader = MigrationsLoader(
         migrations_dir=CORE_MIGRATIONS_PATH,
         module_type=ModuleType.CORE,
+        module_name=build_migrations_module_name(
+            'amsdal',
+            '__migrations__',
+        ),
     )
 
     schemas = DefaultMigrationSchemas()
@@ -238,9 +243,12 @@ def _check_has_unapplied_migrations(
 
         if _check_has_unapplied_migrations_per_loader(
             MigrationsLoader(
-                migrations_dir=contrib_root_path / settings.MIGRATIONS_DIRECTORY_NAME,
+                migrations_dir=contrib_root_path / settings.CONTRIB_MIGRATIONS_DIRECTORY_NAME,
                 module_type=ModuleType.CONTRIB,
-                module_name=contrib,
+                module_name=build_migrations_module_name(
+                    '.'.join(contrib.split('.')[:-2]),
+                    settings.CONTRIB_MIGRATIONS_DIRECTORY_NAME,
+                ),
             ),
             all_applied_migrations,
             schemas,
@@ -251,6 +259,10 @@ def _check_has_unapplied_migrations(
         MigrationsLoader(
             migrations_dir=build_dir / MIGRATIONS_DIR_NAME,
             module_type=ModuleType.USER,
+            module_name=build_migrations_module_name(
+                None,
+                MIGRATIONS_DIR_NAME,
+            ),
         ),
         all_applied_migrations,
         schemas,
@@ -263,7 +275,7 @@ def _check_has_unapplied_migrations_per_loader(
     schemas: 'DefaultMigrationSchemas',
 ) -> bool:
     from amsdal_models.migration.executors.state_executor import StateMigrationExecutor
-    from amsdal_models.migration.file_migration_executor import FileMigrationExecutorManager
+    from amsdal_models.migration.file_migration_executor import BaseMigrationExecutorManager
     from amsdal_models.migration.migrations import MigrateData
 
     from amsdal_cli.utils.text import rich_warning
@@ -278,7 +290,8 @@ def _check_has_unapplied_migrations_per_loader(
             return True
         else:
             # Register classes from migrations
-            migration_class = FileMigrationExecutorManager.get_migration_class(_migration)
+
+            migration_class = BaseMigrationExecutorManager.get_migration_class(_migration)
             migration_class_instance = migration_class()
             state_executor = StateMigrationExecutor(
                 schemas,
@@ -297,12 +310,15 @@ def _is_migration_applied(
     migration: 'MigrationFile',
     all_applied_migrations: list['MigrationFile'],
 ) -> bool:
+    from amsdal_models.migration.data_classes import ModuleType
+
     for applied_migration in all_applied_migrations:
-        if (
-            migration.type == applied_migration.type
-            and migration.number == applied_migration.number
-            and migration.module == applied_migration.module
-        ):
+        is_applied = migration.type == applied_migration.type and migration.number == applied_migration.number
+
+        if migration.type == ModuleType.CONTRIB.value:
+            is_applied = is_applied and migration.module == applied_migration.module
+
+        if is_applied:
             return True
     return False
 
@@ -382,13 +398,13 @@ async def async_build_app_and_check_migrations(
             if not amsdal_manager.is_setup:
                 await amsdal_manager.setup()
 
-            await amsdal_manager.post_setup()
+            await amsdal_manager.post_setup()  # type: ignore[call-arg,misc]
             amsdal_manager.init_classes()
 
             if not amsdal_manager.is_authenticated:
                 amsdal_manager.authenticate()
 
-            await amsdal_manager.apply_fixtures()
+            await amsdal_manager.apply_fixtures()  # type: ignore[call-arg,misc]
             rprint(rich_success('OK!'))
     except Exception:
         if amsdal_manager.is_setup:
@@ -423,7 +439,7 @@ async def async_check_migrations_generated_and_applied(
     if not amsdal_manager.is_authenticated:
         amsdal_manager.authenticate()
 
-    await amsdal_manager.post_setup()
+    await amsdal_manager.post_setup()  # type: ignore[call-arg,misc]
 
     has_unapplied_migrations = await _async_check_has_unapplied_migrations(build_dir=build_dir)
 
@@ -441,6 +457,7 @@ async def _async_check_has_unapplied_migrations(
     from amsdal_models.migration.base_migration_schemas import DefaultMigrationSchemas
     from amsdal_models.migration.file_migration_store import AsyncFileMigrationStore
     from amsdal_models.migration.migrations_loader import MigrationsLoader
+    from amsdal_models.migration.utils import build_migrations_module_name
     from amsdal_models.migration.utils import contrib_to_module_root_path
     from amsdal_utils.models.enums import ModuleType
 
@@ -451,6 +468,10 @@ async def _async_check_has_unapplied_migrations(
     core_loader = MigrationsLoader(
         migrations_dir=CORE_MIGRATIONS_PATH,
         module_type=ModuleType.CORE,
+        module_name=build_migrations_module_name(
+            'amsdal',
+            '__migrations__',
+        ),
     )
     schemas = DefaultMigrationSchemas()
 
@@ -462,9 +483,12 @@ async def _async_check_has_unapplied_migrations(
 
         if _check_has_unapplied_migrations_per_loader(
             MigrationsLoader(
-                migrations_dir=contrib_root_path / settings.MIGRATIONS_DIRECTORY_NAME,
+                migrations_dir=contrib_root_path / settings.CONTRIB_MIGRATIONS_DIRECTORY_NAME,
                 module_type=ModuleType.CONTRIB,
-                module_name=contrib,
+                module_name=build_migrations_module_name(
+                    '.'.join(contrib.split('.')[:-2]),
+                    settings.CONTRIB_MIGRATIONS_DIRECTORY_NAME,
+                ),
             ),
             all_applied_migrations,
             schemas,
@@ -475,6 +499,10 @@ async def _async_check_has_unapplied_migrations(
         MigrationsLoader(
             migrations_dir=build_dir / MIGRATIONS_DIR_NAME,
             module_type=ModuleType.USER,
+            module_name=build_migrations_module_name(
+                None,
+                MIGRATIONS_DIR_NAME,
+            ),
         ),
         all_applied_migrations,
         schemas,
@@ -488,7 +516,6 @@ async def _async_check_migrations_generated_and_applied(
     from amsdal.configs.constants import CORE_MIGRATIONS_PATH
     from amsdal.configs.main import settings
     from amsdal_models.migration.file_migration_generator import AsyncFileMigrationGenerator
-    from amsdal_utils.models.enums import ModuleType
 
     from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.commands.migrations.constants import MIGRATIONS_DIR_NAME
@@ -505,11 +532,11 @@ async def _async_check_migrations_generated_and_applied(
     generator = AsyncFileMigrationGenerator(
         core_migrations_path=CORE_MIGRATIONS_PATH,
         app_migrations_path=migrations_dir,
-        contrib_migrations_directory_name=settings.CONTRIB_MODELS_PACKAGE_NAME,
+        contrib_migrations_directory_name=settings.CONTRIB_MIGRATIONS_DIRECTORY_NAME,
     )
-    operations = await generator.generate_operations(
+    await generator.init_state()
+    operations = generator.app_file_migration_generator.generate_operations(
         schemas=schema_repository.user_schemas,
-        module_type=ModuleType.USER,
     )
 
     if operations:

{amsdal_cli-0.4.16.dist-info → amsdal_cli-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_cli
-Version: 0.4.16
+Version: 0.5.1
 Summary: CLI for AMSDAL framework
 Project-URL: Documentation, https://pypi.org/project/amsdal_cli/#readme
 Project-URL: Issues, https://pypi.org/project/amsdal_cli/
@@ -121,7 +121,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.11
-Requires-Dist: amsdal-server==0.4.*
+Requires-Dist: amsdal-server==0.5.*
 Requires-Dist: click<8.2.0
 Requires-Dist: faker==27.*
 Requires-Dist: gitpython~=3.1

{amsdal_cli-0.4.16.dist-info → amsdal_cli-0.5.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 amsdal_cli/Third-Party Materials - AMSDAL Dependencies - License Notices.md,sha256=uHJlGG0D4tbpUi8cq-497NNO9ltQ67a5448k-T14HTw,68241
-amsdal_cli/__about__.py,sha256=CNkKcTivBzCdpiOZg2Fy-UDtB7Hu79U3tfy8RCNecAQ,125
+amsdal_cli/__about__.py,sha256=8T_uBHVYswzzhu1l92_ZGiaOtk_9NzrS_TQ0P-bqbf8,124
 amsdal_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/app.py,sha256=_ucuLT5ospf1ifFKEG0IMfVnxKjnvPUQ4iMhkvOfCrc,466
 amsdal_cli/main.py,sha256=LtH-BD1eJrAUecjKzC8Gx7kYFUstOMH1erdeJUVqFB8,144
@@ -32,7 +32,7 @@ amsdal_cli/commands/build/schemas/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 amsdal_cli/commands/build/schemas/utils/merger.py,sha256=8dlSV3qgGAGNbOtGGx8zQ7yC99dihxg8JwPHMDboU2w,2229
 amsdal_cli/commands/build/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/build/services/builder.py,sha256=vdR5rqJvjJjfrAAqkFNfnF6MUr4Nai5K_gxyvCQa8mw,3220
-amsdal_cli/commands/build/services/mixin.py,sha256=w8tMH7KOAypoV85fDD9xe9tdo3VCsgHj08nwrmnKAIY,5723
+amsdal_cli/commands/build/services/mixin.py,sha256=KdjyrB0CaFQWIU9AZ6Z63tmfIEX5ZEo5HKD32KemDMQ,5749
 amsdal_cli/commands/build/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/build/utils/build_config_file.py,sha256=65s3rP_nnr5FJLQlYStGF2JNYxExq5tWZvIU_h8Ae7I,2009
 amsdal_cli/commands/ci_cd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -58,7 +58,7 @@ amsdal_cli/commands/cloud/deploy/command.py,sha256=LIX07pTU55GUA9KmTiKDtoCj5Ytx9
 amsdal_cli/commands/cloud/deploy/sub_commands/__init__.py,sha256=I7MJEyceCIgCXP7JpX06nLvEA6HUkjj9LSDAb7VfTGo,353
 amsdal_cli/commands/cloud/deploy/sub_commands/deploy_delete.py,sha256=pRLumeigF4e_Nod32p6XkgJsYxbB9H3WSxbv0IwA5Eo,3221
 amsdal_cli/commands/cloud/deploy/sub_commands/deploy_list.py,sha256=Nm-uaAmCjLP9UDFNM-E79QLAiqy6_9VQSTd_W8bKoE0,5532
-amsdal_cli/commands/cloud/deploy/sub_commands/deploy_new.py,sha256=FTcILPoesHXGvZlsax8VivKE3Ghw63fKK1EAIenSoWU,12718
+amsdal_cli/commands/cloud/deploy/sub_commands/deploy_new.py,sha256=G28mt1cMv8js80FTtzxahCCWV8AVcu7BWe4w7Nqvp04,12748
 amsdal_cli/commands/cloud/environments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/cloud/environments/app.py,sha256=kkzf_kW2jpl3d44qWuIZB5C3uWXzpNpnTIvUpuuPJHE,238
 amsdal_cli/commands/cloud/environments/command.py,sha256=roeg2tpa53W1qzCa_3-zEn5z2xiVS4STWB9M7P5BVKA,283
@@ -104,7 +104,7 @@ amsdal_cli/commands/generate/enums.py,sha256=4Nvbe4aJEUOMkFqjNbr2xtnvzqrJEh2qDiw
 amsdal_cli/commands/generate/sub_commands/__init__.py,sha256=WyZ4kE6IH9O_igOVJ31UQtqE12cCKyATi4E-qgslN3k,941
 amsdal_cli/commands/generate/sub_commands/generate_frontend_config.py,sha256=SkEzx7-mWgrPINwPXGRmYO1SVA0RZojOd6BZFQRmG0Q,2574
 amsdal_cli/commands/generate/sub_commands/generate_hook.py,sha256=C0Oy5VokM3BXPq33Kknjvtjwd7hdfSxQFKxJcHu_bgg,1738
-amsdal_cli/commands/generate/sub_commands/generate_model.py,sha256=5IgbkMqPHBBHIBZm5PzLJjl4lN9eyR89CT-yEtH63Ms,5909
+amsdal_cli/commands/generate/sub_commands/generate_model.py,sha256=imUNWHS0YgJLC1dNRi_Q6k5FfiUIAHDWf-wMHFk6Ucg,5879
 amsdal_cli/commands/generate/sub_commands/generate_modifier.py,sha256=NyN7vMTBGaQv6u815WT1lqAlqI4xP1AmIZWq5edZ-5g,1426
 amsdal_cli/commands/generate/sub_commands/generate_permission.py,sha256=gfRhZsnNnd_m_HxdOCB8C22tbMkopg2FTKo-T68b13s,2824
 amsdal_cli/commands/generate/sub_commands/generate_property.py,sha256=XrCjf48oEzuMPqsTuC5Qsn1WbIQzUVW8BNOmXssfUM8,1599
@@ -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=S7gfkxhOfcjfXiBiiwH9dVMVrMmedlwe_SaMBS-YaD4,9497
-amsdal_cli/commands/migrations/sub_commands/list.py,sha256=xOfonot6JAs3ApXe-QRLKfJf2kVsj7TalEMwK3V_uC4,5439
-amsdal_cli/commands/migrations/sub_commands/make.py,sha256=fLw4iC5lRxdksxg3yaf-qh0yPBNNlvfrdIZ-xxYG3Lk,6258
+amsdal_cli/commands/migrations/sub_commands/apply.py,sha256=FmkdIE5RUrCCkLJVgM3rtLva-4rYkKlzbjanOQqadUQ,9744
+amsdal_cli/commands/migrations/sub_commands/list.py,sha256=cskcdftYy-u-_rH1iPhreTQv_XiGD42bwi3vQCVe8to,6188
+amsdal_cli/commands/migrations/sub_commands/make.py,sha256=5DiSp5j_iv1Mk7eVFRJ_yCVdc1lZGkctmtY-tNbqaTk,6322
 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
@@ -154,17 +154,17 @@ amsdal_cli/commands/register_connection/utils/__init__.py,sha256=47DEQpj8HBSa-_T
 amsdal_cli/commands/register_connection/utils/build.py,sha256=7aE9AqUyhGM10fOtgbHdCKo6JG5f4xrM1NnjbXTBxWA,762
 amsdal_cli/commands/register_connection/utils/config_updater.py,sha256=CDsaCuli5tCsHoNrzfeWoVDPlyOTWvi8TPdbM4Fzo4o,4204
 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/initialize.py,sha256=9NvfAWOvWQVrSfVNZnGBqeKcQ7bxpTf56oj8239jgc8,1279
 amsdal_cli/commands/register_connection/utils/meta.py,sha256=PDs2miN0SPW2hCATLY8uGe1WOzDyw-D6my90P-mpcl8,709
-amsdal_cli/commands/register_connection/utils/migrate_models.py,sha256=XN7pPE7KsqEVcQzTCymIn7lIgX4n6UEZkv1v_HlBdgU,13902
+amsdal_cli/commands/register_connection/utils/migrate_models.py,sha256=oU_5oZcwU-qIMImpFIGniXvs7CJXyCyfSJozhFBRYkM,14077
 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=DZ27U8BXkMsxhiqYfQ64wduC-0UYq7UPcZfYRHgZ8nA,36004
 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=h-t6trB0nf7bJyz2vU42AQYdbi5DDmF3qHwtqb5R_Yc,17381
+amsdal_cli/commands/serve/command.py,sha256=x1_8gZDhRCUQt2-8v1K7__2uPjIlte_tY1ctJxVbl4k,6599
+amsdal_cli/commands/serve/utils.py,sha256=GhUxSdNN2eX8XbzVtl6IdAcMUY_UdozHKkoCVgaTVKs,18613
 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
@@ -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.16.dist-info/METADATA,sha256=TW0S3whObzI_H5FKzypEkSk53wd4IYvTX3jOoPCIs0s,57077
-amsdal_cli-0.4.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-amsdal_cli-0.4.16.dist-info/entry_points.txt,sha256=GC-8LZsD3W--Pd9_gD4W3tw3ZZyPbSvkZ-qWc9Fx0NI,47
-amsdal_cli-0.4.16.dist-info/licenses/LICENSE.txt,sha256=hG-541PFYfNJi9WRZi_hno91UyqNg7YLK8LR3vLblZA,27355
-amsdal_cli-0.4.16.dist-info/RECORD,,
+amsdal_cli-0.5.1.dist-info/METADATA,sha256=f2hWFH9YPPht0n1YdpChdC7oDrRbzmSv0zSUbbC5VwI,57076
+amsdal_cli-0.5.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+amsdal_cli-0.5.1.dist-info/entry_points.txt,sha256=GC-8LZsD3W--Pd9_gD4W3tw3ZZyPbSvkZ-qWc9Fx0NI,47
+amsdal_cli-0.5.1.dist-info/licenses/LICENSE.txt,sha256=hG-541PFYfNJi9WRZi_hno91UyqNg7YLK8LR3vLblZA,27355
+amsdal_cli-0.5.1.dist-info/RECORD,,