trap-cli 0.0.2__tar.gz → 0.0.4__tar.gz

{trap_cli-0.0.2 → trap_cli-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trap-cli
-Version: 0.0.2
+Version: 0.0.4
 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.2 → trap_cli-0.0.4}/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.2'
-__version_tuple__ = version_tuple = (0, 0, 2)
+__version__ = version = '0.0.4'
+__version_tuple__ = version_tuple = (0, 0, 4)
 
 __commit_id__ = commit_id = None

{trap_cli-0.0.2 → trap_cli-0.0.4}/src/trap/auth/client.py

@@ -45,7 +45,8 @@ class ApiClient:
 
     def submit(self, report_path: Path) -> dict[str, Any]:
         # Content-addressed ingest: the task identity travels inside the report
-        # (provenance.task.{repo,commit}), not the URL — so no task_id path segment.
+        # (provenance.task.{repo,commit,subdirectory}), not the URL — so no task_id
+        # path segment.
         try:
             resp = self._client.post("/api/submit", content=report_path.read_bytes())
             resp.raise_for_status()

{trap_cli-0.0.2 → trap_cli-0.0.4}/src/trap/cli/__init__.py

@@ -8,10 +8,11 @@ from pathlib import Path
 from typing import Annotated
 
 import typer
-from rich.console import Console
 
+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.environment import EnvironmentDetector
 from trap.git_ops import GitOpsError, LocalRepo, ParsedGitUrl
@@ -22,19 +23,27 @@ from trap.runner import TaskRunner
 
 app = typer.Typer(help="AI prompt / agent / workflow / testing framework.")
 app.add_typer(auth_app, name="auth")
-console = Console()
-# Warnings go to stderr so `-o json` stdout stays machine-parseable.
-err_console = Console(stderr=True)
 
 
-def _die(msg: object) -> typer.Exit:
-    """Print an error and return an Exit(2) to raise."""
-    console.print(f"[red]error[/red]: {msg}")
-    return typer.Exit(code=2)
+def _version_callback(value: bool) -> None:
+    if value:
+        console.print(f"tp {__version__}")
+        raise typer.Exit()
 
 
-def _env_truthy(name: str) -> bool:
-    return os.environ.get(name, "").strip().lower() in ("1", "true", "yes", "on")
+@app.callback()
+def _main(
+    version: Annotated[
+        bool,
+        typer.Option(
+            "--version",
+            help="Show the trap version and exit.",
+            callback=_version_callback,
+            is_eager=True,
+        ),
+    ] = False,
+) -> None:
+    """AI prompt / agent / workflow / testing framework."""
 
 
 def _confirm_remote(url: str, *, trust: bool) -> None:

{trap_cli-0.0.2 → trap_cli-0.0.4}/src/trap/cli/_auth.py

@@ -4,12 +4,11 @@ import sys
 from typing import Annotated
 
 import typer
-from rich.console import Console
 
 from trap.auth import DEFAULT_SERVER, ApiClient, ApiError, AuthStore, BrowserProvider, TokenProvider
+from trap.cli._console import _die, console
 
 auth_app = typer.Typer(help="Manage authentication.")
-console = Console()
 
 
 @auth_app.command("login")
@@ -50,8 +49,7 @@ def auth_login(
         console.print(provider.pre_message)
         auth_data = provider.acquire()
     except (ValueError, TimeoutError) as e:
-        console.print(f"[red]error[/red]: {e}")
-        raise typer.Exit(code=2) from None
+        raise _die(e) from None
 
     path = AuthStore().save(auth_data)
     console.print(

trap_cli-0.0.4/src/trap/cli/_console.py

@@ -0,0 +1,22 @@
+"""Shared CLI console objects and small helpers used across command modules."""
+
+from __future__ import annotations
+
+import os
+
+import typer
+from rich.console import Console
+
+console = Console()
+# Warnings go to stderr so `-o json` stdout stays machine-parseable.
+err_console = Console(stderr=True)
+
+
+def _die(msg: object) -> typer.Exit:
+    """Print an error and return an Exit(2) to raise."""
+    console.print(f"[red]error[/red]: {msg}")
+    return typer.Exit(code=2)
+
+
+def _env_truthy(name: str) -> bool:
+    return os.environ.get(name, "").strip().lower() in ("1", "true", "yes", "on")

{trap_cli-0.0.2 → trap_cli-0.0.4}/src/trap/git_ops/local.py

@@ -58,13 +58,26 @@ class LocalRepo:
         except Exception:
             return "git probe failed"
 
+    @property
+    def subdirectory(self) -> str | None:
+        """Opened path relative to the repo root, None at the root (or in a bare repo)."""
+        root = self.repo.working_tree_dir
+        if root is None:
+            return None
+        rel = self.path.resolve().relative_to(Path(root).resolve())
+        return rel.as_posix() if rel != Path(".") else None
+
     def provenance(self) -> GitProvenance:
-        """{repo, commit} for a clean checkout with an origin, else empty with `issue`
-        naming why — we claim nothing about a run that isn't reproducible."""
+        """{repo, commit, subdirectory} for a clean checkout with an origin, else empty
+        with `issue` naming why — we claim nothing about a run that isn't reproducible."""
         issue = self.provenance_issue()
         if issue is not None:
             return GitProvenance(issue=issue)
-        return GitProvenance(repo=self.origin_normalised_url, commit=self.repo.head.commit.hexsha)
+        return GitProvenance(
+            repo=self.origin_normalised_url,
+            commit=self.repo.head.commit.hexsha,
+            subdirectory=self.subdirectory,
+        )
 
     @classmethod
     def provenance_of(cls, path: Path) -> GitProvenance:

{trap_cli-0.0.2 → trap_cli-0.0.4}/src/trap/models/provenance.py

@@ -4,12 +4,16 @@ from pydantic import BaseModel, Field
 
 
 class GitProvenance(BaseModel):
-    """Git origin of one checkout: {repo, commit}. Both None when the tree isn't a
-    clean, remote-backed git repo — `issue` then names why (see
-    LocalRepo.provenance_issue). Anchored checkouts carry no issue."""
+    """Git origin of one checkout: {repo, commit, subdirectory}. repo and commit are
+    None when the tree isn't a clean, remote-backed git repo — `issue` then names why
+    (see LocalRepo.provenance_issue). Anchored checkouts carry no issue.
+
+    `subdirectory` locates the checkout within the repo (None at the root), so two
+    solutions or tasks living in different subdirectories of one repo stay distinct."""
 
     repo: str | None = None
     commit: str | None = None
+    subdirectory: str | None = None
     issue: str | None = None
 
 

{trap_cli-0.0.2 → trap_cli-0.0.4}/src/trap/models/report.py

@@ -28,6 +28,9 @@ class ReportData(BaseModel):
     started_at_utc: str
     finished_at_utc: str
 
+    # Leaderboard identity the solution author chose in trap.yaml (`name`); None →
+    # the server auto-assigns one.
+    solution_name: str | None = None
     # Engine identity (model/framework). Self-reported from trap.yaml today, but the
     # website consumes it from the report — never from trap.yaml directly — precisely
     # because the source may change: a future version is expected to derive this by
@@ -56,6 +59,7 @@ class ReportData(BaseModel):
             grader_metrics=grader_metrics,
             started_at_utc=started_at_utc.isoformat(timespec="seconds"),
             finished_at_utc=finished_at_utc.isoformat(timespec="seconds"),
+            solution_name=trap_config.name,
             profile=trap_config.profile,
             environment=environment,
         )