amsdal_cli 0.4.9__tar.gz → 0.4.10__tar.gz

{amsdal_cli-0.4.9 → amsdal_cli-0.4.10}/PKG-INFO

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

{amsdal_cli-0.4.9 → amsdal_cli-0.4.10}/change-logs.md

@@ -1,3 +1,9 @@
+## [v0.4.10](https://pypi.org/project/amsdal_cli/0.4.10/) - 2025-04-03
+
+### Fixed
+
+- Fix for migrations detection
+
 ## [v0.4.9](https://pypi.org/project/amsdal_cli/0.4.9/) - 2025-04-01
 
 ### Fixed

amsdal_cli-0.4.10/latest-changelogs.md

@@ -0,0 +1,5 @@
+## [v0.4.10](https://pypi.org/project/amsdal_cli/0.4.10/) - 2025-04-03
+
+### Fixed
+
+- Fix for migrations detection

{amsdal_cli-0.4.9 → amsdal_cli-0.4.10}/src/amsdal_cli/__about__.py

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

{amsdal_cli-0.4.9 → amsdal_cli-0.4.10}/src/amsdal_cli/commands/build/services/builder.py

@@ -83,8 +83,8 @@ class AppBuilder(BuildMixin):
             USER_MODELS_MODULE_PATH=output / 'models',
         )
 
-        settings.USER_MODELS_MODULE_PATH.mkdir(parents=True, exist_ok=True)
-        (settings.USER_MODELS_MODULE_PATH / '__init__.py').touch(exist_ok=True)
+        settings.user_models_path.mkdir(parents=True, exist_ok=True)
+        (settings.user_models_path / '__init__.py').touch(exist_ok=True)
 
         config_manager = AmsdalConfigManager()
         config_manager.load_config(self.config_path)

{amsdal_cli-0.4.9 → amsdal_cli-0.4.10}/src/amsdal_cli/commands/build/services/mixin.py

@@ -18,7 +18,7 @@ class BuildMixin:
         Builds models from the specified user schemas path and predefined schema directories.
 
         Args:
-            user_schemas_path (Path): The path to the user schemas directory.
+            cli_config (CliConfig): CLI config object.
 
         Returns:
             None
@@ -31,7 +31,6 @@ class BuildMixin:
         from amsdal_cli.utils.schema_repository import build_schema_repository
 
         schema_repository = build_schema_repository(cli_config)
-
         class_builder = ClassBuilder()
 
         for user_schema in schema_repository.user_schemas:

{amsdal_cli-0.4.9 → amsdal_cli-0.4.10}/src/amsdal_cli/commands/cloud/deploy/sub_commands/deploy_new.py

@@ -93,138 +93,140 @@ async def _deploy(
         )
         app_builder.build(output_path)
 
-    manager: AsyncAmsdalManager | AmsdalManager | None = None
-    try:
-        if AmsdalConfigManager().get_config().async_mode:
-            manager = AsyncAmsdalManager()
-            await _async_check_missing_generated_migrations(cli_config, manager, app_source_path)
-        else:
-            manager = AmsdalManager()
-            _check_missing_generated_migrations(cli_config, manager, app_source_path)
-
-        manager.authenticate()
-
-        if not skip_checks:
-            try:
-                list_response_deps = manager.cloud_actions_manager.list_dependencies(
-                    env_name=env_name,
-                    application_uuid=cli_config.application_uuid,
-                    application_name=cli_config.application_name,
-                )
-            except AmsdalCloudError as e:
-                rprint(rich_error(f'Failed to loading dependencies: {e}'))
-                raise typer.Exit(1) from e
+        manager: AsyncAmsdalManager | AmsdalManager | None = None
+        try:
+            if AmsdalConfigManager().get_config().async_mode:
+                manager = AsyncAmsdalManager()
+                await _async_check_missing_generated_migrations(cli_config, manager, app_source_path)
+            else:
+                manager = AmsdalManager()
+                _check_missing_generated_migrations(cli_config, manager, app_source_path)
 
-            config_dir: Path = cli_config.app_directory / '.amsdal'
-            config_dir.mkdir(exist_ok=True, parents=True)
-            _deps_path: Path = config_dir / '.dependencies'
-            _deps_path.touch(exist_ok=True)
-            _deps = set(_deps_path.read_text().split('\n'))
-            _diff_deps = sorted(filter(None, _deps - set(list_response_deps.dependencies)))
-
-            if _diff_deps:
-                rprint(
-                    rich_warning(
-                        f'The following dependencies are missing: {", ".join(map(rich_highlight, _diff_deps))}'
-                    )
-                )
+            manager.authenticate()
 
-                if no_input:
-                    rprint(rich_info('Installing missing dependencies...'))
-                    install_deps = True
-                else:
-                    install_deps = CustomConfirm.ask(
-                        rich_info('Do you want to install the missing dependencies?'),
-                        default=False,
-                        show_default=False,
-                        choices=['y', 'N'],
+            if not skip_checks:
+                try:
+                    list_response_deps = manager.cloud_actions_manager.list_dependencies(
+                        env_name=env_name,
+                        application_uuid=cli_config.application_uuid,
+                        application_name=cli_config.application_name,
+                    )
+                except AmsdalCloudError as e:
+                    rprint(rich_error(f'Failed to loading dependencies: {e}'))
+                    raise typer.Exit(1) from e
+
+                config_dir: Path = cli_config.app_directory / '.amsdal'
+                config_dir.mkdir(exist_ok=True, parents=True)
+                _deps_path: Path = config_dir / '.dependencies'
+                _deps_path.touch(exist_ok=True)
+                _deps = set(_deps_path.read_text().split('\n'))
+                _diff_deps = sorted(filter(None, _deps - set(list_response_deps.dependencies)))
+
+                if _diff_deps:
+                    rprint(
+                        rich_warning(
+                            f'The following dependencies are missing: {", ".join(map(rich_highlight, _diff_deps))}'
+                        )
                     )
 
-                if not install_deps:
-                    rprint(rich_info('Use "amsdal cloud dependencies new NAME" to install the missing dependencies.'))
-                    raise typer.Exit(1)
+                    if no_input:
+                        rprint(rich_info('Installing missing dependencies...'))
+                        install_deps = True
+                    else:
+                        install_deps = CustomConfirm.ask(
+                            rich_info('Do you want to install the missing dependencies?'),
+                            default=False,
+                            show_default=False,
+                            choices=['y', 'N'],
+                        )
 
-                for dependency_name in _diff_deps:
-                    try:
-                        manager.cloud_actions_manager.add_dependency(
-                            dependency_name=dependency_name,
-                            env_name=env_name,
-                            application_uuid=cli_config.application_uuid,
-                            application_name=cli_config.application_name,
+                    if not install_deps:
+                        rprint(
+                            rich_info('Use "amsdal cloud dependencies new NAME" to install the missing dependencies.')
                         )
-                    except AmsdalCloudError as e:
-                        rprint(rich_error(str(e)))
-                        raise typer.Exit(1) from e
+                        raise typer.Exit(1)
+
+                    for dependency_name in _diff_deps:
+                        try:
+                            manager.cloud_actions_manager.add_dependency(
+                                dependency_name=dependency_name,
+                                env_name=env_name,
+                                application_uuid=cli_config.application_uuid,
+                                application_name=cli_config.application_name,
+                            )
+                        except AmsdalCloudError as e:
+                            rprint(rich_error(str(e)))
+                            raise typer.Exit(1) from e
+
+                try:
+                    list_response_secrets = manager.cloud_actions_manager.list_secrets(
+                        with_values=False,
+                        env_name=env_name,
+                        application_uuid=cli_config.application_uuid,
+                        application_name=cli_config.application_name,
+                    )
+                except AmsdalCloudError as e:
+                    rprint(rich_error(f'Failed to loading secrets: {e}'))
+                    raise typer.Exit(1) from e
+
+                _secrets_path: Path = config_dir / '.secrets'
+                _secrets_path.touch(exist_ok=True)
+                _secrets = set(_secrets_path.read_text().split('\n'))
+                _diff_secrets = sorted(filter(None, _secrets - set(list_response_secrets.secrets)))
+
+                if _diff_secrets:
+                    rprint(rich_error(f'The following secrets are missing: {", ".join(_diff_secrets)}'))
+                    raise typer.Exit(1)
 
             try:
-                list_response_secrets = manager.cloud_actions_manager.list_secrets(
-                    with_values=False,
+                manager.cloud_actions_manager.create_deploy(
+                    deploy_type=deploy_type.value,
+                    lakehouse_type=lakehouse_type.value,
                     env_name=env_name,
+                    from_env=from_env,
                     application_uuid=cli_config.application_uuid,
                     application_name=cli_config.application_name,
+                    no_input=no_input,
                 )
             except AmsdalCloudError as e:
-                rprint(rich_error(f'Failed to loading secrets: {e}'))
-                raise typer.Exit(1) from e
-
-            _secrets_path: Path = config_dir / '.secrets'
-            _secrets_path.touch(exist_ok=True)
-            _secrets = set(_secrets_path.read_text().split('\n'))
-            _diff_secrets = sorted(filter(None, _secrets - set(list_response_secrets.secrets)))
-
-            if _diff_secrets:
-                rprint(rich_error(f'The following secrets are missing: {", ".join(_diff_secrets)}'))
-                raise typer.Exit(1)
-
-        try:
-            manager.cloud_actions_manager.create_deploy(
-                deploy_type=deploy_type.value,
-                lakehouse_type=lakehouse_type.value,
-                env_name=env_name,
-                from_env=from_env,
-                application_uuid=cli_config.application_uuid,
-                application_name=cli_config.application_name,
-                no_input=no_input,
-            )
-        except AmsdalCloudError as e:
-            if str(e) in ['Same environment name', 'same_environment_name']:
-                rprint(
-                    rich_error(
-                        f'Trying to deploy {rich_highlight(env_name)} environment from '
-                        f'{rich_highlight(str(from_env))}. Please check the environment names.'
+                if str(e) in ['Same environment name', 'same_environment_name']:
+                    rprint(
+                        rich_error(
+                            f'Trying to deploy {rich_highlight(env_name)} environment from '
+                            f'{rich_highlight(str(from_env))}. Please check the environment names.'
+                        )
                     )
-                )
-            elif str(e) in ['Environment not found', 'environment_not_found']:
-                rprint(
-                    rich_error(
-                        f'Environment {rich_highlight(from_env if from_env else env_name)} not found. '
-                        'Please check the environment name.'
+                elif str(e) in ['Environment not found', 'environment_not_found']:
+                    rprint(
+                        rich_error(
+                            f'Environment {rich_highlight(from_env if from_env else env_name)} not found. '
+                            'Please check the environment name.'
+                        )
                     )
-                )
 
-            elif str(e) in ['Environment not deployed', 'environment_not_deployed']:
-                rprint(
-                    rich_error(
-                        f'Environment {rich_highlight(str(from_env))} is not deployed. '
-                        'Please check the environment name.'
+                elif str(e) in ['Environment not deployed', 'environment_not_deployed']:
+                    rprint(
+                        rich_error(
+                            f'Environment {rich_highlight(str(from_env))} is not deployed. '
+                            'Please check the environment name.'
+                        )
                     )
-                )
 
-            else:
-                rprint(rich_error(str(e)))
+                else:
+                    rprint(rich_error(str(e)))
 
-            raise typer.Exit(1) from e
-    finally:
-        if manager:
-            if AmsdalConfigManager().get_config().async_mode:
-                if manager.is_setup:
-                    await manager.teardown()  # type: ignore[misc]
+                raise typer.Exit(1) from e
+        finally:
+            if manager:
+                if AmsdalConfigManager().get_config().async_mode:
+                    if manager.is_setup:
+                        await manager.teardown()  # type: ignore[misc]
+                    else:
+                        AsyncAmsdalManager.invalidate()
+                elif manager.is_setup:
+                    manager.teardown()
                 else:
-                    AsyncAmsdalManager.invalidate()
-            elif manager.is_setup:
-                manager.teardown()
-            else:
-                AmsdalManager.invalidate()
+                    AmsdalManager.invalidate()
 
 
 def _check_missing_generated_migrations(
@@ -247,6 +249,7 @@ def _check_missing_generated_migrations(
     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
     from amsdal_cli.utils.schema_repository import build_schema_repository
     from amsdal_cli.utils.text import rich_error
 
@@ -260,6 +263,7 @@ def _check_missing_generated_migrations(
 
     amsdal_manager.post_setup()
     migrations_dir = app_source_path / MIGRATIONS_DIR_NAME
+    cli_config.models_format = ModelsFormat.PY
     schema_repository = build_schema_repository(cli_config=cli_config)
     generator = FileMigrationGenerator(
         core_migrations_path=CORE_MIGRATIONS_PATH,
@@ -294,6 +298,7 @@ async def _async_check_missing_generated_migrations(
     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
     from amsdal_cli.utils.schema_repository import build_schema_repository
     from amsdal_cli.utils.text import rich_error
 
@@ -309,6 +314,7 @@ async def _async_check_missing_generated_migrations(
 
     migrations_dir = app_source_path / MIGRATIONS_DIR_NAME
 
+    cli_config.models_format = ModelsFormat.PY
     schema_repository = build_schema_repository(cli_config=cli_config)
     generator = AsyncFileMigrationGenerator(
         core_migrations_path=CORE_MIGRATIONS_PATH,

{amsdal_cli-0.4.9 → amsdal_cli-0.4.10}/src/amsdal_cli/commands/new/templates/.gitignore

@@ -3,6 +3,8 @@ __pycache__
 .mypy_cache
 .tmp
 .env
+/.idea
+/.vscode
 /.cache-thumbnails
 /warehouse
 /static
@@ -11,3 +13,4 @@ __pycache__
 /fixtures
 /venv
 /migrations
+/transactions

amsdal_cli-0.4.10/src/amsdal_cli/commands/new/templates/requirements.txt

@@ -0,0 +1,2 @@
+amsdal[cli]=={{ ctx.amsdal_version }}
+{% if ctx.is_async_mode %}amsdal-glue-connections[async-sqlite]{% endif %}

{amsdal_cli-0.4.9 → amsdal_cli-0.4.10}/src/amsdal_cli/commands/serve/utils.py

@@ -178,13 +178,16 @@ def _check_migrations_generated_and_applied(
 
     from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.commands.migrations.constants import MIGRATIONS_DIR_NAME
+    from amsdal_cli.utils.cli_config import ModelsFormat
     from amsdal_cli.utils.schema_repository import build_schema_repository
     from amsdal_cli.utils.text import rich_warning
 
     app_source_path = app_path / SOURCES_DIR
     migrations_dir = app_source_path / MIGRATIONS_DIR_NAME
 
+    cli_config.models_format = ModelsFormat.PY
     schema_repository = build_schema_repository(cli_config=cli_config)
+
     generator = FileMigrationGenerator(
         core_migrations_path=CORE_MIGRATIONS_PATH,
         app_migrations_path=migrations_dir,
@@ -196,7 +199,7 @@ def _check_migrations_generated_and_applied(
     if operations:
         rprint(
             rich_warning(
-                'WARNING: you have changes in our models. Use "amsdal migrations new" to generate migrations.',
+                'WARNING: you have changes in your models. Use "amsdal migrations new" to generate migrations.',
             )
         )
 
@@ -254,7 +257,7 @@ def _check_has_unapplied_migrations(
 
 
 def _check_has_unapplied_migrations_per_loader(
-    core_loader: 'MigrationsLoader',
+    migration_loader: 'MigrationsLoader',
     all_applied_migrations: list['MigrationFile'],
     schemas: 'DefaultMigrationSchemas',
 ) -> bool:
@@ -264,14 +267,13 @@ def _check_has_unapplied_migrations_per_loader(
 
     from amsdal_cli.utils.text import rich_warning
 
-    for _migration in core_loader:
+    for _migration in migration_loader:
         if not _is_migration_applied(_migration, all_applied_migrations):
             rprint(
                 rich_warning(
                     'WARNING: you have not applied all core migrations. Use "amsdal migrations apply" to apply them.',
                 )
             )
-
             return True
         else:
             # Register classes from migrations
@@ -287,7 +289,6 @@ def _check_has_unapplied_migrations_per_loader(
                     continue
 
                 _operation.forward(state_executor)
-
     return False
 
 
@@ -302,7 +303,6 @@ def _is_migration_applied(
             and migration.module == applied_migration.module
         ):
             return True
-
     return False
 
 
@@ -490,12 +490,14 @@ async def _async_check_migrations_generated_and_applied(
 
     from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.commands.migrations.constants import MIGRATIONS_DIR_NAME
+    from amsdal_cli.utils.cli_config import ModelsFormat
     from amsdal_cli.utils.schema_repository import build_schema_repository
     from amsdal_cli.utils.text import rich_warning
 
     app_source_path = app_path / SOURCES_DIR
     migrations_dir = app_source_path / MIGRATIONS_DIR_NAME
 
+    cli_config.models_format = ModelsFormat.PY
     schema_repository = build_schema_repository(cli_config=cli_config)
 
     generator = AsyncFileMigrationGenerator(

amsdal_cli-0.4.9/latest-changelogs.md

@@ -1,5 +0,0 @@
-## [v0.4.9](https://pypi.org/project/amsdal_cli/0.4.9/) - 2025-04-01
-
-### Fixed
-
-- Fix for M2M migration generation for JSON format.

amsdal_cli-0.4.9/src/amsdal_cli/commands/new/templates/requirements.txt

@@ -1 +0,0 @@
-amsdal[cli]=={{ ctx.amsdal_version }}