trap-cli 0.0.3__tar.gz → 0.0.5__tar.gz

{trap_cli-0.0.3 → trap_cli-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trap-cli
-Version: 0.0.3
+Version: 0.0.5
 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
@@ -27,7 +27,6 @@ Requires-Dist: py-cpuinfo>=9.0.0
 Requires-Dist: pydantic>=2.0
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: rich>=13.0
-Requires-Dist: tokencost>=0.1.26
 Requires-Dist: typer>=0.12
 Description-Content-Type: text/markdown
 

{trap_cli-0.0.3 → trap_cli-0.0.5}/pyproject.toml

@@ -29,7 +29,6 @@ dependencies = [
     "pyyaml>=6.0",
     "rich>=13.0",
     "httpx>=0.27",
-    "tokencost>=0.1.26",
     "gitpython>=3.1",
     "psutil>=7.2.2",
     "py-cpuinfo>=9.0.0",

{trap_cli-0.0.3 → trap_cli-0.0.5}/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.3'
-__version_tuple__ = version_tuple = (0, 0, 3)
+__version__ = version = '0.0.5'
+__version_tuple__ = version_tuple = (0, 0, 5)
 
 __commit_id__ = commit_id = None

{trap_cli-0.0.3 → trap_cli-0.0.5}/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.3 → trap_cli-0.0.5}/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.5/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.5/src/trap/cost/calculator.py

@@ -0,0 +1,58 @@
+"""Cost calculation for LLM token usage.
+
+Isolated so this logic can be moved server-side without touching the proxy infrastructure.
+The only public symbol is :func:`calculate_call_cost`.
+
+Prices are maintained here rather than pulled from a third-party table: the previous
+dependency (tokencost) lagged behind provider releases, silently pricing current models
+at 0 or at a stale predecessor's rate. An explicit table with a NaN fallback keeps the
+failure mode honest — an unknown cost is reported as unknown, never as a wrong number.
+"""
+
+from __future__ import annotations
+
+import math
+
+# USD per million tokens (input, output), keyed by model-id prefix so one entry covers
+# both a version alias ("claude-haiku-4-5") and the dated full id the API reports
+# ("claude-haiku-4-5-20251001"). First match wins: keep more-specific prefixes
+# ("gpt-5.5-pro") ahead of the prefixes they extend ("gpt-5.5").
+_PRICES_PER_MTOK: list[tuple[str, float, float]] = [
+    # Anthropic
+    ("claude-fable-5", 10.0, 50.0),
+    ("claude-mythos-5", 10.0, 50.0),
+    # Introductory pricing through 2026-08-31; reverts to 3.0 / 15.0 after.
+    ("claude-sonnet-5", 2.0, 10.0),
+    ("claude-opus-4-8", 5.0, 25.0),
+    ("claude-opus-4-7", 5.0, 25.0),
+    ("claude-opus-4-6", 5.0, 25.0),
+    ("claude-opus-4-5", 5.0, 25.0),
+    ("claude-opus-4-1", 15.0, 75.0),
+    ("claude-sonnet-4-6", 3.0, 15.0),
+    ("claude-sonnet-4-5", 3.0, 15.0),
+    ("claude-haiku-4-5", 1.0, 5.0),
+    # OpenAI
+    ("gpt-5.6-sol", 5.0, 30.0),
+    ("gpt-5.6-terra", 2.5, 15.0),
+    ("gpt-5.6-luna", 1.0, 6.0),
+    ("gpt-5.5-pro", 30.0, 180.0),
+    ("gpt-5.5", 5.0, 30.0),
+    ("gpt-5.4-pro", 30.0, 180.0),
+    ("gpt-5.4-mini", 0.75, 4.5),
+    ("gpt-5.4-nano", 0.2, 1.25),
+    ("gpt-5.4", 2.5, 15.0),
+]
+
+
+def calculate_call_cost(prompt_tokens: int, completion_tokens: int, model: str | None) -> float:
+    """Return the USD cost for one API call.
+
+    Returns NaN when the model is unknown or absent from the pricing table — an
+    unknown cost is not a zero cost (pydantic serialises the NaN as JSON null)."""
+    if model is None:
+        return math.nan
+    name = model.lower()
+    for prefix, input_per_mtok, output_per_mtok in _PRICES_PER_MTOK:
+        if name.startswith(prefix):
+            return (prompt_tokens * input_per_mtok + completion_tokens * output_per_mtok) / 1_000_000
+    return math.nan

{trap_cli-0.0.3 → trap_cli-0.0.5}/src/trap/cost/providers.py

@@ -23,7 +23,12 @@ class _ProtocolStyle(enum.StrEnum):
             case (_ProtocolStyle.OPENAI_COMPATIBLE, True):
                 return self._parse_openai_style_sse(body.decode("utf-8", errors="replace"))
             case (_ProtocolStyle.OPENAI_COMPATIBLE, False):
-                return self._parse_json(body, "prompt_tokens", "completion_tokens")
+                parsed = self._parse_json(body, "prompt_tokens", "completion_tokens")
+                if parsed[0] or parsed[1]:
+                    return parsed
+                # The OpenAI Responses API names its usage fields input_/output_tokens
+                # (like Anthropic), not the Chat Completions prompt_/completion_tokens.
+                return self._parse_json(body, "input_tokens", "output_tokens")
             case _:  # pragma: no cover - exhaustive over the two styles above
                 raise ValueError(f"Unsupported protocol style: {self!r}")
 

{trap_cli-0.0.3 → trap_cli-0.0.5}/src/trap/cost/proxy.py

@@ -65,7 +65,7 @@ class CostProxy:
     ) -> None:
         if not (prompt_tokens or completion_tokens):
             return
-        call_cost = _calc_cost(prompt_tokens, completion_tokens, model) if model else 0.0
+        call_cost = _calc_cost(prompt_tokens, completion_tokens, model)
         with self._lock:
             key = (provider, model)
             entry = self._cost_buckets.get(key)

trap_cli-0.0.3/src/trap/cost/calculator.py

@@ -1,41 +0,0 @@
-"""Cost calculation for LLM token usage.
-
-Isolated so this logic can be moved server-side without touching the proxy infrastructure.
-The only public symbol is :func:`calculate_call_cost`.
-"""
-
-from __future__ import annotations
-
-from tokencost import TOKEN_COSTS as _TOKEN_COSTS  # type: ignore[import-untyped]
-from tokencost import calculate_cost_by_tokens as _calc_cost  # type: ignore[import-untyped]
-from tokencost import register_model_pattern as _register_pattern  # type: ignore[import-untyped]
-
-
-def _register_anthropic_version_patterns() -> None:
-    # Anthropic now returns version-based names (e.g. "claude-sonnet-4-6") but tokencost only
-    # has date-based entries (e.g. "claude-sonnet-4-20250514"). Register wildcard patterns so
-    # calculate_cost_by_tokens can resolve them via _normalize_model_for_pricing.
-    for pattern, canonical in [
-        ("claude-sonnet-4-*", "claude-sonnet-4-20250514"),
-        ("claude-opus-4-*", "claude-opus-4-20250514"),
-    ]:
-        entry = _TOKEN_COSTS.get(canonical)
-        if entry:  # pragma: no branch - both canonicals ship in tokencost
-            _register_pattern(
-                pattern,
-                float(entry["input_cost_per_token"]) * 1000,
-                float(entry["output_cost_per_token"]) * 1000,
-            )
-
-
-_register_anthropic_version_patterns()
-
-
-def calculate_call_cost(prompt_tokens: int, completion_tokens: int, model: str) -> float:
-    """Return the USD cost for one API call. Returns 0.0 if the model is not in the pricing table."""
-    try:
-        return float(
-            _calc_cost(prompt_tokens, model, "input") + _calc_cost(completion_tokens, model, "output")
-        )
-    except KeyError:
-        return 0.0