metergraph-core 0.2.54__tar.gz → 0.2.56__tar.gz

{metergraph_core-0.2.54/src/metergraph_core.egg-info → metergraph_core-0.2.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metergraph-core
-Version: 0.2.54
+Version: 0.2.56
 Summary: Reusable MeterGraph catalog and deterministic billing engine
 License-Expression: Apache-2.0
 Requires-Python: >=3.10

{metergraph_core-0.2.54 → metergraph_core-0.2.56}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "metergraph-core"
-version = "0.2.54"
+version = "0.2.56"
 description = "Reusable MeterGraph catalog and deterministic billing engine"
 readme = "README.md"
 license = "Apache-2.0"

{metergraph_core-0.2.54 → metergraph_core-0.2.56}/src/metergraph_core/__init__.py

@@ -37,6 +37,10 @@ from .models import (
     validate_model_registry,
 )
 from .retrieval import (
+    count_fetch_units,
+    count_search_units,
+    fetch_operation_for_channel,
+    search_operation_for_channel,
     RetrievalCatalog,
     RetrievalCostResult,
     RetrievalPrice,
@@ -62,6 +66,8 @@ __all__ = [
     "RetrievalCatalog",
     "RetrievalCostResult",
     "RetrievalPrice",
+    "count_fetch_units",
+    "count_search_units",
     "counts_cache_read_in_input",
     "direct_channel_for_provider",
     "normalize_provider",
@@ -73,5 +79,7 @@ __all__ = [
     "parse_disputes",
     "parse_retrieval",
     "resolve_billing",
+    "fetch_operation_for_channel",
+    "search_operation_for_channel",
     "validate_model_registry",
 ]

{metergraph_core-0.2.54 → metergraph_core-0.2.56}/src/metergraph_core/data/models.yaml

@@ -1,4 +1,4 @@
-version: '2026-10-06'
+version: '2026-10-07'
 models:
 - canonical_id: openai/gpt-5.6-sol
   display_name: GPT-5.6 Sol
@@ -603,6 +603,50 @@ models:
     pricing_channel: vercel-ai-gateway
     execution_profiles:
     - default
+- canonical_id: openai/gpt-6.1-sol
+  display_name: GPT-6.1 Sol
+  publisher: openai
+  routes:
+  - key: default:openai/gpt-6.1-sol
+    id: openai/gpt-6.1-sol
+    provider: vercel
+    model_id: openai/gpt-6.1-sol
+    pricing_channel: vercel-ai-gateway
+    execution_profiles:
+    - default
+- canonical_id: xai/grok-4.7
+  display_name: Grok 4.7
+  publisher: xai
+  routes:
+  - key: default:xai/grok-4.7
+    id: xai/grok-4.7
+    provider: vercel
+    model_id: xai/grok-4.7
+    pricing_channel: vercel-ai-gateway
+    execution_profiles:
+    - default
+- canonical_id: moonshotai/kimi-k2.7-code
+  display_name: Kimi K2.7 Code
+  publisher: moonshotai
+  routes:
+  - key: default:moonshotai/kimi-k2.7-code
+    id: moonshotai/kimi-k2.7-code
+    provider: vercel
+    model_id: moonshotai/kimi-k2.7-code
+    pricing_channel: vercel-ai-gateway
+    execution_profiles:
+    - default
+- canonical_id: zai/glm-5.3
+  display_name: GLM 5.3
+  publisher: zai
+  routes:
+  - key: default:zai/glm-5.3
+    id: zai/glm-5.3
+    provider: vercel
+    model_id: zai/glm-5.3
+    pricing_channel: vercel-ai-gateway
+    execution_profiles:
+    - default
 execution_profiles:
 - id: default
   routes:
@@ -641,6 +685,10 @@ execution_profiles:
   - default:inception/mercury-2.5
   - default:anthropic/claude-opus-5.5
   - default:anthropic/claude-sonnet-5.5
+  - default:openai/gpt-6.1-sol
+  - default:xai/grok-4.7
+  - default:moonshotai/kimi-k2.7-code
+  - default:zai/glm-5.3
   - default:openai/gpt-5.4-mini
   - default:openai/gpt-5.4-nano
   - default:anthropic/claude-opus-4.8
@@ -710,6 +758,10 @@ offer_groups:
   - default:inception/mercury-2.5
   - default:anthropic/claude-opus-5.5
   - default:anthropic/claude-sonnet-5.5
+  - default:openai/gpt-6.1-sol
+  - default:xai/grok-4.7
+  - default:moonshotai/kimi-k2.7-code
+  - default:zai/glm-5.3
 - id: fireworks
   credential: FIREWORKS_API_KEY
   routes:

{metergraph_core-0.2.54 → metergraph_core-0.2.56}/src/metergraph_core/data/prices.yaml

@@ -6,9 +6,9 @@
 #
 # Community updates welcome: add an alias or price entry with its provider
 # source_url and open a PR. CI validates structure and date overlaps.
-version: "2026-10-06"
+version: "2026-10-07"
 currency: USD
-pricing_verified_at: "2026-10-06"
+pricing_verified_at: "2026-10-07"
 models:
   - canonical_id: openai/gpt-6-sol
     publisher: openai
@@ -2639,6 +2639,32 @@ models:
         output_per_mtok: 15.00
         cache_read_per_mtok: 0.30
         source_url: https://fireworks.ai/models/fireworks/kimi-k3
+  - canonical_id: moonshotai/kimi-k2.7-code
+    publisher: moonshotai
+    aliases:
+      - {provider: moonshotai, alias: kimi-k2.7-code, channel: moonshot-api}
+      - {provider: unknown, alias: kimi-k2.7-code, channel: moonshot-api}
+      - {provider: litellm, alias: kimi-k2.7-code, channel: moonshot-api}
+      - provider: moonshotai
+        alias: moonshotai/kimi-k2.7-code
+        channel: vercel-ai-gateway
+        rules: {input_includes_cache_read: true}
+    # Not on Fireworks or Bedrock as of 2026-10-07.
+    prices:
+      - channel: vercel-ai-gateway
+        region: global
+        effective_from: "2026-10-07"
+        input_per_mtok: 0.95
+        output_per_mtok: 4.00
+        cache_read_per_mtok: 0.19
+        source_url: https://ai-gateway.vercel.sh/v1/models
+      - channel: moonshot-api
+        region: global
+        effective_from: "2026-10-07"
+        input_per_mtok: 0.95
+        output_per_mtok: 4.00
+        cache_read_per_mtok: 0.19
+        source_url: https://platform.kimi.ai/docs/pricing/chat
   - canonical_id: moonshotai/kimi-k3-fast
     publisher: moonshotai
     aliases:
@@ -2976,6 +3002,12 @@ models:
         rules: {input_includes_cache_read: true}
         effective_from: "2026-10-02"
         source_url: https://ai-gateway.vercel.sh/v1/models
+      - provider: xai
+        alias: xai/grok-4.7
+        channel: vercel-ai-gateway
+        rules: {input_includes_cache_read: true}
+        effective_from: "2026-10-02"
+        source_url: https://ai-gateway.vercel.sh/v1/models
     prices:
       - channel: vercel-ai-gateway
         region: global
@@ -3111,6 +3143,9 @@ models:
         alias: fireworks:accounts/fireworks/models/glm-5p3
         channel: fireworks-api
         rules: {input_includes_cache_read: true}
+      - {provider: bedrock, alias: global.zai.glm-5.3, channel: aws-bedrock, price_region: global}
+      - {provider: bedrock, alias: us.zai.glm-5.3, channel: aws-bedrock-geo, price_region: global}
+      - {provider: bedrock, alias: zai.glm-5.3, channel: aws-bedrock, price_region: global}
     prices:
       - channel: vercel-ai-gateway
         region: global
@@ -3133,6 +3168,23 @@ models:
         output_per_mtok: 4.40
         cache_read_per_mtok: 0.26
         source_url: https://fireworks.ai/models/fireworks/glm-5p3
+      # The 5m field stores AWS's 30-minute cache-write rate.
+      - channel: aws-bedrock
+        region: global
+        effective_from: "2026-10-07"
+        input_per_mtok: 1.68
+        output_per_mtok: 5.28
+        cache_read_per_mtok: 0.312
+        cache_write_5m_per_mtok: 2.10
+        source_url: https://aws.amazon.com/bedrock/pricing/
+      - channel: aws-bedrock-geo
+        region: global
+        effective_from: "2026-10-07"
+        input_per_mtok: 1.848
+        output_per_mtok: 5.808
+        cache_read_per_mtok: 0.3432
+        cache_write_5m_per_mtok: 2.31
+        source_url: https://aws.amazon.com/bedrock/pricing/
 
   - canonical_id: zai/glm-5.3-flash
     publisher: zai

{metergraph_core-0.2.54 → metergraph_core-0.2.56}/src/metergraph_core/retrieval.py

@@ -15,6 +15,8 @@ count and an unknown operation or channel come back ``unpriced`` with a reason
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from decimal import Decimal, ROUND_HALF_UP
+from collections.abc import Mapping
+from types import MappingProxyType
 from typing import Any
 
 from .catalog import _COST_QUANTUM, _coerce_datetime
@@ -52,6 +54,97 @@ class RetrievalCostResult:
     reasons: tuple[str, ...] = ()
 
 
+# The retrieval operation a counted search or fetch is billed as on each
+# channel. A channel absent here charges no per-use fee for that operation.
+SEARCH_OPERATION_BY_CHANNEL: Mapping[str, str] = MappingProxyType({
+    "openai-api": "web_search",
+    "anthropic-api": "web_search",
+    "google-api": "google_search_grounding",
+    "google-vertex-ai": "google_search_grounding",
+    # Perplexity bills a request fee by search context size, which no
+    # capture path records; the low tier is the floor every request pays.
+    "perplexity-api": "search_request_low",
+})
+FETCH_OPERATION_BY_CHANNEL: Mapping[str, str] = MappingProxyType({
+    "anthropic-api": "web_fetch",
+})
+
+# The tool-call item types a provider emits for a search or a fetch it ran
+# itself, as the Responses API and the relay record them.
+_SEARCH_TOOL_TYPES = frozenset({"web_search_call"})
+_FETCH_TOOL_TYPES = frozenset({"web_fetch_call"})
+_PERPLEXITY = frozenset({"perplexity", "perplexity-ai"})
+
+
+def search_operation_for_channel(channel: Any) -> str | None:
+    """The retrieval operation a counted search is billed as on ``channel``,
+    or ``None`` where the channel charges no per-search fee."""
+    return SEARCH_OPERATION_BY_CHANNEL.get(str(channel or "").strip().lower())
+
+
+def fetch_operation_for_channel(channel: Any) -> str | None:
+    """The retrieval operation a counted fetch is billed as on ``channel``,
+    or ``None`` where the channel charges no per-fetch fee."""
+    return FETCH_OPERATION_BY_CHANNEL.get(str(channel or "").strip().lower())
+
+
+def _count(value: Any) -> int | None:
+    if value is None or isinstance(value, bool):
+        return None
+    try:
+        count = int(value)
+    except (TypeError, ValueError, OverflowError):
+        return None
+    return count if count >= 0 else None
+
+
+def _tool_items(row: Mapping[str, Any], types: frozenset[str]) -> int | None:
+    """Items of the given types among ``tool_calls``: a measured zero when the
+    list is there and holds none, ``None`` when there is no list to read."""
+    calls = row.get("tool_calls")
+    if not isinstance(calls, list):
+        return None
+    return sum(
+        1
+        for call in calls
+        if isinstance(call, Mapping) and str(call.get("type") or "").strip().lower() in types
+    )
+
+
+def count_search_units(row: Mapping[str, Any]) -> int | None:
+    """The searches one call row made, read from whichever field its capture
+    path carries, in the order they are believed: ``web_search_calls`` and
+    ``grounding_queries`` (the relay's per-provider counts), Anthropic's
+    ``server_tool_use.web_search_requests``, then the ``web_search_call``
+    items among ``tool_calls``. A Perplexity call is one search, since
+    Perplexity bills every request as one. A field that is present and says
+    nothing was searched is a measured zero; ``None`` means no field says."""
+    for key in ("web_search_calls", "grounding_queries"):
+        count = _count(row.get(key))
+        if count is not None:
+            return count
+    server = row.get("server_tool_use")
+    if isinstance(server, Mapping):
+        count = _count(server.get("web_search_requests"))
+        if count is not None:
+            return count
+    if str(row.get("provider") or "").strip().lower() in _PERPLEXITY:
+        return 1
+    return _tool_items(row, _SEARCH_TOOL_TYPES)
+
+
+def count_fetch_units(row: Mapping[str, Any]) -> int | None:
+    """The page fetches one call row made: Anthropic's
+    ``server_tool_use.web_fetch_requests``, then the ``web_fetch_call``
+    items among ``tool_calls``, with the same measured-zero rule."""
+    server = row.get("server_tool_use")
+    if isinstance(server, Mapping):
+        count = _count(server.get("web_fetch_requests"))
+        if count is not None:
+            return count
+    return _tool_items(row, _FETCH_TOOL_TYPES)
+
+
 def _units(value: Any) -> tuple[int | None, str | None]:
     """Coerce a retrieval unit count under a strict-integer contract.
 

{metergraph_core-0.2.54 → metergraph_core-0.2.56/src/metergraph_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metergraph-core
-Version: 0.2.54
+Version: 0.2.56
 Summary: Reusable MeterGraph catalog and deterministic billing engine
 License-Expression: Apache-2.0
 Requires-Python: >=3.10