amsdal_cli 0.4.16__tar.gz → 0.5.1__tar.gz

{amsdal_cli-0.4.16 → amsdal_cli-0.5.1}/PKG-INFO

@@ -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 → amsdal_cli-0.5.1}/change-logs.md

@@ -1,3 +1,15 @@
+## [v0.5.1](https://pypi.org/project/amsdal_cli/0.5.1/) - 2025-06-20
+
+### Changed
+
+- Adjusted migrations for new functionality
+
+## [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

amsdal_cli-0.5.1/latest-changelogs.md

@@ -0,0 +1,5 @@
+## [v0.5.1](https://pypi.org/project/amsdal_cli/0.5.1/) - 2025-06-20
+
+### Changed
+
+- Adjusted migrations for new functionality

{amsdal_cli-0.4.16 → amsdal_cli-0.5.1}/pyproject.toml

@@ -39,10 +39,13 @@ dependencies = [
     "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/"
@@ -100,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"
@@ -223,7 +229,10 @@ ignore = [
     "S105", "S106", "S107",
     # Ignore complexity
     "C901", "PLR0911", "PLR0912", "PLR0913", "PLR0915",
-    "A005"
+    "A005",
+    "PLC0415",
+    "RUF100",
+    "UP045",
 ]
 unfixable = [
     # Don't touch unused imports

{amsdal_cli-0.4.16 → amsdal_cli-0.5.1}/src/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-0.4.16 → amsdal_cli-0.5.1}/src/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-0.4.16 → amsdal_cli-0.5.1}/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
@@ -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-0.4.16 → amsdal_cli-0.5.1}/src/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-0.4.16 → amsdal_cli-0.5.1}/src/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-0.4.16 → amsdal_cli-0.5.1}/src/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-0.4.16 → amsdal_cli-0.5.1}/src/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-0.4.16 → amsdal_cli-0.5.1}/src/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-0.4.16 → amsdal_cli-0.5.1}/src/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-0.4.16 → amsdal_cli-0.5.1}/src/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()