amsdal_cli 0.4.15__tar.gz → 0.5.0__tar.gz

{amsdal_cli-0.4.15 → amsdal_cli-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_cli
-Version: 0.4.15
+Version: 0.5.0
 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,14 +121,15 @@ 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
 Requires-Dist: jinja2~=3.1
 Requires-Dist: pydantic-settings~=2.2
 Requires-Dist: pydantic~=2.3
-Requires-Dist: rich~=13.9
-Requires-Dist: typer~=0.15.2
+Requires-Dist: rich~=14.0
+Requires-Dist: typer~=0.15.3
 Requires-Dist: watchfiles~=0.21
 Description-Content-Type: text/markdown
 

{amsdal_cli-0.4.15 → amsdal_cli-0.5.0}/change-logs.md

@@ -1,3 +1,15 @@
+## [v0.5.0](https://pypi.org/project/amsdal_cli/0.5.0/) - 2025-05-23
+
+### Changed
+
+- Adjustments for the migrations improvements
+
+## [v0.4.16](https://pypi.org/project/amsdal_cli/0.4.16/) - 2025-05-12
+
+### Fixed
+
+- Pin `click` version
+
 ## [v0.4.15](https://pypi.org/project/amsdal_cli/0.4.15/) - 2025-05-01
 
 ### Fixed

amsdal_cli-0.5.0/latest-changelogs.md

@@ -0,0 +1,5 @@
+## [v0.5.0](https://pypi.org/project/amsdal_cli/0.5.0/) - 2025-05-23
+
+### Changed
+
+- Adjustments for the migrations improvements

{amsdal_cli-0.4.15 → amsdal_cli-0.5.0}/license_check.py

@@ -10,7 +10,10 @@ def extract_dependency_names():
 
     project_dependencies = toml_content.get('project', {}).get('dependencies', [])
 
-    dependency_list = [dep.split('==')[0].split('~=')[0].split('>=')[0].split('[')[0] for dep in project_dependencies]
+    dependency_list = [
+        dep.split('==')[0].split('<=')[0].split('~=')[0].split('>=')[0].split('[')[0].split('<')[0]
+        for dep in project_dependencies
+    ]
     return dependency_list
 
 

{amsdal_cli-0.4.15 → amsdal_cli-0.5.0}/pyproject.toml

@@ -33,15 +33,19 @@ classifiers = [
 dependencies = [
     "pydantic~=2.3",
     "pydantic-settings~=2.2",
-    "typer~=0.15.2",
-    "rich~=13.9",
+    "typer~=0.15.3",
+    "click<8.2.0",
+    "rich~=14.0",
     "jinja2~=3.1",
     "watchfiles~=0.21",
     "GitPython~=3.1",
-    "amsdal-server==0.4.*",
+    "amsdal-server==0.5.*",
     "faker==27.*",
 ]
 
+[tool.hatch.envs.default.env-vars]
+COLUMNS = "200"
+
 [project.urls]
 Documentation = "https://pypi.org/project/amsdal_cli/#readme"
 Issues = "https://pypi.org/project/amsdal_cli/"
@@ -99,6 +103,9 @@ all = [
 change-logs = "towncrier {args:.}"
 release = "rm latest-changelogs.md && towncrier build --yes --version {args:version} && (cat latest-changelogs.md; cat change-logs.md) > temp.md && mv temp.md change-logs.md && git add change-logs.md latest-changelogs.md release_notes && git commit -m 'Updated release notes'"
 
+[tool.hatch.envs.local.env-vars]
+COLUMNS = "200"
+
 [tool.hatch.envs.local]
 template = "local"
 path = "../.venv/amsdal_cli_local"

{amsdal_cli-0.4.15 → amsdal_cli-0.5.0}/src/amsdal_cli/Third-Party Materials - AMSDAL Dependencies - License Notices.md

@@ -1185,4 +1185,39 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.
+
+## click **v8**
+
+### [https://github.com/pallets/click/](https://github.com/pallets/click/)
+
+### **BSD-3-Clause license**
+
+Copyright 2014 Pallets
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1.  Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+2.  Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+3.  Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

{amsdal_cli-0.4.15 → amsdal_cli-0.5.0}/src/amsdal_cli/__about__.py

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

{amsdal_cli-0.4.15 → amsdal_cli-0.5.0}/src/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
@@ -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
@@ -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-0.4.15 → amsdal_cli-0.5.0}/src/amsdal_cli/commands/generate/sub_commands/generate_tests.py

@@ -16,9 +16,9 @@ from amsdal_cli.commands.generate.enums import TestType
 def generate_tests(
     ctx: typer.Context,
     model_name: str = typer.Option(..., help='The model name. It should be provided in PascalCase.'),
-    test_type: TestType = typer.Option(TestType.UNIT, help='The type of test to generate.'),  # noqa: B008
+    test_type: TestType = typer.Option(TestType.UNIT.value, help='The type of test to generate.'),  # noqa: B008
     test_data_type: TestDataType = typer.Option(  # noqa: B008
-        TestDataType.DYNAMIC,
+        TestDataType.DYNAMIC.value,
         help='The type of test data to generate.',
     ),
     config: Annotated[Path, typer.Option(..., '--config', '-c')] = None,  # type: ignore # noqa: RUF013

{amsdal_cli-0.4.15 → amsdal_cli-0.5.0}/src/amsdal_cli/commands/migrations/sub_commands/apply.py

@@ -47,6 +47,7 @@ def _sync_apply(
     app_migrations_loader = MigrationsLoader(
         migrations_dir=build_dir / MIGRATIONS_DIR_NAME,
         module_type=ModuleType.USER,
+        module_name=settings.MIGRATIONS_DIRECTORY_NAME,
     )
     schemas = MigrationSchemas()
 
@@ -101,7 +102,6 @@ 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
 
@@ -116,14 +116,13 @@ 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()
 
         app_migrations_loader = MigrationsLoader(
             migrations_dir=build_dir / MIGRATIONS_DIR_NAME,
             module_type=ModuleType.USER,
+            module_name=settings.MIGRATIONS_DIRECTORY_NAME,
         )
         schemas = MigrationSchemas()
 
@@ -211,7 +210,7 @@ def apply_migrations(
     ] = None,  # type: ignore[assignment]
     build_dir: Annotated[Path, typer.Option(..., '--build-dir', '-b')] = Path('.'),
     *,
-    module_type: Annotated[ModuleType, typer.Option(..., '--module', '-m')] = ModuleType.USER,
+    module_type: Annotated[ModuleType, typer.Option(..., '--module', '-m')] = ModuleType.USER.value,  # type: ignore
     fake: Annotated[bool, typer.Option('--fake', '-f')] = False,
     config: Annotated[Path, typer.Option(..., '--config', '-c')] = None,  # type: ignore # noqa: RUF013
 ) -> None:

{amsdal_cli-0.4.15 → amsdal_cli-0.5.0}/src/amsdal_cli/commands/migrations/sub_commands/list.py

@@ -22,6 +22,8 @@ def _fetch_migrations(app_migrations_path: Path) -> list['MigrationFile']:
     amsdal_manager.post_setup()
 
     store = FileMigrationStore(app_migrations_path)
+    store.init_migration_table()
+
     return store.fetch_migrations()
 
 
@@ -94,6 +96,7 @@ def list_migrations(
     core_loader = MigrationsLoader(
         migrations_dir=CORE_MIGRATIONS_PATH,
         module_type=ModuleType.CORE,
+        module_name='amsdal.__migrations__',
     )
     contrib_loaders: list[tuple[str, MigrationsLoader]] = []
 
@@ -114,6 +117,7 @@ def list_migrations(
     app_migrations_loader = MigrationsLoader(
         migrations_dir=build_dir / MIGRATIONS_DIR_NAME,
         module_type=ModuleType.USER,
+        module_name=settings.MIGRATIONS_DIRECTORY_NAME,
     )
 
     rprint(rich_success('Core:'))

{amsdal_cli-0.4.15 → amsdal_cli-0.5.0}/src/amsdal_cli/commands/migrations/sub_commands/make.py

@@ -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:
@@ -122,7 +122,7 @@ def make_migrations(
     build_dir: Annotated[Path, typer.Option('--build-dir', '-b')] = Path('.'),
     *,
     name: Annotated[str, typer.Option('--name', '-n', help='Migration name')] = None,  # type: ignore # noqa: RUF013
-    is_data: Annotated[bool, typer.Option('--data', '-d', is_flag=True, help='Create data migration')] = False,
+    is_data: Annotated[bool, typer.Option('--data', '-d', help='Create data migration')] = False,
     config: Annotated[Path, typer.Option('--config', '-c')] = None,  # type: ignore # noqa: RUF013
 ) -> None:
     """

{amsdal_cli-0.4.15 → amsdal_cli-0.5.0}/src/amsdal_cli/commands/register_connection/utils/migrate_models.py

@@ -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
@@ -121,7 +121,8 @@ 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 +137,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 +164,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
@@ -211,7 +212,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 +227,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],

{amsdal_cli-0.4.15 → amsdal_cli-0.5.0}/src/amsdal_cli/commands/restore/command.py

@@ -264,6 +264,8 @@ async def _async_restore_models(app_source_path: Path, cli_config: 'CliConfig')
 
 def _restore_state_db(cli_config: 'CliConfig', config_path: Path | None) -> None:
     from amsdal_data.connections.constants import SECONDARY_PARTITION_KEY
+    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
     from amsdal_data.utils import object_schema_to_glue_schema
     from amsdal_utils.config.manager import AmsdalConfigManager
 
@@ -277,6 +279,12 @@ def _restore_state_db(cli_config: 'CliConfig', config_path: Path | None) -> None
 
     class_object_ref, class_object_meta_ref = _get_class_object_reference(lakehouse_connection)
     model_pks, model_fks, model_m2ms = _fetch_model_pks_and_fks(lakehouse_connection, class_object_ref)
+
+    expected_m2m_tables: set[str] = set()
+    for model_name, m2m_list in model_m2ms.items():
+        for _, m2m_value in m2m_list.items():
+            expected_m2m_tables.add(f'{model_name}{m2m_value[1]}')
+
     user_schemas = _get_user_schemas(
         lakehouse_connection,
         class_object_ref,
@@ -287,7 +295,8 @@ def _restore_state_db(cli_config: 'CliConfig', config_path: Path | None) -> None
     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 = []
+    m2m_schemas = [schema for schema in user_schemas if schema[0].name in expected_m2m_tables]
+
     while user_scheams_with_tries:
         table_ref, schema, current_iteration = user_scheams_with_tries.pop(0)
         rprint(rich_info(f'Restoring {table_ref.name}'))
@@ -316,7 +325,7 @@ 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(
+            data, _ = _build_data(
                 item,
                 model_name=table_ref.metadata[META_CLASS_NAME],  # type: ignore[index]
                 model_pks=model_pks,
@@ -325,7 +334,6 @@ def _restore_state_db(cli_config: 'CliConfig', config_path: Path | None) -> None
                 refs_by_name=refs_by_name,
             )
 
-            m2m_all_data.extend(m2m_data)
             state_connection.run_mutations(
                 mutations=[
                     glue.InsertData(
@@ -339,12 +347,79 @@ def _restore_state_db(cli_config: 'CliConfig', config_path: Path | None) -> None
                 ],
             )
             rprint('.', end='')
+
     rprint('Inserting m2m data...')
+    m2m_all_data = []
+    for schema_ref, schema in m2m_schemas:
+        _datas = []
+        _objects = lakehouse_connection.query(glue.QueryStatement(table=schema_ref))
+        field1, field2 = schema.required
+        prop1 = schema.properties[field1]  # type: ignore[index]
+        prop2 = schema.properties[field2]  # type: ignore[index]
+
+        rprint(rich_info(f'Found {len(_objects)} m2m objects for {schema_ref.name}...'))
+        for _item in _objects:
+            obj_id_1 = _item.data[field1]['ref']['object_id']
+            obj_id_2 = _item.data[field2]['ref']['object_id']
+            _datas.append(
+                glue.Data(
+                    data={
+                        f'{field1}_partition_key': obj_id_1,
+                        f'{field2}_partition_key': obj_id_2,
+                    },
+                    metadata={
+                        META_PRIMARY_KEY_FIELDS: {
+                            f'{field1}_partition_key': str,
+                            f'{field2}_partition_key': str,
+                        },
+                        META_FOREIGN_KEYS: {
+                            f'{field1}_partition_key': {
+                                'ref': {
+                                    'resource': 'statedb',
+                                    'class_name': prop1.type,
+                                    'object_id': obj_id_1,
+                                    'class_version': 'LATEST',
+                                    'object_version': 'LATEST',
+                                },
+                            },
+                            f'{field2}_partition_key': {
+                                'ref': {
+                                    'resource': 'statedb',
+                                    'class_name': prop2.type,
+                                    'object_id': obj_id_2,
+                                    'class_version': 'LATEST',
+                                    'object_version': 'LATEST',
+                                },
+                            },
+                        },
+                    },
+                )
+            )
+
+        if _datas:
+            m2m_all_data.append(
+                glue.InsertData(
+                    schema=glue.SchemaReference(
+                        name=schema_ref.name,
+                        version=glue.Version.LATEST,
+                        metadata=schema_ref.metadata,
+                    ),
+                    data=_datas,
+                )
+            )
     for _m2m_data in m2m_all_data:
-        try:
-            state_connection.run_mutations(mutations=[_m2m_data])
-        except Exception:
-            rprint('Error inserting m2m data')
+        for data in _m2m_data.data:
+            try:
+                state_connection.run_mutations(
+                    mutations=[
+                        glue.InsertData(
+                            schema=_m2m_data.schema,
+                            data=[data],
+                        ),
+                    ]
+                )
+            except Exception:
+                rprint('Error inserting m2m data')
 
     rprint(rich_success('Done! All classes are restored.'))
 

{amsdal_cli-0.4.15 → amsdal_cli-0.5.0}/src/amsdal_cli/commands/serve/utils.py

@@ -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(
@@ -226,6 +226,7 @@ def _check_has_unapplied_migrations(
     core_loader = MigrationsLoader(
         migrations_dir=CORE_MIGRATIONS_PATH,
         module_type=ModuleType.CORE,
+        module_name='amsdal.__migrations__',
     )
 
     schemas = DefaultMigrationSchemas()
@@ -251,6 +252,7 @@ def _check_has_unapplied_migrations(
         MigrationsLoader(
             migrations_dir=build_dir / MIGRATIONS_DIR_NAME,
             module_type=ModuleType.USER,
+            module_name=settings.MIGRATIONS_DIRECTORY_NAME,
         ),
         all_applied_migrations,
         schemas,
@@ -263,7 +265,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 +280,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,
@@ -451,6 +454,7 @@ async def _async_check_has_unapplied_migrations(
     core_loader = MigrationsLoader(
         migrations_dir=CORE_MIGRATIONS_PATH,
         module_type=ModuleType.CORE,
+        module_name='amsdal.__migrations__',
     )
     schemas = DefaultMigrationSchemas()
 
@@ -475,6 +479,7 @@ async def _async_check_has_unapplied_migrations(
         MigrationsLoader(
             migrations_dir=build_dir / MIGRATIONS_DIR_NAME,
             module_type=ModuleType.USER,
+            module_name=settings.MIGRATIONS_DIRECTORY_NAME,
         ),
         all_applied_migrations,
         schemas,
@@ -488,7 +493,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 +509,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.15/latest-changelogs.md

@@ -1,9 +0,0 @@
-## [v0.4.15](https://pypi.org/project/amsdal_cli/0.4.15/) - 2025-05-01
-
-### Fixed
-
-- Fixed import in generated tests
-
-### Added
-
-- Added support for date and datetime types in tests