hexaqueue-cli 0.4.0__tar.gz → 0.5.0__tar.gz

{hexaqueue_cli-0.4.0 → hexaqueue_cli-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hexaqueue-cli
-Version: 0.4.0
+Version: 0.5.0
 Summary: Hexaqueue CLI - Modern developer and operator terminal interface
 Author: Richard West
 Author-email: Richard West <dopplereffect.us@gmail.com>
@@ -9,10 +9,10 @@ Requires-Dist: hexaqueue-core
 Requires-Dist: hexaqueue-server
 Requires-Dist: hexaqueue-worker
 Requires-Dist: hexaqueue-workflow
-Requires-Dist: hexastack-cli>=0.6.0
-Requires-Dist: hexastack-core>=0.6.0
-Requires-Dist: hexastack-cqrs>=0.6.0
-Requires-Dist: hexastack-grpc>=0.6.0
+Requires-Dist: hexastack-cli>=0.8.0
+Requires-Dist: hexastack-core>=0.8.0
+Requires-Dist: hexastack-cqrs>=0.8.0
+Requires-Dist: hexastack-grpc>=0.8.0
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: rich>=13.8.0
 Requires-Dist: typer>=0.15.0
@@ -26,8 +26,13 @@ Description-Content-Type: text/markdown
 [![PyPI: hexaqueue-cli](https://img.shields.io/pypi/v/hexaqueue-cli.svg)](https://pypi.org/project/hexaqueue-cli/)
 [![Python 3.13+](https://img.shields.io/badge/python-3.13+-blue.svg)](https://www.python.org/downloads/)
 [![Coverage](https://codecov.io/github/TheTrueSCU/hexaqueue/graph/badge.svg?component=hexaqueue_cli)](https://codecov.io/github/TheTrueSCU/hexaqueue)
+[![Part of Hexaqueue](https://img.shields.io/badge/part%20of-hexaqueue-blue.svg)](https://dopplereffect.us/hexaqueue/)
+[![Built with Hexastack](https://img.shields.io/badge/built%20with-hexastack-blueviolet.svg)](https://dopplereffect.us/hexastack/)
+[![Governed by Hexaqual](https://img.shields.io/badge/governed%20by-hexaqual-10b981.svg)](https://dopplereffect.us/hexaqual/)
 [![License: Apache 2.0](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](../../LICENSE)
 
+> Part of the [**Hexaqueue Scheduler**](https://dopplereffect.us/hexaqueue/) · Built on [**Hexastack**](https://dopplereffect.us/hexastack/) · Governed by [**Hexaqual**](https://dopplereffect.us/hexaqual/).
+
 ---
 
 ## 🏗️ Architecture & Dependencies

{hexaqueue_cli-0.4.0 → hexaqueue_cli-0.5.0}/README.md

@@ -5,8 +5,13 @@
 [![PyPI: hexaqueue-cli](https://img.shields.io/pypi/v/hexaqueue-cli.svg)](https://pypi.org/project/hexaqueue-cli/)
 [![Python 3.13+](https://img.shields.io/badge/python-3.13+-blue.svg)](https://www.python.org/downloads/)
 [![Coverage](https://codecov.io/github/TheTrueSCU/hexaqueue/graph/badge.svg?component=hexaqueue_cli)](https://codecov.io/github/TheTrueSCU/hexaqueue)
+[![Part of Hexaqueue](https://img.shields.io/badge/part%20of-hexaqueue-blue.svg)](https://dopplereffect.us/hexaqueue/)
+[![Built with Hexastack](https://img.shields.io/badge/built%20with-hexastack-blueviolet.svg)](https://dopplereffect.us/hexastack/)
+[![Governed by Hexaqual](https://img.shields.io/badge/governed%20by-hexaqual-10b981.svg)](https://dopplereffect.us/hexaqual/)
 [![License: Apache 2.0](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](../../LICENSE)
 
+> Part of the [**Hexaqueue Scheduler**](https://dopplereffect.us/hexaqueue/) · Built on [**Hexastack**](https://dopplereffect.us/hexastack/) · Governed by [**Hexaqual**](https://dopplereffect.us/hexaqual/).
+
 ---
 
 ## 🏗️ Architecture & Dependencies

{hexaqueue_cli-0.4.0 → hexaqueue_cli-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hexaqueue-cli"
-version = "0.4.0"
+version = "0.5.0"
 description = "Hexaqueue CLI - Modern developer and operator terminal interface"
 readme = "README.md"
 license = "Apache-2.0"
@@ -10,10 +10,10 @@ dependencies = [
     "hexaqueue-server",
     "hexaqueue-worker",
     "hexaqueue-workflow",
-    "hexastack-cli>=0.6.0",
-    "hexastack-core>=0.6.0",
-    "hexastack-cqrs>=0.6.0",
-    "hexastack-grpc>=0.6.0",
+    "hexastack-cli>=0.8.0",
+    "hexastack-core>=0.8.0",
+    "hexastack-cqrs>=0.8.0",
+    "hexastack-grpc>=0.8.0",
     "pyyaml>=6.0.2",
     "rich>=13.8.0",
     "typer>=0.15.0",

{hexaqueue_cli-0.4.0 → hexaqueue_cli-0.5.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "hexaqueue-cli"
-version = "0.4.0"
+version = "0.5.0"
 description = "Hexaqueue CLI - Modern developer and operator terminal interface"
 readme = "README.md"
 license = "Apache-2.0"
@@ -13,10 +13,10 @@ dependencies = [
     "hexaqueue-server",
     "hexaqueue-worker",
     "hexaqueue-workflow",
-    "hexastack-cli>=0.6.0",
-    "hexastack-core>=0.6.0",
-    "hexastack-cqrs>=0.6.0",
-    "hexastack-grpc>=0.6.0",
+    "hexastack-cli>=0.8.0",
+    "hexastack-core>=0.8.0",
+    "hexastack-cqrs>=0.8.0",
+    "hexastack-grpc>=0.8.0",
     "pyyaml>=6.0.2",
     "rich>=13.8.0",
     "typer>=0.15.0",

{hexaqueue_cli-0.4.0 → hexaqueue_cli-0.5.0}/src/hexaqueue_cli/adapters/local.py

@@ -8,6 +8,7 @@ Notes/Architectural Intent:
 from __future__ import annotations
 
 from collections.abc import AsyncIterator
+from pathlib import Path
 from uuid import uuid4
 
 from hexaqueue_cli.domain.models import ClusterStatsReport
@@ -46,7 +47,7 @@ def _check_job_mutation_permission(
 ) -> None:
     """Verify that caller has permission to mutate the job."""
     owner = _extract_job_owner(job)
-    if owner != "default" and owner != user_id and not elevate:
+    if owner != user_id and not elevate:
         msg = (
             f"Permission denied: You are not the owner of job '{job.id}' (owned by '{owner}'). "
             f"To {action_name} this job, explicit administrative elevation (--admin / elevate=true) is required."
@@ -105,7 +106,7 @@ class LocalClientAdapter(ClientPort):
         self, run_id: str, user_id: str = "default", elevate: bool = False
     ) -> RunStatusReport:
         """Cancel run in local in-process controller."""
-        if not elevate and user_id != "default":
+        if not elevate:
             jobs = await self._session.controller.list_jobs()
             run_jobs = [j for j in jobs if j.run_id == run_id]
             for j in run_jobs:
@@ -262,6 +263,22 @@ class LocalClientAdapter(ClientPort):
         checksum = (
             checksum_sha256 if len(checksum_sha256) == 64 else checksum_sha256.zfill(64)
         )
+        staging_uri = f"memory://staging/collateral/{name}"
+        if target_path and Path(target_path).is_file():
+            if ".." in name or "/" in name or "\\" in name or Path(name).is_absolute():
+                raise ValueError(
+                    f"Collateral name '{name}' contains illegal path components."
+                )
+            content = Path(target_path).read_bytes()
+            alloc = await self._session.storage.allocate_scratch(
+                job_id="collateral", size_mb=max(1, len(content) // (1024 * 1024))
+            )
+            mount_path = Path(alloc.mount_path).resolve()
+            dest = (mount_path / name).resolve()
+            if not dest.is_relative_to(mount_path):
+                raise ValueError("Path traversal detected in collateral destination.")
+            dest.write_bytes(content)
+            staging_uri = f"file://{dest}"
         return CollateralBundle(
             id=f"col-{uuid4().hex[:8]}",
             job_id="global",
@@ -271,7 +288,7 @@ class LocalClientAdapter(ClientPort):
             tier=tier,
             kind=kind,
             state=CollateralState.REGISTERED,
-            staging_uri=f"s3://staging/collateral/{name}",
+            staging_uri=staging_uri,
         )
 
     async def create_bastion_session(
@@ -288,13 +305,14 @@ class LocalClientAdapter(ClientPort):
                 "requires explicit administrative elevation (--admin)."
             )
             raise PermissionDeniedError(msg)
-        return PtySessionInfo(
+        req = PtySessionRequest(
             session_id=session_id or f"bastion-{uuid4().hex[:8]}",
             job_id=f"bastion-{node_id}",
             user_id=user_id,
-            pid=99999,
-            is_active=True,
+            roles=["admin", "operator"],
+            command=["/bin/sh"],
         )
+        return await self._session.pty.create_session(req, job_owner=user_id)
 
 
 __all__ = [

{hexaqueue_cli-0.4.0 → hexaqueue_cli-0.5.0}/src/hexaqueue_cli/commands/collateral.py

@@ -78,6 +78,16 @@ def push_collateral_cmd(
     sha256_hash = hashlib.sha256(content).hexdigest()
     size_bytes = len(content)
     asset_name = name or file_path.name
+    if (
+        ".." in asset_name
+        or "/" in asset_name
+        or "\\" in asset_name
+        or Path(asset_name).is_absolute()
+    ):
+        console.print(
+            f"[bold red]Error:[/] Collateral name '{asset_name}' contains illegal path components."
+        )
+        raise typer.Exit(code=1)
 
     resolved_tier = CollateralTier(tier.upper())
     resolved_kind = CollateralKind(kind.upper())
@@ -91,6 +101,7 @@ def push_collateral_cmd(
                 checksum_sha256=sha256_hash,
                 tier=resolved_tier,
                 kind=resolved_kind,
+                target_path=str(file_path),
                 user_id=user,
                 elevate=admin,
             )

{hexaqueue_cli-0.4.0 → hexaqueue_cli-0.5.0}/src/hexaqueue_cli/commands/run.py

@@ -66,6 +66,11 @@ async def _execute_submit_and_watch(
         presenter.render_run_status(report, resolved_fmt)
 
     if not watch:
+        if resolved_fmt in ("table", "rich"):
+            console.print(
+                "[bold yellow]Notice:[/] Local session submitted in detached mode. "
+                "In-process execution will terminate when the process exits. Use --watch to await completion."
+            )
         return
 
     with console.status(f"[bold blue]Executing run {report.run_id}...[/]"):

{hexaqueue_cli-0.4.0 → hexaqueue_cli-0.5.0}/src/hexaqueue_cli/commands/workflow.py

@@ -16,6 +16,7 @@ import typer
 from hexaflow.adapters.storage.sqlite import SqliteStateStore
 from hexaflow.domain.models import WorkflowDefinition
 from hexaflow.dsl.builder import Workflow
+from hexastack_core.adapters.storage import LocalStorageAdapter
 from rich.console import Console
 
 from hexaqueue_cli.adapters.presenter import CliPresenter
@@ -192,8 +193,12 @@ def submit_cmd(
         port = None
     dispatcher = NotificationDispatcher(notification_port=port)
     store = SqliteStateStore(db_path=db_path)
+    artifacts_dir = Path(db_path).parent / "artifacts"
+    artifacts_dir.mkdir(parents=True, exist_ok=True)
+    storage = LocalStorageAdapter(root_dir=artifacts_dir)
     engine = HexaqueueDistributedEngine(
         state_store=store,
+        storage=storage,
         config=config,
         notification_dispatcher=dispatcher,
     )
@@ -274,7 +279,10 @@ def resume_cmd(
     resolved_fmt = resolve_format(format_type)
 
     store = SqliteStateStore(db_path=db_path)
-    engine = HexaqueueDistributedEngine(state_store=store)
+    artifacts_dir = Path(db_path).parent / "artifacts"
+    artifacts_dir.mkdir(parents=True, exist_ok=True)
+    storage = LocalStorageAdapter(root_dir=artifacts_dir)
+    engine = HexaqueueDistributedEngine(state_store=store, storage=storage)
 
     if resolved_fmt in ("table", "rich"):
         console.print(f"[bold yellow]Resuming workflow run:[/] [cyan]{run_id}[/]")
@@ -311,7 +319,10 @@ def abort_cmd(
     workflow = load_workflow_from_target(target)
     resolved_fmt = resolve_format(format_type)
     store = SqliteStateStore(db_path=db_path)
-    engine = HexaqueueDistributedEngine(state_store=store)
+    artifacts_dir = Path(db_path).parent / "artifacts"
+    artifacts_dir.mkdir(parents=True, exist_ok=True)
+    storage = LocalStorageAdapter(root_dir=artifacts_dir)
+    engine = HexaqueueDistributedEngine(state_store=store, storage=storage)
 
     if resolved_fmt in ("table", "rich"):
         console.print(f"[bold red]Aborting workflow run:[/] [cyan]{run_id}[/]")

hexaqueue_cli-0.5.0/src/hexaqueue_cli/domain/models.py

@@ -0,0 +1,11 @@
+"""Domain models for CLI cluster monitoring and statistics.
+
+Notes/Architectural Intent:
+    Defines presentation and reporting payloads for `hq stat`, `hq top`, and `hq nodes`.
+"""
+
+from hexaqueue_core.domain.cqrs import ClusterStatsReport
+
+__all__ = [
+    "ClusterStatsReport",
+]

{hexaqueue_cli-0.4.0 → hexaqueue_cli-0.5.0}/src/hexaqueue_cli/main.py

@@ -7,6 +7,7 @@ Notes/Architectural Intent:
 
 import asyncio
 from pathlib import Path
+from typing import Any
 from uuid import uuid4
 
 import typer
@@ -148,7 +149,8 @@ async def _stream_live_logs(
         async for chunk in client.stream_logs(job_id, follow=True, tail=tail):
             _print_log_chunk(chunk)
     except (asyncio.CancelledError, KeyboardInterrupt):
-        pass
+        # User interruption (Ctrl+C) or coroutine cancellation; exit live log streaming cleanly.
+        return
 
 
 @app.command("logs")
@@ -451,6 +453,16 @@ def top_cmd(
     asyncio.run(_top())
 
 
+def _extract_job_owner(job: Any) -> str:
+    """Extract owner identity from job tags or user attribute."""
+    for tag in getattr(job, "tags", []):
+        if tag.startswith("owner:"):
+            return tag.split(":", 1)[1]
+    if getattr(job, "user", "default") != "default":
+        return job.user
+    return getattr(job, "env", {}).get("HEXAQUEUE_OWNER", "default")
+
+
 @app.command("exec")
 def exec_cmd(
     job_id: str = typer.Argument(..., help="Job ID to execute command in"),
@@ -458,6 +470,9 @@ def exec_cmd(
         ..., help="Command vector to run inside job environment"
     ),
     user: str = typer.Option("default", "--user", "-u", help="Requesting username"),
+    admin: bool = typer.Option(
+        False, "--admin", help="Assert explicit administrative elevation"
+    ),
 ) -> None:
     """Spawn an interactive PTY session inside a running job environment.
 
@@ -465,6 +480,7 @@ def exec_cmd(
         job_id: Target running job identifier.
         command: Command vector to execute in terminal PTY.
         user: Requesting user identity for RBAC validation.
+        admin: Whether explicit administrative elevation is requested.
 
     Notes/Architectural Intent:
         Connects local terminal to remote worker PTY master bridge with RBAC authorization.
@@ -472,15 +488,18 @@ def exec_cmd(
 
     async def _exec() -> None:
         client = LocalClientAdapter()
-        request = PtySessionRequest(
-            session_id=f"pty-{uuid4().hex[:8]}",
-            job_id=job_id,
-            user_id=user,
-            roles=["operator"],
-            command=command,
-        )
         try:
-            session_info = await client.create_pty_session(request, job_owner=user)
+            job = await client.get_job(job_id)
+            job_owner = _extract_job_owner(job)
+            roles = ["operator"] if admin else []
+            request = PtySessionRequest(
+                session_id=f"pty-{uuid4().hex[:8]}",
+                job_id=job_id,
+                user_id=user,
+                roles=roles,
+                command=command,
+            )
+            session_info = await client.create_pty_session(request, job_owner=job_owner)
             console.print(
                 f"[bold green]✓[/] Attached PTY session '{session_info.session_id}' "
                 f"to job '{job_id}' (pid: {session_info.pid})"
@@ -498,12 +517,16 @@ def exec_cmd(
 def attach_cmd(
     job_id: str = typer.Argument(..., help="Job ID to attach interactive shell to"),
     user: str = typer.Option("default", "--user", "-u", help="Requesting username"),
+    admin: bool = typer.Option(
+        False, "--admin", help="Assert explicit administrative elevation"
+    ),
 ) -> None:
     """Attach an interactive bash shell to a running job.
 
     Args:
         job_id: Target running job identifier.
         user: Requesting user identity for RBAC validation.
+        admin: Whether explicit administrative elevation is requested.
 
     Notes/Architectural Intent:
         Convenience alias launching an interactive bash terminal inside the target job.
@@ -511,15 +534,18 @@ def attach_cmd(
 
     async def _attach() -> None:
         client = LocalClientAdapter()
-        request = PtySessionRequest(
-            session_id=f"pty-{uuid4().hex[:8]}",
-            job_id=job_id,
-            user_id=user,
-            roles=["operator"],
-            command=["/bin/bash"],
-        )
         try:
-            session_info = await client.create_pty_session(request, job_owner=user)
+            job = await client.get_job(job_id)
+            job_owner = _extract_job_owner(job)
+            roles = ["operator"] if admin else []
+            request = PtySessionRequest(
+                session_id=f"pty-{uuid4().hex[:8]}",
+                job_id=job_id,
+                user_id=user,
+                roles=roles,
+                command=["/bin/bash"],
+            )
+            session_info = await client.create_pty_session(request, job_owner=job_owner)
             console.print(
                 f"[bold green]✓[/] Attached shell session '{session_info.session_id}' "
                 f"to job '{job_id}' (pid: {session_info.pid})"

hexaqueue_cli-0.4.0/src/hexaqueue_cli/domain/models.py

@@ -1,47 +0,0 @@
-"""Domain models for CLI cluster monitoring and statistics.
-
-Notes/Architectural Intent:
-    Defines presentation and reporting payloads for `hq stat`, `hq top`, and `hq nodes`.
-"""
-
-from datetime import UTC, datetime
-
-from pydantic import BaseModel, ConfigDict, Field
-
-
-class ClusterStatsReport(BaseModel):
-    """Aggregate cluster state, backlog, and worker capacity metrics.
-
-    Args:
-        total_runs: Count of active/historical runs.
-        total_jobs: Total jobs registered in cluster.
-        running_jobs: Jobs actively executing in compute worker slots.
-        pending_jobs: Jobs queued and awaiting eligible compute slots.
-        blocked_jobs: Jobs blocked on dependencies or administrative holds.
-        completed_jobs: Jobs terminated successfully.
-        failed_jobs: Jobs terminated with failure or error.
-        active_workers: Count of active worker daemons.
-        timestamp: Report generation timestamp.
-    """
-
-    model_config = ConfigDict(frozen=True, extra="forbid")
-
-    active_workers: int = Field(
-        default=1, ge=0, description="Active worker daemons count"
-    )
-    blocked_jobs: int = Field(default=0, ge=0, description="Blocked jobs count")
-    completed_jobs: int = Field(default=0, ge=0, description="Completed jobs count")
-    failed_jobs: int = Field(default=0, ge=0, description="Failed jobs count")
-    pending_jobs: int = Field(default=0, ge=0, description="Pending jobs count")
-    running_jobs: int = Field(default=0, ge=0, description="Running jobs count")
-    timestamp: datetime = Field(
-        default_factory=lambda: datetime.now(UTC),
-        description="Stats snapshot timestamp",
-    )
-    total_jobs: int = Field(default=0, ge=0, description="Total jobs count")
-    total_runs: int = Field(default=0, ge=0, description="Total runs count")
-
-
-__all__ = [
-    "ClusterStatsReport",
-]