llamactl 0.3.24__py3-none-any.whl → 0.3.26__py3-none-any.whl

llama_deploy/cli/commands/dev.py

@@ -79,6 +79,69 @@ def validate_command(deployment_file: Path, interactive: bool) -> None:
     rprint(f"[green]Validated workflows in {config_dir} successfully.[/green]")
 
 
+@dev.command(
+    "export-json-graph",
+    help="Produce a JSON graph representation of registered workflows",
+    hidden=True,  # perhaps expose if we have a built in visualization (mermaid, etc.)
+)
+@click.argument(
+    "deployment_file",
+    required=False,
+    default=DEFAULT_DEPLOYMENT_FILE_PATH,
+    type=_ClickPath(dir_okay=True, resolve_path=True, path_type=Path),
+)
+@click.option(
+    "--output",
+    help=(
+        "File where output JSON graph will be saved. "
+        "Defaults to workflows.json in the current directory."
+    ),
+    required=False,
+    default=None,
+    type=_ClickPath(dir_okay=True, resolve_path=True, path_type=Path),
+)
+@interactive_option
+@global_options
+def export_json_graph_command(
+    deployment_file: Path,
+    output: Path | None,
+    interactive: bool,
+) -> None:
+    """Export the configured workflows to a JSON document that may be used for graph visualization."""
+    if not deployment_file.exists():
+        rprint(f"[red]Deployment file '{deployment_file}' does not exist[/red]")
+        raise click.Abort()
+
+    _ensure_project_layout(
+        deployment_file, command_name="llamactl dev export-json-graph"
+    )
+    _maybe_inject_llama_cloud_credentials(
+        deployment_file, interactive, require_cloud=False
+    )
+
+    prepare_server(
+        deployment_file=deployment_file,
+        install=True,
+        build=False,
+        install_ui_deps=False,
+    )
+
+    wd = Path.cwd()
+    if output is None:
+        output = wd / "workflows.json"
+
+    try:
+        start_export_json_graph_in_target_venv(
+            cwd=wd,
+            deployment_file=deployment_file,
+            output=output,
+        )
+    except subprocess.CalledProcessError as exc:
+        rprint("[red]Workflow JSON graph export failed. See errors above.[/red]")
+        raise Exit(exc.returncode)
+    rprint(f"[green]Exported workflow JSON graph to {output}[/green]")
+
+
 @dev.command(
     "run",
     help=(
@@ -199,6 +262,21 @@ def start_preflight_in_target_venv(*, cwd: Path, deployment_file: Path) -> None:
     _start_preflight_in_target_venv(cwd=cwd, deployment_file=deployment_file)
 
 
+def start_export_json_graph_in_target_venv(
+    *, cwd: Path, deployment_file: Path, output: Path
+) -> None:
+    """Thin wrapper so tests can monkeypatch `dev.start_export_json_graph_in_target_venv`."""
+    from llama_deploy.appserver.app import (
+        start_export_json_graph_in_target_venv as _start_export_json_graph_in_target_venv,
+    )
+
+    _start_export_json_graph_in_target_venv(
+        cwd=cwd,
+        deployment_file=deployment_file,
+        output=output,
+    )
+
+
 def parse_environment_variables(
     config: DeploymentConfig, config_parent: Path
 ) -> dict[str, str]:
@@ -210,4 +288,4 @@ def parse_environment_variables(
     return _parse_environment_variables(config, config_parent)
 
 
-__all__ = ["dev", "validate_command", "run_command"]
+__all__ = ["dev", "validate_command", "run_command", "export_json_graph_command"]

llama_deploy/cli/config/_config.py

@@ -76,7 +76,8 @@ class ConfigManager:
 
         with sqlite3.connect(self.db_path) as conn:
             # Apply ad-hoc SQL migrations based on PRAGMA user_version
-            run_migrations(conn)
+            # Pass db_path to enable file-based locking across processes
+            run_migrations(conn, self.db_path)
 
             conn.commit()
 

llama_deploy/cli/config/_migrations.py

@@ -6,10 +6,14 @@ Inspired by https://eskerda.com/sqlite-schema-migrations-python/
 from __future__ import annotations
 
 import logging
+import os
 import re
 import sqlite3
 import sys
+from contextlib import contextmanager
 from importlib import import_module, resources
+from pathlib import Path
+from typing import Generator
 
 if sys.version_info >= (3, 11):
     from importlib.resources.abc import Traversable
@@ -23,6 +27,42 @@ _MIGRATIONS_PKG = "llama_deploy.cli.config.migrations"
 _USER_VERSION_PATTERN = re.compile(r"pragma\s+user_version\s*=\s*(\d+)", re.IGNORECASE)
 
 
+def _lock_file_unix(fd: int) -> None:
+    """Acquire exclusive lock on Unix using fcntl."""
+    import fcntl
+
+    fcntl.flock(fd, fcntl.LOCK_EX)
+
+
+def _unlock_file_unix(fd: int) -> None:
+    """Release lock on Unix using fcntl."""
+    import fcntl
+
+    fcntl.flock(fd, fcntl.LOCK_UN)
+
+
+@contextmanager
+def _file_lock(lock_path: Path) -> Generator[None, None, None]:
+    """File lock to serialize migrations across processes.
+
+    Uses fcntl.flock on Unix. On Windows, SQLite's built-in locking provides
+    sufficient protection for typical CLI usage patterns.
+    """
+    if os.name == "nt":
+        # On Windows, rely on SQLite's own file locking
+        yield
+        return
+
+    lock_path.parent.mkdir(parents=True, exist_ok=True)
+    lock_file = open(lock_path, "w")  # noqa: SIM115
+    try:
+        _lock_file_unix(lock_file.fileno())
+        yield
+    finally:
+        _unlock_file_unix(lock_file.fileno())
+        lock_file.close()
+
+
 def _iter_migration_files() -> list[Traversable]:
     """Yield packaged SQL migration files in lexicographic order."""
     pkg = import_module(_MIGRATIONS_PKG)
@@ -40,12 +80,8 @@ def _parse_target_version(sql_text: str) -> int | None:
     return int(match.group(1)) if match else None
 
 
-def run_migrations(conn: sqlite3.Connection) -> None:
-    """Apply pending migrations found under the migrations package.
-
-    Each migration file should start with a `PRAGMA user_version=N;` line.
-    Files are applied in lexicographic order and only when N > current_version.
-    """
+def _apply_pending_migrations(conn: sqlite3.Connection) -> None:
+    """Apply pending migrations (internal, assumes lock is held)."""
     cur = conn.cursor()
     current_version_row = cur.execute("PRAGMA user_version").fetchone()
     current_version = int(current_version_row[0]) if current_version_row else 0
@@ -68,3 +104,20 @@ def run_migrations(conn: sqlite3.Connection) -> None:
         else:
             cur.execute("COMMIT")
             current_version = target_version
+
+
+def run_migrations(conn: sqlite3.Connection, db_path: Path | None = None) -> None:
+    """Apply pending migrations found under the migrations package.
+
+    Each migration file should start with a `PRAGMA user_version=N;` line.
+    Files are applied in lexicographic order and only when N > current_version.
+
+    Uses a file lock to prevent concurrent migrations across processes when
+    db_path is provided.
+    """
+    if db_path is not None:
+        lock_path = db_path.with_suffix(".db.lock")
+        with _file_lock(lock_path):
+            _apply_pending_migrations(conn)
+    else:
+        _apply_pending_migrations(conn)

{llamactl-0.3.24.dist-info → llamactl-0.3.26.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.24
+Version: 0.3.26
 Summary: A command-line interface for managing LlamaDeploy projects and deployments
 Author: Adrian Lyjak
 Author-email: Adrian Lyjak <adrianlyjak@gmail.com>
 License: MIT
-Requires-Dist: llama-deploy-core[client]>=0.3.24,<0.4.0
-Requires-Dist: llama-deploy-appserver>=0.3.24,<0.4.0
+Requires-Dist: llama-deploy-core[client]>=0.3.26,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.26,<0.4.0
 Requires-Dist: vibe-llama-core>=0.1.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: questionary>=2.0.0

{llamactl-0.3.24.dist-info → llamactl-0.3.26.dist-info}/RECORD

@@ -5,13 +5,13 @@ llama_deploy/cli/client.py,sha256=61c04ff808374913bf2fc1fc5838c498b4f8c779d4e056
 llama_deploy/cli/commands/aliased_group.py,sha256=364d846d9ceec465e6f2f47051ad06e1ccfbea1d7526654c1ffbd7b7ab7e6af0,1302
 llama_deploy/cli/commands/auth.py,sha256=c8b94de8c0647e241b0083782b8e241225c0c68ee2d32f85d54c29ae0d7dcb1b,26891
 llama_deploy/cli/commands/deployment.py,sha256=dc5d039224409708446b91db482c20da648eba720c1527cfdb2952a1bb07ad3e,15567
-llama_deploy/cli/commands/dev.py,sha256=6e137aa10ab5f175b6c139d7294776d03d284c3b1b503f54d07c6a5ae5f572cc,7035
+llama_deploy/cli/commands/dev.py,sha256=10f394bc91ea71c3d1f23d280919482794ddf918e5676e7a3305f49d2a71f646,9436
 llama_deploy/cli/commands/env.py,sha256=ae8f94eb2651a10615bac37afa16447ad1d78cb78c83ad8b8ae75e878733d323,7478
 llama_deploy/cli/commands/init.py,sha256=afdb65b5e70cfaf3bdbc923d13db1a31ad23c14605e5bcd55ddaab8fff6e69a4,17514
 llama_deploy/cli/commands/pkg.py,sha256=f91a87220c1d527e02a183dac5ca52c58608128e29bedf664362af3d2d31c461,4084
 llama_deploy/cli/commands/serve.py,sha256=c66fed8b3117c278eca2eca86eb7933ba434442d4f315c1505449580f59bfdca,12974
-llama_deploy/cli/config/_config.py,sha256=66ba1869d620ef2f31fa3b7d7ba38c3e3718c3dabdbe90f7ea49cbdcdfc4a951,14262
-llama_deploy/cli/config/_migrations.py,sha256=9b5e3b9eec692a3edb58c1f99a03d04a63bfc29dbebfc1719a5daf5a9d024738,2448
+llama_deploy/cli/config/_config.py,sha256=47c7b24f9d644c1b37345f1e5b754424ac924a13c24cd16ef50e6ceb6f4c606e,14349
+llama_deploy/cli/config/_migrations.py,sha256=3c5caec002e7eb226dfc451a60af8a820b4e48ccf0ce53f45f5a04a7070fc703,3969
 llama_deploy/cli/config/auth_service.py,sha256=0cf47ad032aceefc27283ce2760432e915554d544876ce471746a58692cb9249,5150
 llama_deploy/cli/config/env_service.py,sha256=cd51a68f1e9aad0bdd49cd76351cd54cea612a7f669512484c42e2876fea0458,2650
 llama_deploy/cli/config/migrations/0001_init.sql,sha256=dc9ee7439d8d79262e41f2d9f1a9306ae5b0812cc4b454167d556330f0cc578c,1092
@@ -41,7 +41,7 @@ llama_deploy/cli/utils/env_inject.py,sha256=01911758bcc3cf22aad0db0d1ade56aece48
 llama_deploy/cli/utils/redact.py,sha256=1e768d76b4a6708230c34f7ce8a5a82ab52795bb3d6ab0387071ab4e8d7e7934,863
 llama_deploy/cli/utils/retry.py,sha256=62ca6f286cb4de38cc5efcef3f376b12c2e6eb9b3e5ebe555d2a60aeb0957c19,1526
 llama_deploy/cli/utils/version.py,sha256=bf01a6dda948b868cc08c93701ed44cd36b487402404af8451d4c0996a2edb31,364
-llamactl-0.3.24.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
-llamactl-0.3.24.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
-llamactl-0.3.24.dist-info/METADATA,sha256=f7aa418942122514687264d8a966765462b20934e1c19776b3bf203a05cc61a0,3329
-llamactl-0.3.24.dist-info/RECORD,,
+llamactl-0.3.26.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
+llamactl-0.3.26.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
+llamactl-0.3.26.dist-info/METADATA,sha256=54d1a2167b0c29ddc7801a935e3f337a3c3d783382e8e976332580597751cc91,3329
+llamactl-0.3.26.dist-info/RECORD,,