amsdal_cli 0.5.9__tar.gz → 0.6.0__tar.gz

{amsdal_cli-0.5.9 → amsdal_cli-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_cli
-Version: 0.5.9
+Version: 0.6.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/
@@ -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.5.0
 Requires-Dist: click<8.2.0
 Requires-Dist: faker==27.*
 Requires-Dist: gitpython~=3.1

{amsdal_cli-0.5.9 → amsdal_cli-0.6.0}/change-logs.md

@@ -1,3 +1,15 @@
+## [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
+
+- Added support for cloud external connection commands
+
 ## [v0.5.9](https://pypi.org/project/amsdal_cli/0.5.9/) - 2025-12-23
 
 ### Added
@@ -175,50 +187,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
 
@@ -227,54 +236,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**
@@ -290,57 +300,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**
@@ -348,35 +349,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**
@@ -385,7 +381,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)
@@ -395,31 +390,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.0/latest-changelogs.md

@@ -0,0 +1,5 @@
+## [v0.6.0](https://pypi.org/project/amsdal_cli/0.6.0/) - 2025-02-05
+
+### Changed
+
+- Add support for amsdal v0.6

{amsdal_cli-0.5.9 → amsdal_cli-0.6.0}/pyproject.toml

@@ -40,7 +40,7 @@ dependencies = [
     "jinja2~=3.1",
     "watchfiles~=0.21",
     "GitPython~=3.1",
-    "amsdal-server==0.5.*",
+    "amsdal-server>=0.5.0",
     "faker==27.*",
     "httpx==0.28.*",
 ]

{amsdal_cli-0.5.9 → amsdal_cli-0.6.0}/src/amsdal_cli/__about__.py

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

{amsdal_cli-0.5.9 → amsdal_cli-0.6.0}/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.9 → amsdal_cli-0.6.0}/src/amsdal_cli/commands/cloud/command.py

@@ -3,6 +3,7 @@ from amsdal_cli.commands.cloud.app import cloud_sub_app
 from amsdal_cli.commands.cloud.dependency.command import *  # noqa
 from amsdal_cli.commands.cloud.deploy.command import *  # noqa
 from amsdal_cli.commands.cloud.environments.command import *  # noqa
+from amsdal_cli.commands.cloud.external_connections.command import *  # noqa
 from amsdal_cli.commands.cloud.secret.command import *  # noqa
 from amsdal_cli.commands.cloud.security.command import *  # noqa
 from amsdal_cli.commands.cloud.sub_commands import *  # noqa

{amsdal_cli-0.5.9 → amsdal_cli-0.6.0}/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.6.0/src/amsdal_cli/commands/cloud/external_connections/__init__.py

@@ -0,0 +1,3 @@
+from amsdal_cli.commands.cloud.external_connections.app import external_connections_sub_app
+
+__all__ = ['external_connections_sub_app']

amsdal_cli-0.6.0/src/amsdal_cli/commands/cloud/external_connections/app.py

@@ -0,0 +1,11 @@
+import typer
+
+from amsdal_cli.utils.alias_group import AliasGroup
+
+external_connections_sub_app = typer.Typer(
+    help=(
+        'Manage external connections for your Cloud Server app. '
+        'Without any sub-command, it will list all external connections.'
+    ),
+    cls=AliasGroup,
+)

amsdal_cli-0.6.0/src/amsdal_cli/commands/cloud/external_connections/command.py

@@ -0,0 +1,5 @@
+from amsdal_cli.commands.cloud.app import cloud_sub_app
+from amsdal_cli.commands.cloud.external_connections.app import external_connections_sub_app
+from amsdal_cli.commands.cloud.external_connections.sub_commands import *  # noqa
+
+cloud_sub_app.add_typer(external_connections_sub_app, name='external-connections, ext-conn, ec')

amsdal_cli-0.6.0/src/amsdal_cli/commands/cloud/external_connections/sub_commands/__init__.py

@@ -0,0 +1,11 @@
+from amsdal_cli.commands.cloud.external_connections.sub_commands.connection_add import connection_add_command
+from amsdal_cli.commands.cloud.external_connections.sub_commands.connection_list import connection_list_callback
+from amsdal_cli.commands.cloud.external_connections.sub_commands.connection_remove import connection_remove_command
+from amsdal_cli.commands.cloud.external_connections.sub_commands.connection_update import connection_update_command
+
+__all__ = [
+    'connection_add_command',
+    'connection_list_callback',
+    'connection_remove_command',
+    'connection_update_command',
+]

amsdal_cli-0.6.0/src/amsdal_cli/commands/cloud/external_connections/sub_commands/connection_add.py

@@ -0,0 +1,123 @@
+import tempfile
+import typing
+from pathlib import Path
+
+import typer
+from rich import print as rprint
+from typer import Option
+
+from amsdal_cli.commands.cloud.external_connections.app import external_connections_sub_app
+
+
+def parse_credentials(credential_options: list[str]) -> dict[str, str]:
+    """
+    Parse credential key=value pairs into a dictionary.
+
+    Args:
+        credential_options: Tuple of strings in format "key=value"
+
+    Returns:
+        Dictionary mapping credential keys to values
+
+    Raises:
+        typer.BadParameter: If credential format is invalid
+    """
+    credentials = {}
+    for cred in credential_options:
+        if '=' not in cred:
+            msg = f"Invalid credential format: '{cred}'. Expected 'key=value'"
+            raise typer.BadParameter(msg)
+        key, value = cred.split('=', 1)
+        credentials[key.strip()] = value.strip()
+    return credentials
+
+
+@external_connections_sub_app.command(name='add, a')
+def connection_add_command(
+    ctx: typer.Context,
+    connection_name: str,
+    backend: str,
+    credentials: typing.Annotated[
+        typing.Optional[list[str]],  # noqa: UP007
+        Option('--credential', '-c', help='Credential in key=value format. Can be specified multiple times.'),
+    ] = None,
+    env_name: typing.Annotated[
+        typing.Optional[str],  # noqa: UP007
+        Option('--env', help='Environment name. Default is the current environment from configuration.'),
+    ] = None,
+) -> None:
+    """
+    Adds a new external connection to your Cloud Server app.
+    """
+    from amsdal.errors import AmsdalCloudError
+    from amsdal.manager import AmsdalManager
+    from amsdal.manager import AsyncAmsdalManager
+    from amsdal_utils.config.manager import AmsdalConfigManager
+
+    from amsdal_cli.commands.build.services.builder import AppBuilder
+    from amsdal_cli.commands.cloud.environments.utils import get_current_env
+    from amsdal_cli.utils.cli_config import CliConfig
+    from amsdal_cli.utils.text import rich_error
+    from amsdal_cli.utils.text import rich_highlight
+    from amsdal_cli.utils.text import rich_info
+    from amsdal_cli.utils.text import rich_success
+
+    cli_config: CliConfig = ctx.meta['config']
+    env_name = env_name or get_current_env(cli_config)
+
+    # Parse credentials
+    if not credentials or len(credentials) == 0:
+        rprint(rich_error('At least one credential must be provided using --credential/-c'))
+        raise typer.Exit(1)
+
+    try:
+        credentials_dict = parse_credentials(credentials)
+    except typer.BadParameter as e:
+        rprint(rich_error(str(e)))
+        raise typer.Exit(1) from e
+
+    if cli_config.verbose:
+        rprint(
+            rich_info(
+                f'Adding external connection {rich_highlight(connection_name)} '
+                f'with backend {rich_highlight(backend)} '
+                f'to environment: {rich_highlight(env_name)}'
+            )
+        )
+
+    with tempfile.TemporaryDirectory() as _temp_dir:
+        output_path: Path = Path(_temp_dir)
+
+        app_builder = AppBuilder(
+            cli_config=cli_config,
+            config_path=cli_config.config_path,
+        )
+        app_builder.build(output_path, is_silent=True)
+        manager: AsyncAmsdalManager | AmsdalManager
+
+        manager = AsyncAmsdalManager() if AmsdalConfigManager().get_config().async_mode else AmsdalManager()
+
+        manager.authenticate()
+
+    try:
+        manager.cloud_actions_manager.add_external_connection(
+            connection_name=connection_name,
+            backend=backend,
+            credentials=credentials_dict,
+            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
+    else:
+        config_dir: Path = cli_config.app_directory / '.amsdal'
+        config_dir.mkdir(exist_ok=True, parents=True)
+        _connections_path: Path = config_dir / '.external_connections'
+        _connections_path.touch(exist_ok=True)
+        _connections = set(_connections_path.read_text().split('\n'))
+        _connections.add(connection_name)
+        _connections_path.write_text('\n'.join(_connections))
+
+    rprint(rich_success(f'External connection {rich_highlight(connection_name)} added successfully.'))

amsdal_cli-0.6.0/src/amsdal_cli/commands/cloud/external_connections/sub_commands/connection_list.py

@@ -0,0 +1,146 @@
+import json
+import tempfile
+import typing
+from pathlib import Path
+from typing import Annotated
+
+import typer
+from rich import print as rprint
+from rich.table import Table
+from typer import Option
+
+from amsdal_cli.commands.cloud.enums import OutputFormat
+from amsdal_cli.commands.cloud.external_connections.app import external_connections_sub_app
+
+
+def connection_list_command(
+    ctx: typer.Context,
+    output: Annotated[OutputFormat, typer.Option('--output', '-o')] = OutputFormat.default,
+    env_name: typing.Annotated[
+        typing.Optional[str],  # noqa: UP007
+        Option('--env', help='Environment name. Default is the current environment from configuration.'),
+    ] = None,
+    *,
+    sync: bool = Option(
+        False,
+        '--sync',
+        help='Sync the external connections from the Cloud Server to ".external_connections".',
+    ),
+) -> None:
+    """
+    List the app external connections on the Cloud Server.
+
+    Args:
+        ctx (typer.Context): The Typer context object.
+        output (Annotated[OutputFormat, typer.Option]): The output format for the list.
+            Defaults to OutputFormat.default.
+        env_name (typing.Annotated[typing.Optional[str], Option]): The name of the environment. Defaults to the current
+            environment from configuration.
+        sync (bool): Whether to sync the external connections from the Cloud Server to ".external_connections".
+            Defaults to False.
+
+    Returns:
+        None
+    """
+    from amsdal.errors import AmsdalCloudError
+    from amsdal.manager import AmsdalManager
+    from amsdal.manager import AsyncAmsdalManager
+    from amsdal_utils.config.manager import AmsdalConfigManager
+
+    from amsdal_cli.commands.build.services.builder import AppBuilder
+    from amsdal_cli.commands.cloud.environments.utils import get_current_env
+    from amsdal_cli.utils.cli_config import CliConfig
+    from amsdal_cli.utils.text import rich_error
+    from amsdal_cli.utils.text import rich_highlight
+    from amsdal_cli.utils.text import rich_info
+
+    cli_config: CliConfig = ctx.meta['config']
+    env_name = env_name or get_current_env(cli_config)
+
+    if cli_config.verbose:
+        rprint(rich_info(f'Listing external connections for environment: {rich_highlight(env_name)}'))
+
+    with tempfile.TemporaryDirectory() as _temp_dir:
+        output_path: Path = Path(_temp_dir)
+        app_builder = AppBuilder(
+            cli_config=cli_config,
+            config_path=cli_config.config_path,
+        )
+        app_builder.build(output_path, is_silent=True)
+        manager: AsyncAmsdalManager | AmsdalManager
+
+        manager = AsyncAmsdalManager() if AmsdalConfigManager().get_config().async_mode else AmsdalManager()
+
+        manager.authenticate()
+
+    try:
+        list_response = manager.cloud_actions_manager.list_external_connections(
+            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
+
+    if not list_response or not list_response.details:
+        return
+
+    if sync and list_response.details.connections:
+        config_dir: Path = cli_config.app_directory / '.amsdal'
+        config_dir.mkdir(exist_ok=True, parents=True)
+        _connections_path: Path = config_dir / '.external_connections'
+        _connections_path.touch(exist_ok=True)
+        _connections_path.write_text(
+            '\n'.join([connection.name for connection in list_response.details.connections]),
+        )
+
+    if output == OutputFormat.json:
+        rprint(json.dumps(list_response.model_dump(), indent=4))
+        return
+
+    if not list_response.details.connections:
+        rprint('No external connections found.')
+        return
+
+    data_table = Table()
+    data_table.add_column('Connection Name', justify='center')
+    data_table.add_column('Backend', justify='center')
+    data_table.add_column('Credentials', justify='center')
+
+    for connection in list_response.details.connections:
+        # Show only credential keys, not values for security
+        credential_keys = ', '.join(connection.credentials.keys()) if connection.credentials else ''
+        data_table.add_row(connection.name, connection.backend, credential_keys)
+
+    rprint(data_table)
+
+
+@external_connections_sub_app.callback(invoke_without_command=True)
+def connection_list_callback(
+    ctx: typer.Context,
+    output: Annotated[OutputFormat, typer.Option('--output', '-o')] = OutputFormat.default,
+    env_name: typing.Annotated[
+        typing.Optional[str],  # noqa: UP007
+        Option('--env', help='Environment name. Default is the current environment from configuration.'),
+    ] = None,
+    *,
+    sync: bool = Option(
+        False,
+        '--sync',
+        help='Sync the external connections from the Cloud Server to ".external_connections".',
+    ),
+) -> None:
+    """
+    Lists the app external connections on the Cloud Server.
+    """
+
+    if ctx.invoked_subcommand is not None:
+        return
+
+    connection_list_command(
+        ctx=ctx,
+        output=output,
+        env_name=env_name,
+        sync=sync,
+    )