amsdal_cli 0.4.16__tar.gz → 0.5.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_cli
-Version: 0.4.16
+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,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.0}/change-logs.md

@@ -1,3 +1,9 @@
+## [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.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.16 → amsdal_cli-0.5.0}/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"

{amsdal_cli-0.4.16 → 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.16'
+__version__ = '0.5.0'

{amsdal_cli-0.4.16 → 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.16 → 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()
 

{amsdal_cli-0.4.16 → 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.16 → 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:

{amsdal_cli-0.4.16 → 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.16 → 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.16/latest-changelogs.md

@@ -1,5 +0,0 @@
-## [v0.4.16](https://pypi.org/project/amsdal_cli/0.4.16/) - 2025-05-12
-
-### Fixed
-
-- Pin `click` version