amsdal_cli 0.9.0__tar.gz → 0.9.2__tar.gz

{amsdal_cli-0.9.0 → amsdal_cli-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_cli
-Version: 0.9.0
+Version: 0.9.2
 Summary: CLI for AMSDAL framework
 Project-URL: Documentation, https://pypi.org/project/amsdal_cli/#readme
 Project-URL: Issues, https://pypi.org/project/amsdal_cli/
@@ -125,13 +125,16 @@ Requires-Python: <3.14,>=3.11
 Requires-Dist: amsdal-server>=0.9.0
 Requires-Dist: amsdal>=0.9.1
 Requires-Dist: click<8.2.0
+Requires-Dist: cryptography
 Requires-Dist: faker==27.*
 Requires-Dist: gitpython~=3.1
 Requires-Dist: httpx==0.28.*
 Requires-Dist: jinja2~=3.1
+Requires-Dist: paramiko<4.0.0
 Requires-Dist: pydantic-settings~=2.12
-Requires-Dist: pydantic<2.13,>=2.12
+Requires-Dist: pydantic<2.14,>=2.12
 Requires-Dist: rich~=14.0
+Requires-Dist: sshtunnel~=0.4
 Requires-Dist: typer~=0.15.3
 Requires-Dist: watchfiles~=0.21
 Description-Content-Type: text/markdown

{amsdal_cli-0.9.0 → amsdal_cli-0.9.2}/change-logs.md

@@ -1,3 +1,17 @@
+## [v0.9.2](https://pypi.org/project/amsdal_cli/0.9.2/) - 2026-06-11
+
+
+### Fixed
+
+- `amsdal worker run` no longer fails with "Worker is not registered." when a worker is configured. The command now resolves the background-transaction manager from the active data context via `get_background_transaction_manager()` instead of constructing a fresh `BackgroundTransactionManager()` / `AsyncBackgroundTransactionManager()`. Since the manager moved from a module-level singleton into `AmsdalDataContext`, the throwaway instance never had its worker connection registered.
+
+## [v0.9.1](https://pypi.org/project/amsdal_cli/0.9.1/) - 2026-06-09
+
+
+### Added
+
+- Added `amsdal cloud tunnel-db` command that opens an SSH tunnel to the application database through an EC2 bastion instance using an ephemeral, client-generated SSH key.
+
 ## [v0.9.0](https://pypi.org/project/amsdal_cli/0.9.0/) - 2026-06-06
 
 ### Changed

amsdal_cli-0.9.2/latest-changelogs.md

@@ -0,0 +1,6 @@
+## [v0.9.2](https://pypi.org/project/amsdal_cli/0.9.2/) - 2026-06-11
+
+
+### Fixed
+
+- `amsdal worker run` no longer fails with "Worker is not registered." when a worker is configured. The command now resolves the background-transaction manager from the active data context via `get_background_transaction_manager()` instead of constructing a fresh `BackgroundTransactionManager()` / `AsyncBackgroundTransactionManager()`. Since the manager moved from a module-level singleton into `AmsdalDataContext`, the throwaway instance never had its worker connection registered.

{amsdal_cli-0.9.0 → amsdal_cli-0.9.2}/pyproject.toml

@@ -32,7 +32,7 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
 dependencies = [
-    "pydantic>=2.12,<2.13",
+    "pydantic>=2.12,<2.14",
     "pydantic-settings~=2.12",
     "typer~=0.15.3",
     "click<8.2.0",
@@ -44,6 +44,10 @@ dependencies = [
     "amsdal_server>=0.9.0",
     "faker==27.*",
     "httpx==0.28.*",
+    "sshtunnel~=0.4",
+    # paramiko<4 — sshtunnel key-type compatibility issue (https://github.com/pahaz/sshtunnel/pull/300)
+    "paramiko<4.0.0",
+    "cryptography",
 ]
 
 [dependency-groups]
@@ -188,6 +192,10 @@ disallow_untyped_defs = true
 module = "astor.*"
 ignore_missing_imports = true
 
+[[tool.mypy.overrides]]
+module = "sshtunnel.*"
+ignore_missing_imports = true
+
 [tool.ruff.lint.flake8-quotes]
 docstring-quotes = "double"
 inline-quotes = "single"

{amsdal_cli-0.9.0 → amsdal_cli-0.9.2}/src/amsdal_cli/Third-Party Materials - AMSDAL Dependencies - License Notices.md

@@ -1221,3 +1221,54 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## sshtunnel **v0.4.0 or later**
+
+### [https://github.com/pahaz/sshtunnel](https://github.com/pahaz/sshtunnel)
+
+### **MIT License**
+
+Copyright (c) 2014-2016 Pahaz Blinov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+## paramiko **v3.0.0 or later**
+
+### [https://github.com/paramiko/paramiko](https://github.com/paramiko/paramiko)
+
+### **GNU Lesser General Public License v2.1 (LGPL-2.1)**
+
+Copyright (C) 2003-2009 Robey Pointer <robeypointer@gmail.com>
+
+Paramiko is free software; you can redistribute it and/or modify it under the
+terms of the GNU Lesser General Public License as published by the Free
+Software Foundation; either version 2.1 of the License, or (at your option)
+any later version.
+
+Paramiko is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with Paramiko; if not, write to the Free Software Foundation, Inc.,
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+The full text of the GNU Lesser General Public License v2.1 is available at
+[https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt).

{amsdal_cli-0.9.0 → amsdal_cli-0.9.2}/src/amsdal_cli/__about__.py

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

{amsdal_cli-0.9.0 → amsdal_cli-0.9.2}/src/amsdal_cli/commands/cloud/sub_commands/__init__.py

@@ -2,10 +2,12 @@ from amsdal_cli.commands.cloud.sub_commands.expose_db import expose_db_command
 from amsdal_cli.commands.cloud.sub_commands.gen_token import gen_token_command
 from amsdal_cli.commands.cloud.sub_commands.get_monitoring_info import get_monitoring_info
 from amsdal_cli.commands.cloud.sub_commands.sync_db import sync_db_command
+from amsdal_cli.commands.cloud.sub_commands.tunnel_db import tunnel_db_command
 
 __all__ = [
     'expose_db_command',
     'gen_token_command',
     'get_monitoring_info',
     'sync_db_command',
+    'tunnel_db_command',
 ]

amsdal_cli-0.9.2/src/amsdal_cli/commands/cloud/sub_commands/tunnel_db.py

@@ -0,0 +1,132 @@
+import os
+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.app import cloud_sub_app
+
+
+def _generate_temp_ssh_key() -> tuple[bytes, bytes]:
+    """Generate an ephemeral RSA key pair in OpenSSH format."""
+    from cryptography.hazmat.primitives import serialization
+    from cryptography.hazmat.primitives.asymmetric import rsa
+
+    private_key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
+    private_pem = private_key.private_bytes(
+        encoding=serialization.Encoding.PEM,
+        format=serialization.PrivateFormat.OpenSSH,
+        encryption_algorithm=serialization.NoEncryption(),
+    )
+    public_key = private_key.public_key().public_bytes(
+        encoding=serialization.Encoding.OpenSSH,
+        format=serialization.PublicFormat.OpenSSH,
+    )
+    return private_pem, public_key
+
+
+@cloud_sub_app.command(name='tunnel-db, tunnel_db, tdb')
+def tunnel_db_command(
+    ctx: typer.Context,
+    env_name: typing.Annotated[
+        typing.Optional[str],  # noqa: UP007
+        Option('--env', help='Environment name. Default is the current environment from configuration.'),
+    ] = None,
+    local_port: typing.Annotated[
+        int,
+        Option('--local-port', help='Local port to bind the tunnel to.'),
+    ] = 5433,
+    db_port: typing.Annotated[
+        int,
+        Option('--db-port', help='Remote database port to forward to.'),
+    ] = 5432,
+) -> None:
+    """
+    Opens an SSH tunnel to the application database through an EC2 bastion instance.
+
+    Generates an ephemeral SSH key pair, sends the public key to the auth service
+    (which pushes it to the bastion), then opens a local tunnel and waits until you
+    cancel it.
+    """
+    from amsdal.errors import AmsdalCloudError
+    from amsdal.manager import AmsdalManager
+    from amsdal.manager import AsyncAmsdalManager
+    from amsdal_utils.config.manager import AmsdalConfigManager
+    from sshtunnel import SSHTunnelForwarder
+
+    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)
+
+    if cli_config.verbose:
+        rprint(rich_info(f'Opening database tunnel 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()
+
+    private_pem, public_key = _generate_temp_ssh_key()
+
+    try:
+        details = manager.cloud_actions_manager.tunnel_db(
+            env_name=env_name,
+            application_uuid=cli_config.application_uuid,
+            application_name=cli_config.application_name,
+            public_key=public_key.decode('utf-8'),
+        )
+    except AmsdalCloudError as e:
+        rprint(rich_error(str(e)))
+        return
+
+    with tempfile.NamedTemporaryFile(delete=False, suffix='.pem') as key_file:
+        key_file.write(private_pem)
+        key_path = key_file.name
+
+    tunnel: SSHTunnelForwarder | None = None
+
+    try:
+        tunnel = SSHTunnelForwarder(
+            (details['bastion_host'], 22),
+            ssh_username=details['ssh_user'],
+            ssh_pkey=key_path,
+            remote_bind_address=(details['rds_host'], int(details['rds_port'] or db_port)),
+            local_bind_address=('127.0.0.1', local_port),
+        )
+        tunnel.start()
+
+        rprint(
+            rich_success(
+                f'Tunnel open. Connect your SQL client to {rich_highlight(f"127.0.0.1:{local_port}")}',
+            )
+        )
+        input('Press Enter to close the tunnel...')
+    except KeyboardInterrupt:
+        pass
+    except Exception as e:  # noqa: BLE001
+        rprint(rich_error(f'Failed to open tunnel: {e}'))
+    finally:
+        if tunnel is not None:
+            tunnel.stop()
+        os.unlink(key_path)
+        rprint(rich_info('Tunnel closed.'))

{amsdal_cli-0.9.0 → amsdal_cli-0.9.2}/src/amsdal_cli/commands/worker/sub_commands/run.py

@@ -15,7 +15,7 @@ if TYPE_CHECKING:
 
 def _sync_run(cli_config: 'CliConfig', app_source_path: Path, mode: WorkerMode) -> None:
     from amsdal.services.transaction_execution import TransactionExecutionService
-    from amsdal_data.transactions.background.manager import BackgroundTransactionManager
+    from amsdal_data.contexts import get_background_transaction_manager
     from amsdal_server.apps.transactions.services.transaction_api import TransactionApi
     from amsdal_utils.errors import AmsdalInitiationError
 
@@ -42,7 +42,7 @@ def _sync_run(cli_config: 'CliConfig', app_source_path: Path, mode: WorkerMode)
     _init_function()
 
     try:
-        BackgroundTransactionManager().connection.run_worker(_init_function, mode=mode)
+        get_background_transaction_manager().connection.run_worker(_init_function, mode=mode)
     except AmsdalInitiationError:
         rprint(rich_error('Worker is not registered.'))
         return
@@ -51,7 +51,7 @@ def _sync_run(cli_config: 'CliConfig', app_source_path: Path, mode: WorkerMode)
 async def _async_run(cli_config: 'CliConfig', app_source_path: Path, mode: WorkerMode) -> None:
     from amsdal.manager import AsyncAmsdalManager
     from amsdal.services.transaction_execution import TransactionExecutionService
-    from amsdal_data.transactions.background.manager import AsyncBackgroundTransactionManager
+    from amsdal_data.contexts import get_background_transaction_manager
     from amsdal_server.apps.transactions.services.transaction_api import TransactionApi
     from amsdal_utils.errors import AmsdalInitiationError
 
@@ -83,9 +83,9 @@ async def _async_run(cli_config: 'CliConfig', app_source_path: Path, mode: Worke
     await _init_function()
 
     try:
-        await AsyncBackgroundTransactionManager().connection.run_worker(
-            _init_function,  # type: ignore[arg-type]
-            _shutdown_function,  # type: ignore[arg-type]
+        await get_background_transaction_manager().connection.run_worker(
+            _init_function,
+            _shutdown_function,
             mode=mode,
         )
     except AmsdalInitiationError as e: