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

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

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

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

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

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

@@ -1,6 +1,7 @@
 """Reusable MeterGraph catalog and deterministic token-cost pricing core."""
 
 from .catalog import (
+    CostComponents,
     Alias,
     CatalogSnapshot,
     CostResult,
@@ -11,12 +12,14 @@ from .catalog import (
     normalize_provider,
 )
 from .billing import (
+    Dispute,
     BillingDecision,
     GatewayBillingEvidence,
     normalize_gateway_evidence,
     resolve_billing,
 )
 from .loader import (
+    parse_disputes,
     CatalogError,
     LoadedCatalog,
     load_catalog,
@@ -44,7 +47,9 @@ __all__ = [
     "BillingDecision",
     "CatalogError",
     "CatalogSnapshot",
+    "CostComponents",
     "CostResult",
+    "Dispute",
     "LoadedCatalog",
     "ModelDefinition",
     "ModelRegistry",
@@ -65,6 +70,7 @@ __all__ = [
     "normalize_gateway_evidence",
     "parse_catalog",
     "parse_model_registry",
+    "parse_disputes",
     "parse_retrieval",
     "resolve_billing",
     "validate_model_registry",

{metergraph_core-0.2.52 → metergraph_core-0.2.54}/src/metergraph_core/billing.py

@@ -1,10 +1,11 @@
 """Pure selection of effective LLM cost from catalog and gateway evidence."""
 
 from dataclasses import dataclass
+from datetime import datetime
 from decimal import Decimal, InvalidOperation
-from typing import Any, Mapping
+from typing import Any, Iterable, Mapping
 
-from .catalog import CostResult
+from .catalog import CostResult, _coerce_datetime
 
 @dataclass(frozen=True, slots=True)
 class _QualifiedSource:
@@ -56,6 +57,20 @@ _QUALIFIED_SOURCES = (
 )
 
 
+@dataclass(frozen=True, slots=True)
+class Dispute:
+    """A gateway whose reported amount is not believed for one publisher's
+    models from a date: the catalog has shown its figure wrong there, and the
+    note says how. Billing takes the catalog price instead and keeps the
+    gateway's figure as evidence."""
+
+    gateway: str
+    publisher: str
+    since: datetime
+    note: str
+    source_url: str
+
+
 @dataclass(frozen=True, slots=True)
 class GatewayBillingEvidence:
     """Validated gateway billing fields from one content-blind call row."""
@@ -132,11 +147,43 @@ def _qualified_source(evidence: GatewayBillingEvidence) -> _QualifiedSource | No
     return None
 
 
+def _disputed(
+    qualified: _QualifiedSource | None,
+    publisher: str | None,
+    disputes: Iterable[Dispute],
+    at: Any,
+) -> bool:
+    # Without the call time nothing is disputed: a dispute runs from a date,
+    # and declining a figure for a call that may predate it is the wrong
+    # side to err on.
+    if qualified is None or publisher is None or at is None:
+        return False
+    when = _coerce_datetime(at)
+    return any(
+        dispute.gateway == qualified.gateway
+        and dispute.publisher == publisher
+        and dispute.since <= when
+        for dispute in disputes
+    )
+
+
 def resolve_billing(
     catalog_result: CostResult,
     evidence: GatewayBillingEvidence,
+    *,
+    disputes: Iterable[Dispute] = (),
+    at: Any = None,
 ) -> BillingDecision:
-    """Select effective cost without combining independent reported amounts."""
+    """Select effective cost without combining independent reported amounts.
+
+    A qualified gateway's amount is declined when the catalog disputes that
+    gateway for the priced model's publisher at ``at`` (with no ``at`` nothing
+    is disputed): the catalog price is
+    billed, the gateway's figure stays in ``reported_cost_usd`` as evidence,
+    and ``gateway_disputed`` is recorded among the reasons. When the catalog
+    cannot price the call, the gateway's figure still stands, with the same
+    reason recorded, because a disputed figure is better evidence than none.
+    """
 
     qualified = _qualified_source(evidence)
     reported_cost = (
@@ -145,6 +192,12 @@ def resolve_billing(
         and evidence.reported_cost_source == qualified.cost_source
         else None
     )
+    disputed = reported_cost is not None and _disputed(
+        qualified, catalog_result.publisher, disputes, at
+    )
+    reasons = catalog_result.reasons
+    if disputed:
+        reasons = tuple(dict.fromkeys((*reasons, "gateway_disputed")))
     upstream_cost = (
         evidence.reported_upstream_cost_usd
         if qualified is not None
@@ -153,7 +206,9 @@ def resolve_billing(
         else None
     )
 
-    if reported_cost is not None:
+    if reported_cost is not None and not (
+        disputed and catalog_result.cost_usd is not None
+    ):
         cost_usd = reported_cost
         cost_status = "priced"
         provenance = "gateway_reported"
@@ -174,5 +229,5 @@ def resolve_billing(
         reported_upstream_cost_usd=upstream_cost,
         catalog_cost_usd=catalog_result.cost_usd,
         catalog_price_id=catalog_result.price_id,
-        catalog_reasons=catalog_result.reasons,
+        catalog_reasons=reasons,
     )

{metergraph_core-0.2.52 → metergraph_core-0.2.54}/src/metergraph_core/catalog.py

@@ -211,6 +211,19 @@ class Price:
     publisher: str | None = None
 
 
+@dataclass(frozen=True, slots=True)
+class CostComponents:
+    """A priced call's cost by what it paid for. The four parts sum to the
+    call's ``cost_usd`` exactly: each is quantized and the rounding residue
+    lands in the input part, so a consumer that stores them can rebuild the
+    total without a second rounding."""
+
+    input_usd: Decimal
+    output_usd: Decimal
+    cache_read_usd: Decimal
+    cache_write_usd: Decimal
+
+
 @dataclass(frozen=True, slots=True)
 class CostResult:
     canonical_model: str | None
@@ -218,6 +231,11 @@ class CostResult:
     cost_usd: Decimal | None
     status: str
     reasons: tuple[str, ...] = ()
+    # Present whenever cost_usd is: the split of that cost by driver.
+    components: CostComponents | None = None
+    # The catalog's publisher for the priced model, for billing rules that
+    # apply per publisher rather than per channel.
+    publisher: str | None = None
 
 
 @dataclass(frozen=True, slots=True)
@@ -326,10 +344,11 @@ def _price_tokens(
     cache_write_5m_tokens: Any,
     cache_write_1h_tokens: Any,
     batch: bool,
-) -> tuple[Decimal, list[str]]:
+) -> tuple[Decimal, list[str], CostComponents]:
     """Cost a token usage against one already-selected price and its merged
     rules. Shared by ``cost`` (provider+model entry) and ``price_deployment``
-    (model+channel entry) so both compute identically."""
+    (model+channel entry) so both compute identically. Returns the total, the
+    reasons it is partial, and the split by driver."""
     reasons: list[str] = []
     input_count = _tokens(input_tokens)
     output_count = _tokens(output_tokens)
@@ -394,22 +413,22 @@ def _price_tokens(
     input_multiplier *= off_peak
     output_multiplier *= off_peak
 
-    cost = Decimal("0")
+    input_usd = output_usd = cache_read_usd = cache_write_usd = Decimal("0")
     if input_rate is None:
         if billable_input:
             reasons.append("input_rate_unavailable")
     else:
-        cost += Decimal(billable_input) * input_rate * input_multiplier / _MILLION
+        input_usd = Decimal(billable_input) * input_rate * input_multiplier / _MILLION
     if output_rate is None:
         if output_count:
             reasons.append("output_rate_unavailable")
     else:
-        cost += Decimal(output_count) * output_rate * output_multiplier / _MILLION
+        output_usd = Decimal(output_count) * output_rate * output_multiplier / _MILLION
     if cache_read_count:
         if price.cache_read_per_mtok is None:
             reasons.append("cache_read_rate_unavailable")
         else:
-            cost += (
+            cache_read_usd = (
                 Decimal(cache_read_count)
                 * price.cache_read_per_mtok
                 * input_multiplier
@@ -419,7 +438,7 @@ def _price_tokens(
         if price.cache_write_5m_per_mtok is None:
             reasons.append("cache_write_5m_rate_unavailable")
         else:
-            cost += (
+            cache_write_usd += (
                 Decimal(cache_write_5m_count)
                 * price.cache_write_5m_per_mtok
                 * input_multiplier
@@ -429,7 +448,7 @@ def _price_tokens(
         if price.cache_write_1h_per_mtok is None:
             reasons.append("cache_write_1h_rate_unavailable")
         else:
-            cost += (
+            cache_write_usd += (
                 Decimal(cache_write_1h_count)
                 * price.cache_write_1h_per_mtok
                 * input_multiplier
@@ -438,7 +457,17 @@ def _price_tokens(
     if rules.get("uncaptured_fees"):
         reasons.append("uncaptured_fees")
 
-    return cost.quantize(_COST_QUANTUM, rounding=ROUND_HALF_UP), reasons
+    # The total is rounded once, as it always was; the parts are rounded
+    # each and the residue goes to input, so they sum to the total exactly.
+    cost = (input_usd + output_usd + cache_read_usd + cache_write_usd).quantize(
+        _COST_QUANTUM, rounding=ROUND_HALF_UP
+    )
+    parts = [
+        part.quantize(_COST_QUANTUM, rounding=ROUND_HALF_UP)
+        for part in (input_usd, output_usd, cache_read_usd, cache_write_usd)
+    ]
+    parts[0] += cost - sum(parts)
+    return cost, reasons, CostComponents(*parts)
 
 
 class CatalogSnapshot:
@@ -641,7 +670,7 @@ class CatalogSnapshot:
                 ("no_effective_price",),
             )
 
-        cost, reasons = _price_tokens(
+        cost, reasons, components = _price_tokens(
             price,
             {**price.rules, **alias.rules},
             at=when,
@@ -659,6 +688,8 @@ class CatalogSnapshot:
             cost,
             "partial" if reasons else "priced",
             tuple(dict.fromkeys(reasons)),
+            components=components,
+            publisher=price.publisher,
         )
 
     def price_deployment(
@@ -689,7 +720,7 @@ class CatalogSnapshot:
         resolved = self.resolve_price(model=model, channel=channel, at=when)
         if resolved is None:
             return CostResult(None, None, None, "unpriced", ("unknown_deployment",))
-        cost, reasons = _price_tokens(
+        cost, reasons, components = _price_tokens(
             resolved.price,
             resolved.rules,
             at=when,
@@ -707,4 +738,6 @@ class CatalogSnapshot:
             cost,
             "partial" if reasons else "priced",
             tuple(dict.fromkeys(reasons)),
+            components=components,
+            publisher=resolved.price.publisher,
         )

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

@@ -1,4 +1,4 @@
-version: '2026-09-30'
+version: '2026-10-06'
 models:
 - canonical_id: openai/gpt-5.6-sol
   display_name: GPT-5.6 Sol
@@ -581,6 +581,28 @@ models:
     pricing_channel: aws-bedrock
     execution_profiles:
     - bedrock
+- canonical_id: anthropic/claude-opus-5.5
+  display_name: Claude Opus 5.5
+  publisher: anthropic
+  routes:
+  - key: default:anthropic/claude-opus-5.5
+    id: anthropic/claude-opus-5.5
+    provider: vercel
+    model_id: anthropic/claude-opus-5.5
+    pricing_channel: vercel-ai-gateway
+    execution_profiles:
+    - default
+- canonical_id: anthropic/claude-sonnet-5.5
+  display_name: Claude Sonnet 5.5
+  publisher: anthropic
+  routes:
+  - key: default:anthropic/claude-sonnet-5.5
+    id: anthropic/claude-sonnet-5.5
+    provider: vercel
+    model_id: anthropic/claude-sonnet-5.5
+    pricing_channel: vercel-ai-gateway
+    execution_profiles:
+    - default
 execution_profiles:
 - id: default
   routes:
@@ -617,6 +639,8 @@ execution_profiles:
   - default:deepseek/deepseek-v4.1-flash
   - default:alibaba/qwen3.8-flash
   - default:inception/mercury-2.5
+  - default:anthropic/claude-opus-5.5
+  - default:anthropic/claude-sonnet-5.5
   - default:openai/gpt-5.4-mini
   - default:openai/gpt-5.4-nano
   - default:anthropic/claude-opus-4.8
@@ -684,6 +708,8 @@ offer_groups:
   - default:deepseek/deepseek-v4.1-flash
   - default:alibaba/qwen3.8-flash
   - default:inception/mercury-2.5
+  - default:anthropic/claude-opus-5.5
+  - default:anthropic/claude-sonnet-5.5
 - id: fireworks
   credential: FIREWORKS_API_KEY
   routes:

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

@@ -1876,6 +1876,8 @@ models:
       - <<: *deepseek-v4-flash-retired
         provider: unknown
         alias: deepseek/deepseek-v4-flash
+      - <<: *deepseek-v4-flash-retired
+        alias: deepseek/deepseek/deepseek-v4-flash
       - &deepseek-chat-v4-flash
         {provider: deepseek, alias: deepseek-chat, channel: deepseek-api, effective_from: "2026-04-24", effective_to: "2026-07-24T16:00:00+00:00", source_url: https://api-docs.deepseek.com/news/news260424/}
       - <<: *deepseek-chat-v4-flash
@@ -2450,6 +2452,8 @@ models:
       - <<: *deepseek-v4-flash-routed
         provider: unknown
         alias: deepseek/deepseek-v4-flash
+      - <<: *deepseek-v4-flash-routed
+        alias: deepseek/deepseek/deepseek-v4-flash
       - &deepseek-v4-flash-vision-routed
         {provider: deepseek, alias: deepseek-v4-flash-vision-exp, channel: deepseek-api, effective_from: "2026-09-10T04:00:00+00:00", source_url: https://api-docs.deepseek.com/updates/}
       - <<: *deepseek-v4-flash-vision-routed
@@ -4286,3 +4290,14 @@ retrieval:
     per_1k_usd: 12.00
     effective_from: "2025-04-18"
     source_url: https://docs.perplexity.ai/docs/getting-started/pricing
+
+# Gateways whose reported amount billing declines for one publisher's models
+# from a date, because the catalog has shown the gateway's figure wrong there.
+# The call is billed at the catalog price and the gateway's figure is kept as
+# evidence; a product shows the note beside the figure.
+disputes:
+  - gateway: portkey
+    publisher: deepseek
+    since: "2026-09-10"
+    note: Portkey prices DeepSeek from a table that predates DeepSeek's 2026-09-10 price change, at a quarter to a half of the list price.
+    source_url: https://api-docs.deepseek.com/updates/

{metergraph_core-0.2.52 → metergraph_core-0.2.54}/src/metergraph_core/loader.py

@@ -18,6 +18,7 @@ from .catalog import (
     _effective_windows_overlap,
     normalize_provider,
 )
+from .billing import Dispute
 from .retrieval import RetrievalCatalog, RetrievalCostResult, RetrievalPrice
 
 DEFAULT_CATALOG_PATH = Path(__file__).parent / "data" / "prices.yaml"
@@ -75,6 +76,8 @@ class LoadedCatalog:
     snapshot: CatalogSnapshot
     canonical_ids: Mapping[tuple[str, str], str]
     retrieval: RetrievalCatalog
+    # Gateways whose amount billing declines per publisher; see Dispute.
+    disputes: tuple[Dispute, ...] = ()
 
     def canonical_model_id(self, provider: str, model_id: str) -> str:
         """Resolve a captured provider-native model id to its canonical id,
@@ -385,6 +388,44 @@ def parse_retrieval(document: Any) -> list[RetrievalPrice]:
     return prices
 
 
+def parse_disputes(document: Any) -> list[Dispute]:
+    """Parse the optional top-level ``disputes`` list: a gateway whose
+    reported amount is not believed for one publisher's models from a date,
+    with the note a product can show and the page that shows the figure is
+    wrong. An absent key yields no disputes."""
+    if not isinstance(document, dict):
+        raise CatalogError("prices document must be a mapping")
+    entries = document.get("disputes")
+    if entries is None:
+        return []
+    if not isinstance(entries, list):
+        raise CatalogError("prices document disputes must be a list")
+    disputes: list[Dispute] = []
+    for entry in entries:
+        if not isinstance(entry, dict):
+            raise CatalogError("dispute entry must be a mapping")
+        gateway = str(entry.get("gateway") or "").strip().lower()
+        publisher = str(entry.get("publisher") or "").strip().lower()
+        if not gateway or not publisher:
+            raise CatalogError("dispute entry needs gateway/publisher")
+        label = f"{gateway}/{publisher}"
+        note = str(entry.get("note") or "").strip()
+        if not note:
+            raise CatalogError(f"{label}: dispute entry needs a note")
+        if not str(entry.get("source_url") or "").strip():
+            raise CatalogError(f"{label}: dispute entry needs source_url")
+        disputes.append(
+            Dispute(
+                gateway=gateway,
+                publisher=publisher,
+                since=_date(entry.get("since"), field="since", model=label),
+                note=note,
+                source_url=str(entry["source_url"]).strip(),
+            )
+        )
+    return disputes
+
+
 def load_catalog(
     path: str | Path | None = None, *, region: str = "global"
 ) -> LoadedCatalog:
@@ -402,4 +443,5 @@ def load_catalog(
         snapshot=CatalogSnapshot(aliases, prices, region=region),
         canonical_ids=_canonical_index(document),
         retrieval=RetrievalCatalog(parse_retrieval(document)),
+        disputes=tuple(parse_disputes(document)),
     )

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

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