amsdal_cli 0.5.10__tar.gz → 0.6.1__tar.gz

{amsdal_cli-0.5.10 → amsdal_cli-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_cli
-Version: 0.5.10
+Version: 0.6.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/
@@ -122,7 +122,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: <3.14,>=3.11
-Requires-Dist: amsdal-server==0.5.*
+Requires-Dist: amsdal-server==0.6.*
 Requires-Dist: click<8.2.0
 Requires-Dist: faker==27.*
 Requires-Dist: gitpython~=3.1

{amsdal_cli-0.5.10 → amsdal_cli-0.6.1}/change-logs.md

@@ -1,3 +1,15 @@
+## [v0.6.1](https://pypi.org/project/amsdal_cli/0.6.1/) - 2025-02-05
+
+### Added
+
+- Add support for events
+
+## [v0.6.0](https://pypi.org/project/amsdal_cli/0.6.0/) - 2025-02-05
+
+### Changed
+
+- Add support for amsdal v0.6
+
 ## [v0.5.10](https://pypi.org/project/amsdal_cli/0.5.10/) - 2025-12-27
 
 ### Added
@@ -181,50 +193,47 @@
 
 - Update `amsdal` version
 
-
 ## [v0.3.6](https://pypi.org/project/amsdal_cli/0.3.6/) - 2024-12-16
 
-
 ### Fixed
 
 - Fixed sync-db auth error (sync-db-auth-error)
 
 ## [v0.3.5](https://pypi.org/project/amsdal_cli/0.3.5/) - 2024-12-14
 
-
 ### Changed
 
 - Async build in migrations apply (async-build-in-migrations)
-## [v0.3.4](https://pypi.org/project/amsdal_cli/0.3.4/) - 2024-12-10
 
+## [v0.3.4](https://pypi.org/project/amsdal_cli/0.3.4/) - 2024-12-10
 
 ### Added
 
 - Run async workers (run-async-workers)
-## [v0.3.3](https://pypi.org/project/amsdal_cli/0.3.3/) - 2024-12-10
 
+## [v0.3.3](https://pypi.org/project/amsdal_cli/0.3.3/) - 2024-12-10
 
 ### Fixed
 
 - Init internal models (init-models)
-## [v0.3.2](https://pypi.org/project/amsdal_cli/0.3.2/) - 2024-12-10
 
+## [v0.3.2](https://pypi.org/project/amsdal_cli/0.3.2/) - 2024-12-10
 
 ### Added
 
 - Async support (async-support)
-## [v0.3.1](https://pypi.org/project/amsdal_cli/0.3.1/) - 2024-12-02
 
+## [v0.3.1](https://pypi.org/project/amsdal_cli/0.3.1/) - 2024-12-02
 
 ### Fixed
 
 - Fix fo restore command (restore-command)
-## [v0.3.0](https://pypi.org/project/amsdal_cli/0.3.0/) - 2024-11-28
 
+## [v0.3.0](https://pypi.org/project/amsdal_cli/0.3.0/) - 2024-11-28
 
 No significant changes.
-## [v0.2.5](https://pypi.org/project/amsdal_cli/0.2.5/) - 2024-11-04
 
+## [v0.2.5](https://pypi.org/project/amsdal_cli/0.2.5/) - 2024-11-04
 
 ### Added
 
@@ -233,54 +242,55 @@ No significant changes.
 ### Fixed
 
 - Show correct env on deployment deletion (correct-env-on-deletion)
-## [v0.2.4](https://pypi.org/project/amsdal_cli/0.2.4/) - 2024-10-28
 
+## [v0.2.4](https://pypi.org/project/amsdal_cli/0.2.4/) - 2024-10-28
 
 ### Added
 
 - Added missing generated migrations check on deploy (missing-migrations-check)
-## [v0.2.3](https://pypi.org/project/amsdal_cli/0.2.3/) - 2024-10-22
 
+## [v0.2.3](https://pypi.org/project/amsdal_cli/0.2.3/) - 2024-10-22
 
 ### Fixed
 
 - Fix for worker models init (worker-init)
-## [v0.2.2](https://pypi.org/project/amsdal_cli/0.2.2/) - 2024-10-18
 
+## [v0.2.2](https://pypi.org/project/amsdal_cli/0.2.2/) - 2024-10-18
 
 ### Added
 
 - Pagination added to restore command (restore-pagination)
-## [v0.2.1](https://pypi.org/project/amsdal_cli/0.2.1/) - 2024-10-18
 
+## [v0.2.1](https://pypi.org/project/amsdal_cli/0.2.1/) - 2024-10-18
 
 ### Changed
 
 - Update for sync DB command (sync-db-update)
-## [v0.2.0](https://pypi.org/project/amsdal_cli/0.2.0/) - 2024-10-17
 
+## [v0.2.0](https://pypi.org/project/amsdal_cli/0.2.0/) - 2024-10-17
 
 ### Added
 
 - AMSDAL Glue integration (glue-integration)
-## [v0.1.21](https://pypi.org/project/amsdal_cli/0.1.21/) - 2024-09-18
 
+## [v0.1.21](https://pypi.org/project/amsdal_cli/0.1.21/) - 2024-09-18
 
 ### Added
 
 - Added google style docstring (docstring)
-## [v0.1.20](https://pypi.org/project/amsdal_cli/0.1.20/) - 2024-09-05
 
+## [v0.1.20](https://pypi.org/project/amsdal_cli/0.1.20/) - 2024-09-05
 
 ### Added
 
 - Commands to run worker (worker-commands)
-## [v0.1.19](https://pypi.org/project/amsdal_cli/0.1.19/) - 2024-08-26
 
+## [v0.1.19](https://pypi.org/project/amsdal_cli/0.1.19/) - 2024-08-26
 
 ### Added
 
 - Generate and run tests (tests)
+
 ## [v0.1.18](https://pypi.org/project/amsdal_cli/0.1.18/) - 2024-06-07
 
 **Added**
@@ -296,57 +306,48 @@ No significant changes.
 
 - Command suggestions for migrations creation (command-suggestions-for-migrations-creation)
 
-
-
 ## [v0.1.17](https://pypi.org/project/amsdal_cli/0.1.17/) - 2024-05-24
 
 **Added**
 
 - Default .amsdal directory on new project creation (default-amsdal-directory-on-new-project-creation)
 
-
 ## [v0.1.16](https://pypi.org/project/amsdal_cli/0.1.16/) - 2024-05-22
 
 **Added**
 
 - GIT integration for environment commands (git-integration-for-environment-commands)
 
-
 ## [v0.1.15](https://pypi.org/project/amsdal_cli/0.1.15/) - 2024-05-17
 
 **Changed**
 
 - Better interaction with environments (better-interaction-with-environments)
 
-
 ## [v0.1.14](https://pypi.org/project/amsdal_cli/0.1.14/) - 2024-05-15
 
 **Added**
 
 - Support for environments (support-for-environments)
 
-
 ## [v0.1.13](https://pypi.org/project/amsdal_cli/0.1.13/) - 2024-05-09
 
 **Fixed**
 
 - Unique fields generation (unique-fields-generation)
 
-
 ## [v0.1.12](https://pypi.org/project/amsdal_cli/0.1.12/) - 2024-05-03
 
 **Added**
 
 - `clean` command (clean-command)
 
-
 ## [v0.1.11](https://pypi.org/project/amsdal_cli/0.1.11/) - 2024-04-25
 
 **Added**
 
 - Command for CI/CD manifest generation (command-for-ci-cd-manifest-generation)
 
-
 ## [v0.1.10](https://pypi.org/project/amsdal_cli/0.1.10/) - 2024-04-25
 
 **Added**
@@ -354,35 +355,30 @@ No significant changes.
 - Silent deploy (silent-deploy)
 - Check missing secrets and dependencies (check-missing-secrets-and-dependencies)
 
-
 ## [v0.1.9](https://pypi.org/project/amsdal_cli/0.1.9/) - 2024-04-12
 
 **Changed**
 
 - Added back migrations command and marked as deprecated (added-back-migrations-command-and-marked-as-deprecated)
 
-
 ## [v0.1.8](https://pypi.org/project/amsdal_cli/0.1.8/) - 2024-04-12
 
 **Changed**
 
 - Migration commands improvements (migration-commands-improvements)
 
-
 ## [v0.1.7](https://pypi.org/project/amsdal_cli/0.1.7/) - 2024-04-02
 
 **Fixed**
 
 - Fix: removed init all class versions (fix-removed-init-all-class-versions)
 
-
 ## [v0.1.6](https://pypi.org/project/amsdal_cli/0.1.6/) - 2024-04-01
 
 **Fixed**
 
 - Fixed migrate apply command: init all class versions (fixed-migrate-apply-command-init-all-class-versions)
 
-
 ## [v0.1.5](https://pypi.org/project/amsdal_cli/0.1.5/) - 2024-03-29
 
 **Fixed**
@@ -391,7 +387,6 @@ No significant changes.
 
 ## [v0.1.4](https://pypi.org/project/amsdal_cli/0.1.4/) - 2024-03-28
 
-
 **Changed**
 
 - Renamed migrations to migrate command. Improved showing info about applied migrations (renamed-migrations-to-migrate-command)
@@ -401,31 +396,26 @@ No significant changes.
 
 - Commands to mange Basic Auth and Allowlist (commands-to-mange-basic-auth-and-allowlist)
 
-
-
 ## [v0.1.3](https://pypi.org/project/amsdal_cli/0.1.3/) - 2024-03-25
 
 **Changed**
 
 - Remove migrations initialize command (remove-migrations-initialize-command)
 
-
 ## [v0.1.2](https://pypi.org/project/amsdal_cli/0.1.2/) - 2024-03-22
 
 **Fixed**
 
 - Fixtures processing (fixtures-processing)
 
-
 ## [v0.1.1](https://pypi.org/project/amsdal_cli/0.1.1/) - 2024-03-21
 
 **Fixed**
 
 - Build transactions first (build-transactions-first)
 
-
 ## [v0.1.0](https://pypi.org/project/amsdal_cli/0.1.0/) - 2024-03-21
 
-**Changed** 
+**Changed**
 
 - Upgraded `amsdal_utils`, `amsdal_data`, `amsdal_model`, `amsdal` and `amsdal_cli` dependencies to `0.1.*` (upgraded-amsdal-utils-amsdal-data-amsdal-model-amsdal-and-amsdal-cli-dependencies)

amsdal_cli-0.6.1/latest-changelogs.md

@@ -0,0 +1,5 @@
+## [v0.6.1](https://pypi.org/project/amsdal_cli/0.6.1/) - 2025-02-05
+
+### Added
+
+- Add support for events

{amsdal_cli-0.5.10 → amsdal_cli-0.6.1}/pyproject.toml

@@ -40,15 +40,15 @@ dependencies = [
     "jinja2~=3.1",
     "watchfiles~=0.21",
     "GitPython~=3.1",
-    "amsdal-server==0.5.*",
+    "amsdal_server==0.6.*",
     "faker==27.*",
     "httpx==0.28.*",
 ]
 
 [dependency-groups]
 dev = [
-    "amsdal[async-sqlite]",
-    "amsdal[postgres-binary]",
+    "amsdal[async-sqlite]>=0.6.0",
+    "amsdal[postgres-binary]>=0.6.0",
     "coverage[toml]>=7.4",
     "pytest-cov>=6.0.0",
     "pytest==8.4.1",

{amsdal_cli-0.5.10 → amsdal_cli-0.6.1}/src/amsdal_cli/__about__.py

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

{amsdal_cli-0.5.10 → amsdal_cli-0.6.1}/src/amsdal_cli/commands/build/services/builder.py

@@ -79,6 +79,12 @@ class AppBuilder(BuildMixin):
         if not is_silent:
             rprint(rich_success('OK!'))
 
+        if not is_silent:
+            rprint(rich_info('Building app config...'), end=' ')
+        self.build_app_config(self.source_path)
+        if not is_silent:
+            rprint(rich_success('OK!'))
+
     def pre_build(self, output: Path) -> None:
         from amsdal.configs.main import settings
         from amsdal_utils.config.manager import AmsdalConfigManager

{amsdal_cli-0.5.10 → amsdal_cli-0.6.1}/src/amsdal_cli/commands/build/services/mixin.py

@@ -194,6 +194,33 @@ class BuildMixin:
         if expected_fixtures_path.exists() and expected_fixtures_path.is_dir():
             shutil.copytree(expected_fixtures_path, target_fixtures_path, dirs_exist_ok=True)
 
+    @staticmethod
+    def build_app_config(cli_app_path: Path, output_path: Path | None = None) -> None:
+        """
+        Copies app.py from src/ to the build directory.
+
+        Args:
+            cli_app_path (Path): The path to the CLI application source directory (src/).
+            output_path (Path | None): The output directory. If None, uses settings.APP_PATH.
+        """
+        app_config_source = cli_app_path / 'app.py'
+
+        if not app_config_source.exists():
+            return
+
+        if output_path is None:
+            from amsdal.configs.main import settings
+
+            output_path = settings.APP_PATH
+
+        app_config_dest = output_path / 'app.py'
+
+        # Remove existing file to ensure fresh copy
+        if app_config_dest.exists():
+            app_config_dest.unlink()
+
+        shutil.copy(app_config_source, app_config_dest)
+
     @staticmethod
     def _reimport_models() -> None:
         from amsdal_models.classes.class_manager import ClassManager

{amsdal_cli-0.5.10 → amsdal_cli-0.6.1}/src/amsdal_cli/commands/ci_cd/constants.py

@@ -1,7 +1,7 @@
-from enum import Enum
+from enum import StrEnum
 
 
-class Vcs(str, Enum):
+class Vcs(StrEnum):
     github = 'github'
 
 

{amsdal_cli-0.5.10 → amsdal_cli-0.6.1}/src/amsdal_cli/commands/cloud/enums.py

@@ -1,7 +1,7 @@
-from enum import Enum
+from enum import StrEnum
 
 
-class OutputFormat(str, Enum):
+class OutputFormat(StrEnum):
     """
     Output format for CLI commands.
 
@@ -16,7 +16,7 @@ class OutputFormat(str, Enum):
     wide = 'wide'
 
 
-class DBType(str, Enum):
+class DBType(StrEnum):
     """
     Enumeration for database types.
 

{amsdal_cli-0.5.10 → amsdal_cli-0.6.1}/src/amsdal_cli/commands/generate/enums.py

@@ -1,4 +1,4 @@
-from enum import Enum
+from enum import StrEnum
 
 MODEL_JSON_FILE = 'model.json'
 MODEL_PY_FILE = 'model.py'
@@ -6,7 +6,7 @@ FIXTURES_JSON_FILE = 'fixtures.json'
 FIXTURES = 'fixtures'
 
 
-class HookName(str, Enum):
+class HookName(StrEnum):
     """
     Enum representing different hook names used in the application lifecycle.
 
@@ -31,7 +31,7 @@ class HookName(str, Enum):
     POST_DELETE = 'post_delete'
 
 
-class ModifierName(str, Enum):
+class ModifierName(StrEnum):
     """
     Enum representing different modifier names used in the application.
 
@@ -46,7 +46,7 @@ class ModifierName(str, Enum):
     VERSION_NAME = 'version_name'
 
 
-class AttributeType(str, Enum):
+class AttributeType(StrEnum):
     """
     Enum representing different attribute types used in the application.
 
@@ -69,7 +69,7 @@ class AttributeType(str, Enum):
     DICT = 'dict'
 
 
-class JsonType(str, Enum):
+class JsonType(StrEnum):
     """
     Enum representing different JSON types used in the application.
 
@@ -90,7 +90,7 @@ class JsonType(str, Enum):
     DICT = 'dictionary'
 
 
-class OptionName(str, Enum):
+class OptionName(StrEnum):
     """
     Enum representing different option names used in the application.
 
@@ -107,7 +107,7 @@ class OptionName(str, Enum):
     UNIQUE = 'unique'
 
 
-class TestType(str, Enum):
+class TestType(StrEnum):
     """
     Enum representing different test types used in the application.
 
@@ -118,7 +118,7 @@ class TestType(str, Enum):
     UNIT = 'unit'
 
 
-class TestDataType(str, Enum):
+class TestDataType(StrEnum):
     """
     Enum representing different test data types used in the application.
 

{amsdal_cli-0.5.10 → amsdal_cli-0.6.1}/src/amsdal_cli/commands/generate/sub_commands/generate_frontend_config.py

@@ -15,7 +15,9 @@ def generate_frontend_config(
     """
     Generates Frontend Config fixture file for the specified model.
     """
-    from amsdal.contrib.frontend_configs.lifecycle.consumer import get_default_control
+    from amsdal.contrib.frontend_configs.event_handlers.object_control import (
+        _get_default_control as get_default_control,
+    )
     from amsdal.manager import AmsdalManager
     from amsdal.manager import AsyncAmsdalManager
     from amsdal_utils.config.manager import AmsdalConfigManager
@@ -60,12 +62,12 @@ def generate_frontend_config(
     current_dir = Path('.').absolute()
 
     if frontend_config_file.exists():
-        owerrite = input(
+        overwrite = input(
             f'The file "{frontend_config_file.relative_to(current_dir)}" already exists. '
             'Would you like to overwrite it? [y/N]: '
         ).strip()
 
-        if owerrite.lower() != 'y':
+        if overwrite.lower() != 'y':
             return
 
     write_file(

{amsdal_cli-0.5.10 → amsdal_cli-0.6.1}/src/amsdal_cli/commands/new/templates/.gitignore

@@ -14,3 +14,4 @@ __pycache__
 /venv
 /migrations
 /transactions
+/app.py

{amsdal_cli-0.5.10 → amsdal_cli-0.6.1}/src/amsdal_cli/commands/restore/enums.py

@@ -1,7 +1,7 @@
-from enum import Enum
+from enum import StrEnum
 
 
-class RestoreType(str, Enum):
+class RestoreType(StrEnum):
     """
     Restore type for CLI `restore` command.
 

{amsdal_cli-0.5.10 → amsdal_cli-0.6.1}/src/amsdal_cli/commands/serve/command.py

@@ -21,9 +21,10 @@ async def _async_serve(
     *,
     apply_fixtures: bool,
 ) -> 'AsyncAmsdalManager':
-    from amsdal_utils.lifecycle.consumer import LifecycleConsumer
-    from amsdal_utils.lifecycle.enum import LifecycleEvent
-    from amsdal_utils.lifecycle.producer import LifecycleProducer
+    from amsdal_server.apps.common.events import ServerStartupContext
+    from amsdal_server.apps.common.events import ServerStartupEvent
+    from amsdal_utils.events import EventBus
+    from amsdal_utils.events import EventListener
 
     from amsdal_cli.commands.serve.utils import async_build_app_and_check_migrations
 
@@ -38,11 +39,19 @@ async def _async_serve(
 
     try:
 
-        class AmsdalInitConsumer(LifecycleConsumer):
-            def on_event(self, *args: Any, **kwargs: Any) -> None:
-                pass
-
-            async def on_event_async(self, *args: Any, **kwargs: Any) -> None:  # noqa: ARG002
+        class AmsdalInitListener(EventListener[ServerStartupContext]):
+            def handle(
+                self,
+                context: ServerStartupContext,
+                next_fn: Any,
+            ) -> ServerStartupContext:
+                raise NotImplementedError
+
+            async def ahandle(
+                self,
+                context: ServerStartupContext,
+                next_fn: Any,
+            ) -> ServerStartupContext:
                 if not amsdal_manager._is_setup:
                     await amsdal_manager.setup()
                     await amsdal_manager.post_setup()  # type: ignore[call-arg]
@@ -52,10 +61,12 @@ async def _async_serve(
 
                 amsdal_manager.init_classes()
 
-        LifecycleProducer.add_listener(
-            LifecycleEvent.ON_SERVER_STARTUP,
-            AmsdalInitConsumer,
-            insert_first=True,
+                return await next_fn(context)
+
+        EventBus.subscribe(
+            ServerStartupEvent,
+            AmsdalInitListener,
+            priority=0,
         )
         return amsdal_manager
     except Exception:
@@ -91,11 +102,12 @@ def serve_command(
     Starts a test FastAPI server based on your app's models.
     """
 
+    from amsdal_server.apps.common.events import ServerStartupContext
+    from amsdal_server.apps.common.events import ServerStartupEvent
     from amsdal_server.server import start
     from amsdal_utils.config.manager import AmsdalConfigManager
-    from amsdal_utils.lifecycle.consumer import LifecycleConsumer
-    from amsdal_utils.lifecycle.enum import LifecycleEvent
-    from amsdal_utils.lifecycle.producer import LifecycleProducer
+    from amsdal_utils.events import EventBus
+    from amsdal_utils.events import EventListener
 
     from amsdal_cli.commands.serve.services.supervisor import Supervisor
     from amsdal_cli.commands.serve.utils import build_app_and_check_migrations
@@ -138,7 +150,6 @@ def serve_command(
                 )
                 try:
                     start(
-                        is_development_mode=False,
                         host=host,
                         port=server_port,
                     )
@@ -154,8 +165,12 @@ def serve_command(
                     confirm_migrations=False,
                 )
 
-                class AmsdalInitConsumer(LifecycleConsumer):
-                    def on_event(self, *args: Any, **kwargs: Any) -> None:  # noqa: ARG002
+                class AmsdalInitListener(EventListener[ServerStartupContext]):
+                    def handle(
+                        self,
+                        context: ServerStartupContext,
+                        next_fn: Any,
+                    ) -> ServerStartupContext:
                         if not amsdal_manager._is_setup:
                             amsdal_manager.setup()
                             amsdal_manager.post_setup()  # type: ignore[call-arg]
@@ -165,16 +180,21 @@ def serve_command(
 
                         amsdal_manager.init_classes()
 
-                    async def on_event_async(self, *args: Any, **kwargs: Any) -> None:
-                        pass
+                        return next_fn(context)
+
+                    async def ahandle(
+                        self,
+                        context: ServerStartupContext,
+                        next_fn: Any,
+                    ) -> ServerStartupContext:
+                        raise NotImplementedError
 
-                LifecycleProducer.add_listener(
-                    LifecycleEvent.ON_SERVER_STARTUP,
-                    AmsdalInitConsumer,
-                    insert_first=True,
+                EventBus.subscribe(
+                    ServerStartupEvent,
+                    AmsdalInitListener,
+                    priority=0,
                 )
                 start(
-                    is_development_mode=False,
                     host=host,
                     port=server_port,
                 )