metergraph 0.3.0__tar.gz → 0.3.2__tar.gz

{metergraph-0.3.0 → metergraph-0.3.2}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: metergraph
-Version: 0.3.0
+Version: 0.3.2
 Summary: Fire-and-forget LLM spend capture for Metergraph
 Author: Pioneer Square Labs
 License-Expression: Apache-2.0
 Project-URL: Homepage, https://www.metergraph.dev/
 Project-URL: Repository, https://github.com/PioneerSquareLabs/metergraphsdk
 Project-URL: Issues, https://github.com/PioneerSquareLabs/metergraphsdk/issues
-Keywords: llm,observability,openai,anthropic,gemini,cost-tracking
+Keywords: llm,observability,openai,anthropic,gemini,vercel-ai-gateway,cost-tracking
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
@@ -21,7 +21,8 @@ Requires-Dist: google-genai>=1; extra == "dev"
 
 # metergraph (Python)
 
-Zero-runtime-dependency capture for OpenAI, Anthropic, and Gemini clients.
+Zero-runtime-dependency capture for OpenAI, Anthropic, Gemini, and Python
+Vercel AI Gateway clients.
 `wrap()` initializes capture from the environment, so setup is one line per
 client; call `metergraph.init(...)` before the first `wrap()` only to pass
 options in code.
@@ -51,6 +52,31 @@ metergraph.record_outcome(
 )
 ```
 
+Vercel's supported Python surface is AI Gateway through the OpenAI or
+Anthropic SDK. Point either client at the public gateway and `wrap()` detects
+it automatically:
+
+```python
+import os
+import metergraph
+from openai import OpenAI
+
+gateway = metergraph.wrap(OpenAI(
+    api_key=os.getenv("AI_GATEWAY_API_KEY") or os.getenv("VERCEL_OIDC_TOKEN"),
+    base_url="https://ai-gateway.vercel.sh/v1",
+))
+
+gateway.chat.completions.create(
+    model="anthropic/claude-sonnet-4.6",
+    messages=[{"role": "user", "content": "Hello"}],
+)
+```
+
+Creator-qualified model IDs are normalized for gateway catalog pricing. Sync,
+async, streaming, tool calls, and OpenAI Responses API calls are captured. Use
+`metergraph.wrap(client, provider="vercel")` only when a compatible client is
+behind a custom gateway URL that cannot be detected automatically.
+
 Configuration:
 
 - `METERGRAPH_APP_TOKEN` — required bearer token
@@ -101,6 +127,9 @@ Instrument this codebase's LLM API costs with the `metergraph` PyPI package
 (https://github.com/PioneerSquareLabs/metergraphsdk): pip install metergraph,
 then wrap every OpenAI()/AsyncOpenAI(), Anthropic()/AsyncAnthropic(), and
 genai.Client() construction in place, e.g. client = metergraph.wrap(OpenAI()).
+OpenAI or Anthropic clients pointed at https://ai-gateway.vercel.sh are Vercel
+AI Gateway clients and are detected automatically; keep their creator/model ID
+and AI_GATEWAY_API_KEY / VERCEL_OIDC_TOKEN configuration unchanged.
 wrap() returns the same client and initializes itself from the environment:
 METERGRAPH_APP_TOKEN is required (capture is silently off without it) and
 METERGRAPH_INGEST_URL is only for self-hosted servers. Add both to

{metergraph-0.3.0 → metergraph-0.3.2}/README.md

@@ -1,6 +1,7 @@
 # metergraph (Python)
 
-Zero-runtime-dependency capture for OpenAI, Anthropic, and Gemini clients.
+Zero-runtime-dependency capture for OpenAI, Anthropic, Gemini, and Python
+Vercel AI Gateway clients.
 `wrap()` initializes capture from the environment, so setup is one line per
 client; call `metergraph.init(...)` before the first `wrap()` only to pass
 options in code.
@@ -30,6 +31,31 @@ metergraph.record_outcome(
 )
 ```
 
+Vercel's supported Python surface is AI Gateway through the OpenAI or
+Anthropic SDK. Point either client at the public gateway and `wrap()` detects
+it automatically:
+
+```python
+import os
+import metergraph
+from openai import OpenAI
+
+gateway = metergraph.wrap(OpenAI(
+    api_key=os.getenv("AI_GATEWAY_API_KEY") or os.getenv("VERCEL_OIDC_TOKEN"),
+    base_url="https://ai-gateway.vercel.sh/v1",
+))
+
+gateway.chat.completions.create(
+    model="anthropic/claude-sonnet-4.6",
+    messages=[{"role": "user", "content": "Hello"}],
+)
+```
+
+Creator-qualified model IDs are normalized for gateway catalog pricing. Sync,
+async, streaming, tool calls, and OpenAI Responses API calls are captured. Use
+`metergraph.wrap(client, provider="vercel")` only when a compatible client is
+behind a custom gateway URL that cannot be detected automatically.
+
 Configuration:
 
 - `METERGRAPH_APP_TOKEN` — required bearer token
@@ -80,6 +106,9 @@ Instrument this codebase's LLM API costs with the `metergraph` PyPI package
 (https://github.com/PioneerSquareLabs/metergraphsdk): pip install metergraph,
 then wrap every OpenAI()/AsyncOpenAI(), Anthropic()/AsyncAnthropic(), and
 genai.Client() construction in place, e.g. client = metergraph.wrap(OpenAI()).
+OpenAI or Anthropic clients pointed at https://ai-gateway.vercel.sh are Vercel
+AI Gateway clients and are detected automatically; keep their creator/model ID
+and AI_GATEWAY_API_KEY / VERCEL_OIDC_TOKEN configuration unchanged.
 wrap() returns the same client and initializes itself from the environment:
 METERGRAPH_APP_TOKEN is required (capture is silently off without it) and
 METERGRAPH_INGEST_URL is only for self-hosted servers. Add both to

{metergraph-0.3.0 → metergraph-0.3.2}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "metergraph"
-version = "0.3.0"
+version = "0.3.2"
 description = "Fire-and-forget LLM spend capture for Metergraph"
 readme = "README.md"
 requires-python = ">=3.10"
 license = "Apache-2.0"
 authors = [{ name = "Pioneer Square Labs" }]
-keywords = ["llm", "observability", "openai", "anthropic", "gemini", "cost-tracking"]
+keywords = ["llm", "observability", "openai", "anthropic", "gemini", "vercel-ai-gateway", "cost-tracking"]
 classifiers = [
     "Intended Audience :: Developers",
     "Topic :: Software Development :: Libraries :: Python Modules",

{metergraph-0.3.0 → metergraph-0.3.2}/src/metergraph/__init__.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import atexit
 import logging
+import math
 import os
 import uuid
 from datetime import datetime, timezone
@@ -115,10 +116,13 @@ def init(
 
 
 def wrap(client: Any, *, provider: str | None = None) -> Any:
-    """Wrap an OpenAI, Anthropic, or Google client for capture.
+    """Wrap an OpenAI, Anthropic, Google, or Vercel AI Gateway client.
 
     Calls init() automatically, so with env-var configuration this is the
-    only setup line needed. Call init(...) first to pass options in code.
+    only setup line needed. OpenAI and Anthropic clients using Vercel's public
+    AI Gateway URL are detected automatically; pass ``provider="vercel"`` to
+    force gateway handling for a compatible client with a custom URL. Call
+    init(...) first to pass Metergraph options in code.
     """
     init()
     return _wrap(client, provider=provider)
@@ -154,26 +158,33 @@ def record_outcome(
     event_id = str(event_id or uuid.uuid4()).strip()[:128]
     try:
         feedback_score = float(feedback_score) if feedback_score is not None else None
-        turns_to_resolution = (
-            int(turns_to_resolution) if turns_to_resolution is not None else None
-        )
         edit_distance_ratio = (
             float(edit_distance_ratio) if edit_distance_ratio is not None else None
         )
-        regeneration_count = (
-            int(regeneration_count) if regeneration_count is not None else None
-        )
     except (TypeError, ValueError, OverflowError):
         return False
     if not route_name or not model or not session_key or not event_id:
         return False
-    if feedback_score is not None and not -1 <= feedback_score <= 1:
+    if feedback_score is not None and (
+        not math.isfinite(feedback_score) or not -1 <= feedback_score <= 1
+    ):
         return False
-    if turns_to_resolution is not None and not 1 <= turns_to_resolution <= 1_000_000:
+    if turns_to_resolution is not None and (
+        isinstance(turns_to_resolution, bool)
+        or not isinstance(turns_to_resolution, int)
+        or not 1 <= turns_to_resolution <= 1_000_000
+    ):
         return False
-    if edit_distance_ratio is not None and not 0 <= edit_distance_ratio <= 1:
+    if edit_distance_ratio is not None and (
+        not math.isfinite(edit_distance_ratio)
+        or not 0 <= edit_distance_ratio <= 1
+    ):
         return False
-    if regeneration_count is not None and not 0 <= regeneration_count <= 1_000_000:
+    if regeneration_count is not None and (
+        isinstance(regeneration_count, bool)
+        or not isinstance(regeneration_count, int)
+        or not 0 <= regeneration_count <= 1_000_000
+    ):
         return False
     if escalated is not None and not isinstance(escalated, bool):
         return False

{metergraph-0.3.0 → metergraph-0.3.2}/src/metergraph/_capture.py

@@ -6,6 +6,7 @@ import functools
 import inspect
 import json
 import logging
+import math
 import os
 import platform
 import secrets
@@ -15,6 +16,7 @@ from dataclasses import dataclass
 from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any, Callable, Mapping
+from urllib.parse import urlsplit
 
 from ._context import CaptureContext, snapshot
 from ._template import scrub, template_hash
@@ -39,8 +41,17 @@ def _first(value: Any) -> Any:
 
 def _int(value: Any) -> int | None:
     try:
-        return int(value) if value is not None else None
-    except (TypeError, ValueError):
+        if value is None or isinstance(value, bool):
+            return None
+        if isinstance(value, int):
+            return value if value >= 0 else None
+        parsed = float(value)
+        return (
+            int(parsed)
+            if math.isfinite(parsed) and parsed >= 0 and parsed.is_integer()
+            else None
+        )
+    except (TypeError, ValueError, OverflowError):
         return None
 
 
@@ -202,10 +213,33 @@ def _chunk_text(chunk: Any) -> str | None:
     return None
 
 
+def _chunk_has_output(chunk: Any) -> bool:
+    """Recognize the first user-visible text, reasoning, or tool output."""
+    if _chunk_text(chunk):
+        return True
+    for choice in _get(chunk, "choices", []) or []:
+        if _get(_get(choice, "delta"), "tool_calls"):
+            return True
+    kind = _get(chunk, "type")
+    delta = _get(chunk, "delta")
+    if isinstance(delta, str) and "reasoning" in str(kind):
+        return bool(delta)
+    if _get(delta, "thinking") or _get(delta, "reasoning"):
+        return True
+    if kind == "content_block_start":
+        return _get(_get(chunk, "content_block"), "type") == "tool_use"
+    if kind == "content_block_delta":
+        return _get(_get(chunk, "delta"), "type") == "input_json_delta"
+    for candidate in _get(chunk, "candidates", []) or []:
+        for part in _get(_get(candidate, "content"), "parts", []) or []:
+            if _get(part, "function_call") or _get(part, "functionCall"):
+                return True
+    return False
+
+
 def _usage_only_chunk(chunk: Any, call: "CallState") -> bool:
     return (
-        call.provider == "openai"
-        and call.endpoint == "chat.completions"
+        call.endpoint == "chat.completions"
         and _get(chunk, "choices") == []
         and _get(chunk, "usage") is not None
     )
@@ -683,6 +717,11 @@ class CallState:
                 }
                 for item in tool_calls
             ]
+        tool_names = (
+            list(dict.fromkeys(item["name"] for item in full_tool_calls))
+            if full_tool_calls
+            else None
+        )
         effective_status = status or (
             "error" if error else _stop_reason(response) or "success"
         )
@@ -720,6 +759,7 @@ class CallState:
             "unit_name": self.context.unit_name,
             "unit_count": self.context.unit_count,
             "tool_calls": tool_calls,
+            "tool_names": tool_names,
             "endpoint": self.endpoint,
             "request_id": _request_id(response),
             "batch": self.request.get("batch") is True,
@@ -763,14 +803,14 @@ class _StreamState:
         self.last = value
         self.chunks.append(value)
         text = _chunk_text(value)
+        if self.ttft_ms is None and _chunk_has_output(value):
+            self.ttft_ms = round((time.perf_counter() - self.call.started) * 1000)
         if text:
-            if self.ttft_ms is None:
-                self.ttft_ms = round((time.perf_counter() - self.call.started) * 1000)
             self.parts.append(text)
         return value
 
     def finish(
-        self, status: str = "success", error: BaseException | None = None
+        self, status: str | None = None, error: BaseException | None = None
     ) -> None:
         response = self.last
         if not error:
@@ -796,7 +836,7 @@ class _StreamState:
         )
 
     async def finish_async(
-        self, status: str = "success", error: BaseException | None = None
+        self, status: str | None = None, error: BaseException | None = None
     ) -> None:
         response = self.last
         if not error:
@@ -1198,7 +1238,14 @@ def _patch_anthropic_batch_results(owner: Any) -> bool:
     return True
 
 
-def _patch(owner: Any, method_name: str, provider: str, endpoint: str) -> bool:
+def _patch(
+    owner: Any,
+    method_name: str,
+    provider: str,
+    endpoint: str,
+    *,
+    gateway: bool = False,
+) -> bool:
     original = getattr(owner, method_name, None)
     if not callable(original):
         return False
@@ -1223,7 +1270,8 @@ def _patch(owner: Any, method_name: str, provider: str, endpoint: str) -> bool:
                 else:
                     kwargs = {**kwargs, "stream_options": {"include_usage": True}}
         request = _request(args, kwargs)
-        call = runtime.call_state(provider, endpoint, request)
+        capture_provider = _gateway_provider(request) if gateway else provider
+        call = runtime.call_state(capture_provider, endpoint, request)
         try:
             result = original(*args, **kwargs)
         except BaseException as exc:
@@ -1321,14 +1369,44 @@ def _resolve(client: Any, path: str) -> Any:
     return obj
 
 
-def _apply_seams(client: Any, provider: str) -> list[str]:
+_VERCEL_GATEWAY_HOST = "ai-gateway.vercel.sh"
+_VERCEL_PROVIDER_ALIASES = {"gateway", "vercel", "vercel-ai-gateway"}
+
+
+def _uses_vercel_gateway(client: Any) -> bool:
+    """Recognize the public AI Gateway URL exposed by supported Python SDKs."""
+    base_url = getattr(client, "base_url", None) or getattr(
+        client, "_base_url", None
+    )
+    if base_url is None:
+        return False
+    try:
+        return urlsplit(str(base_url).strip()).hostname == _VERCEL_GATEWAY_HOST
+    except (TypeError, ValueError):
+        return False
+
+
+def _gateway_provider(request: Mapping[str, Any]) -> str:
+    """Use the creator in Vercel's required `creator/model` identifier."""
+    model = str(request.get("model") or "").strip().lower()
+    creator, separator, _ = model.partition("/")
+    return creator if separator and creator else "vercel-ai-gateway"
+
+
+def _apply_seams(client: Any, provider: str, *, gateway: bool = False) -> list[str]:
     patched: list[str] = []
     for seam in SEAM_TABLES.get(provider, ()):
         try:
             owner = _resolve(client, seam.path)
         except Exception:
             continue  # a pathological client property must never break wrap()
-        if owner is not None and _patch(owner, seam.method, provider, seam.endpoint):
+        if owner is not None and _patch(
+            owner,
+            seam.method,
+            provider,
+            seam.endpoint,
+            gateway=gateway,
+        ):
             patched.append(f"{seam.path}.{seam.method}")
     return patched
 
@@ -1356,22 +1434,42 @@ def _apply_batch_extras(client: Any, provider: str) -> int:
 def wrap(client: Any, *, provider: str | None = None) -> Any:
     """Patch supported resource methods on an OpenAI, Anthropic, or Google client.
 
+    OpenAI and Anthropic clients pointed at Vercel AI Gateway are recognized
+    automatically. ``provider="vercel"`` can force gateway attribution for a
+    compatible client whose public base URL has been customized.
+
     Never raises: an unrecognized client shape, or an exception while probing
     it, results in an unmodified, uninstrumented client — not a crash.
     """
     try:
-        resolved_provider = provider or _detect_provider(client)
-        patched = _apply_seams(client, resolved_provider)
-        patched_count = len(patched) + _apply_batch_extras(client, resolved_provider)
+        gateway = (
+            provider.strip().lower() in _VERCEL_PROVIDER_ALIASES
+            if isinstance(provider, str)
+            else _uses_vercel_gateway(client)
+        )
+        resolved_provider = (
+            _detect_provider(client)
+            if gateway
+            else provider or _detect_provider(client)
+        )
+        patched = _apply_seams(client, resolved_provider, gateway=gateway)
+        patched_count = len(patched)
+        if not gateway:
+            patched_count += _apply_batch_extras(client, resolved_provider)
+        client_label = (
+            f"Vercel AI Gateway via {resolved_provider}"
+            if gateway
+            else resolved_provider
+        )
         if not patched_count:
             log.warning(
-                "Metergraph found no supported methods on %s client", resolved_provider
+                "Metergraph found no supported methods on %s client", client_label
             )
         else:
             log.info(
                 "Metergraph patched %d seam(s) on %s client: %s",
                 patched_count,
-                resolved_provider,
+                client_label,
                 ", ".join(patched) or "(batch-only)",
             )
     except Exception:

{metergraph-0.3.0 → metergraph-0.3.2}/src/metergraph/_version.py

@@ -8,4 +8,4 @@ import importlib.metadata
 try:
     SDK_VERSION = importlib.metadata.version("metergraph")
 except Exception:
-    SDK_VERSION = "0.3.0"
+    SDK_VERSION = "0.3.2"

{metergraph-0.3.0 → metergraph-0.3.2}/src/metergraph.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: metergraph
-Version: 0.3.0
+Version: 0.3.2
 Summary: Fire-and-forget LLM spend capture for Metergraph
 Author: Pioneer Square Labs
 License-Expression: Apache-2.0
 Project-URL: Homepage, https://www.metergraph.dev/
 Project-URL: Repository, https://github.com/PioneerSquareLabs/metergraphsdk
 Project-URL: Issues, https://github.com/PioneerSquareLabs/metergraphsdk/issues
-Keywords: llm,observability,openai,anthropic,gemini,cost-tracking
+Keywords: llm,observability,openai,anthropic,gemini,vercel-ai-gateway,cost-tracking
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
@@ -21,7 +21,8 @@ Requires-Dist: google-genai>=1; extra == "dev"
 
 # metergraph (Python)
 
-Zero-runtime-dependency capture for OpenAI, Anthropic, and Gemini clients.
+Zero-runtime-dependency capture for OpenAI, Anthropic, Gemini, and Python
+Vercel AI Gateway clients.
 `wrap()` initializes capture from the environment, so setup is one line per
 client; call `metergraph.init(...)` before the first `wrap()` only to pass
 options in code.
@@ -51,6 +52,31 @@ metergraph.record_outcome(
 )
 ```
 
+Vercel's supported Python surface is AI Gateway through the OpenAI or
+Anthropic SDK. Point either client at the public gateway and `wrap()` detects
+it automatically:
+
+```python
+import os
+import metergraph
+from openai import OpenAI
+
+gateway = metergraph.wrap(OpenAI(
+    api_key=os.getenv("AI_GATEWAY_API_KEY") or os.getenv("VERCEL_OIDC_TOKEN"),
+    base_url="https://ai-gateway.vercel.sh/v1",
+))
+
+gateway.chat.completions.create(
+    model="anthropic/claude-sonnet-4.6",
+    messages=[{"role": "user", "content": "Hello"}],
+)
+```
+
+Creator-qualified model IDs are normalized for gateway catalog pricing. Sync,
+async, streaming, tool calls, and OpenAI Responses API calls are captured. Use
+`metergraph.wrap(client, provider="vercel")` only when a compatible client is
+behind a custom gateway URL that cannot be detected automatically.
+
 Configuration:
 
 - `METERGRAPH_APP_TOKEN` — required bearer token
@@ -101,6 +127,9 @@ Instrument this codebase's LLM API costs with the `metergraph` PyPI package
 (https://github.com/PioneerSquareLabs/metergraphsdk): pip install metergraph,
 then wrap every OpenAI()/AsyncOpenAI(), Anthropic()/AsyncAnthropic(), and
 genai.Client() construction in place, e.g. client = metergraph.wrap(OpenAI()).
+OpenAI or Anthropic clients pointed at https://ai-gateway.vercel.sh are Vercel
+AI Gateway clients and are detected automatically; keep their creator/model ID
+and AI_GATEWAY_API_KEY / VERCEL_OIDC_TOKEN configuration unchanged.
 wrap() returns the same client and initializes itself from the environment:
 METERGRAPH_APP_TOKEN is required (capture is silently off without it) and
 METERGRAPH_INGEST_URL is only for self-hosted servers. Add both to

{metergraph-0.3.0 → metergraph-0.3.2}/src/metergraph.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ src/metergraph.egg-info/SOURCES.txt
 src/metergraph.egg-info/dependency_links.txt
 src/metergraph.egg-info/requires.txt
 src/metergraph.egg-info/top_level.txt
+tests/test_edge_cases.py
 tests/test_real_client_integration.py
 tests/test_sdk.py
 tests/test_seam_reality.py