trap-cli 0.0.7__tar.gz → 0.0.8__tar.gz

{trap_cli-0.0.7 → trap_cli-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trap-cli
-Version: 0.0.7
+Version: 0.0.8
 Summary: tp — non-invasive CLI testing framework for AI workflows. Submits results to trapstreet.run.
 Project-URL: Homepage, https://trapstreet.run
 Project-URL: Repository, https://github.com/trapstreet/trap

{trap_cli-0.0.7 → trap_cli-0.0.8}/src/trap/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.0.7'
-__version_tuple__ = version_tuple = (0, 0, 7)
+__version__ = version = '0.0.8'
+__version_tuple__ = version_tuple = (0, 0, 8)
 
 __commit_id__ = commit_id = None

{trap_cli-0.0.7 → trap_cli-0.0.8}/src/trap/cli/__init__.py

@@ -13,12 +13,11 @@ from trap import __version__
 from trap.auth import DEFAULT_SERVER, ApiClient, ApiError, AuthStore
 from trap.cli._auth import auth_app
 from trap.cli._console import _die, _env_truthy, console, err_console
-from trap.display import CaseProgress, render_submit_result
+from trap.display import CaseProgress, OutputFormat, render_submit_result, renderer_factory
 from trap.environment import EnvironmentDetector
 from trap.git_ops import GitOpsError, LocalRepo, ParsedGitUrl
 from trap.loader import ConfigError, TrapLoader, TraptaskLoader
 from trap.models import Provenance, ReportData
-from trap.report import OutputFormat, renderer_factory
 from trap.runner import TaskRunner
 from trap.workspace import SolutionIdentity, Workspace
 
@@ -50,13 +49,13 @@ def _main(
 def _no_report(workspace: Workspace, error: FileNotFoundError) -> typer.Exit:
     """Exit for a report miss, with advice matching the likely cause: an empty
     workspace means the user never ran; existing runs under *other* solution keys
-    mean a cwd / --solution mismatch, where re-running would just miss again."""
+    mean a cwd / SOLUTION mismatch, where re-running would just miss again."""
     msg = str(error)
     if keys := workspace.solution_keys():
         msg += (
             "\nsolutions with runs in this workspace: "
             + ", ".join(keys)
-            + "\ncheck that --solution (and the cwd) match the ones used for [bold]tp run[/bold]"
+            + "\ncheck that SOLUTION (and the cwd) match the ones used for [bold]tp run[/bold]"
         )
     else:
         msg += ". Run [bold]tp run[/bold] first."
@@ -120,14 +119,19 @@ def _confirm_unanchored(provenance: Provenance, *, allow: bool) -> None:
 
 @app.command()
 def run(
-    task: Annotated[str | None, typer.Argument()] = None,
     solution: Annotated[
         str | None,
-        typer.Option("--solution", help="Solution to run: a local path or a git+ URL (default: cwd)."),
+        typer.Argument(help="Solution to run: a local path or a git+ URL (default: cwd)."),
     ] = None,
+    task: Annotated[
+        str | None,
+        typer.Option("--task", help="Task alias from trap.yaml (default: the first task)."),
+    ] = None,
+    workspace: Annotated[Path, typer.Option("--workspace", "-w")] = Path(Workspace.DEFAULT_DIRNAME),
+    output: Annotated[OutputFormat, typer.Option("--output", "-o")] = OutputFormat.rich,
     clone_to: Annotated[
         Path | None,
-        typer.Option("--clone-to", help="Where to clone a git+ URL --solution (default: ./<repo>)."),
+        typer.Option("--clone-to", help="Where to clone a git+ URL SOLUTION (default: ./<repo>)."),
     ] = None,
     trust_remote: Annotated[
         bool,
@@ -146,7 +150,6 @@ def run(
         ),
     ] = False,
     tags: Annotated[list[str] | None, typer.Option("--tag", "-t")] = None,
-    output: Annotated[OutputFormat, typer.Option("--output", "-o")] = OutputFormat.rich,
     fail_fast: Annotated[bool, typer.Option("--fail-fast")] = False,
     setup_solution: Annotated[
         bool,
@@ -162,7 +165,6 @@ def run(
             help="Force-run the task's setup_cmd even when no remote pull brought new code.",
         ),
     ] = False,
-    workspace: Annotated[Path, typer.Option("--workspace", "-w")] = Path(Workspace.DEFAULT_DIRNAME),
     environment: Annotated[
         bool,
         typer.Option(
@@ -180,11 +182,11 @@ def run(
 ) -> None:
     """Run a task against a solution.
 
-    --solution is the solution to run: a local path, or a git+ URL to clone
-    into ./<repo> (or --clone-to). Omit it to use the trap.yaml in the cwd.
+    SOLUTION is a local path, or a git+ URL to clone into ./<repo> (or
+    --clone-to). Omit it to use the trap.yaml in the cwd.
     """
     # Gate trap's auto-download-and-run of any remote source before it happens — once
-    # for a remote --solution, once for a remote task source (resolved from trap.yaml).
+    # for a remote SOLUTION, once for a remote task source (resolved from trap.yaml).
     trust = trust_remote or _env_truthy("TRAP_TRUST_REMOTE")
     if solution is not None and ParsedGitUrl.looks_remote(solution):
         _confirm_remote(solution, trust=trust)
@@ -271,14 +273,17 @@ def run(
 
 @app.command()
 def report(
-    task: Annotated[str | None, typer.Argument()] = None,
-    run: Annotated[str, typer.Argument()] = "latest",
     solution: Annotated[
         str | None,
-        typer.Option("--solution", help="Local solution path holding trap.yaml (default: cwd)."),
+        typer.Argument(help="Local solution path holding trap.yaml (default: cwd)."),
     ] = None,
-    output: Annotated[OutputFormat, typer.Option("--output", "-o")] = OutputFormat.rich,
+    task: Annotated[
+        str | None,
+        typer.Option("--task", help="Task alias from trap.yaml (default: the first task)."),
+    ] = None,
+    run: Annotated[str, typer.Option("--run", "-r", help="Which run to display.")] = "latest",
     workspace: Annotated[Path, typer.Option("--workspace", "-w")] = Path(Workspace.DEFAULT_DIRNAME),
+    output: Annotated[OutputFormat, typer.Option("--output", "-o")] = OutputFormat.rich,
 ) -> None:
     """Display a report for a task (defaults to latest run)."""
     try:
@@ -295,19 +300,20 @@ def report(
 
 @app.command()
 def submit(
+    solution: Annotated[
+        str | None,
+        typer.Argument(help="Local solution path holding trap.yaml (default: cwd)."),
+    ] = None,
     task: Annotated[
         str | None,
-        typer.Argument(
-            help="Task name (defaults to first task in trap.yaml). "
+        typer.Option(
+            "--task",
+            help="Task alias from trap.yaml (default: the first task). "
             "Used as both the local run dir and the trapstreet task_id.",
         ),
     ] = None,
-    solution: Annotated[
-        str | None,
-        typer.Option("--solution", help="Local solution path holding trap.yaml (default: cwd)."),
-    ] = None,
-    workspace: Annotated[Path, typer.Option("--workspace", "-w")] = Path(Workspace.DEFAULT_DIRNAME),
     run: Annotated[str, typer.Option("--run", "-r", help="Which run to upload.")] = "latest",
+    workspace: Annotated[Path, typer.Option("--workspace", "-w")] = Path(Workspace.DEFAULT_DIRNAME),
     allow_unanchored: Annotated[
         bool,
         typer.Option(

trap_cli-0.0.8/src/trap/display/__init__.py

@@ -0,0 +1,19 @@
+from trap.display.progress import CaseProgress
+from trap.display.report import (
+    BaseRenderer,
+    JsonRenderer,
+    OutputFormat,
+    RichRenderer,
+    renderer_factory,
+)
+from trap.display.submit import render_submit_result
+
+__all__ = [
+    "BaseRenderer",
+    "CaseProgress",
+    "JsonRenderer",
+    "OutputFormat",
+    "RichRenderer",
+    "render_submit_result",
+    "renderer_factory",
+]

trap_cli-0.0.7/src/trap/report/rich.py → trap_cli-0.0.8/src/trap/display/report.py

@@ -1,6 +1,10 @@
+"""Report renderers: turn a ReportData into terminal output (rich table or JSON)."""
+
 from __future__ import annotations
 
+import enum
 import json
+import sys
 
 from rich import box
 from rich.console import Console
@@ -10,7 +14,21 @@ from rich.table import Table
 from rich.text import Text
 
 from trap.models import CaseResult, ReportData
-from trap.report.base import BaseRenderer
+
+
+class OutputFormat(enum.StrEnum):
+    rich = "rich"
+    json = "json"
+
+
+class BaseRenderer:
+    def render(self, data: ReportData) -> None:
+        raise NotImplementedError
+
+
+class JsonRenderer(BaseRenderer):
+    def render(self, data: ReportData) -> None:
+        sys.stdout.write(data.model_dump_json(indent=2) + "\n")
 
 
 class RichRenderer(BaseRenderer):
@@ -114,3 +132,7 @@ class RichRenderer(BaseRenderer):
     def render(self, data: ReportData) -> None:
         self.console.print(self._build_summary(data))
         self.console.print(self._build_table(data))
+
+
+def renderer_factory(fmt: OutputFormat) -> BaseRenderer:
+    return {OutputFormat.rich: RichRenderer, OutputFormat.json: JsonRenderer}[fmt]()

trap_cli-0.0.7/src/trap/display/__init__.py

@@ -1,4 +0,0 @@
-from trap.display.progress import CaseProgress
-from trap.display.submit import render_submit_result
-
-__all__ = ["CaseProgress", "render_submit_result"]

trap_cli-0.0.7/src/trap/report/__init__.py

@@ -1,18 +0,0 @@
-from __future__ import annotations
-
-import enum
-
-from trap.report.base import BaseRenderer
-from trap.report.json import JsonRenderer
-from trap.report.rich import RichRenderer
-
-__all__ = ["BaseRenderer", "JsonRenderer", "OutputFormat", "RichRenderer", "renderer_factory"]
-
-
-class OutputFormat(enum.StrEnum):
-    rich = "rich"
-    json = "json"
-
-
-def renderer_factory(fmt: OutputFormat) -> BaseRenderer:
-    return {OutputFormat.rich: RichRenderer, OutputFormat.json: JsonRenderer}[fmt]()

trap_cli-0.0.7/src/trap/report/base.py

@@ -1,8 +0,0 @@
-from __future__ import annotations
-
-from trap.models import ReportData
-
-
-class BaseRenderer:
-    def render(self, data: ReportData) -> None:
-        raise NotImplementedError

trap_cli-0.0.7/src/trap/report/json.py

@@ -1,11 +0,0 @@
-from __future__ import annotations
-
-import sys
-
-from trap.models import ReportData
-from trap.report.base import BaseRenderer
-
-
-class JsonRenderer(BaseRenderer):
-    def render(self, data: ReportData) -> None:
-        sys.stdout.write(data.model_dump_json(indent=2) + "\n")