metergraph-core 0.8.6__tar.gz → 0.8.7__tar.gz

{metergraph_core-0.8.6/src/metergraph_core.egg-info → metergraph_core-0.8.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metergraph-core
-Version: 0.8.6
+Version: 0.8.7
 Summary: Open, effective-dated LLM pricing catalog and deterministic cost calculator for popular models across major providers and gateways, including OpenAI, Anthropic, Google Gemini, AWS Bedrock, OpenRouter, Vercel AI Gateway, and more.
 Author: Metergraph
 License-Expression: Apache-2.0
@@ -186,8 +186,9 @@ standard `cache_read_per_mtok`, as before. A standard call always uses the
 standard cache-read rate. A row with only a batch cache rate fully prices a
 cached batch call, while a cached standard call on it is `partial` with
 `cache_read_rate_unavailable`.
-Batch cache writes use `Price.batch_cache_write_5m_per_mtok` when stated;
-otherwise they retain the row's standard cache-write rate.
+Batch cache writes use `Price.batch_cache_write_5m_per_mtok` or
+`Price.batch_cache_write_1h_per_mtok` for the matching TTL when stated;
+otherwise each retains the row's standard cache-write rate.
 
 A `ModelUsage` count left `None` is unknown, not zero. A missing input or
 output count keeps the subtotal that is known, marks the result `partial`, and

{metergraph_core-0.8.6 → metergraph_core-0.8.7}/README.md

@@ -156,8 +156,9 @@ standard `cache_read_per_mtok`, as before. A standard call always uses the
 standard cache-read rate. A row with only a batch cache rate fully prices a
 cached batch call, while a cached standard call on it is `partial` with
 `cache_read_rate_unavailable`.
-Batch cache writes use `Price.batch_cache_write_5m_per_mtok` when stated;
-otherwise they retain the row's standard cache-write rate.
+Batch cache writes use `Price.batch_cache_write_5m_per_mtok` or
+`Price.batch_cache_write_1h_per_mtok` for the matching TTL when stated;
+otherwise each retains the row's standard cache-write rate.
 
 A `ModelUsage` count left `None` is unknown, not zero. A missing input or
 output count keeps the subtotal that is known, marks the result `partial`, and

{metergraph_core-0.8.6 → metergraph_core-0.8.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "metergraph-core"
-version = "0.8.6"
+version = "0.8.7"
 description = "Open, effective-dated LLM pricing catalog and deterministic cost calculator for popular models across major providers and gateways, including OpenAI, Anthropic, Google Gemini, AWS Bedrock, OpenRouter, Vercel AI Gateway, and more."
 readme = "README.md"
 license = "Apache-2.0"

{metergraph_core-0.8.6 → metergraph_core-0.8.7}/src/metergraph_core/catalog.py

@@ -242,11 +242,16 @@ class Price:
     batch_cache_read_per_mtok: Decimal | None = None
     # OpenAI publishes a separate Batch/Flex cache-write rate.
     batch_cache_write_5m_per_mtok: Decimal | None = None
+    batch_cache_write_1h_per_mtok: Decimal | None = None
 
     def __post_init__(self) -> None:
         # The loader checks the rate it reads, but a row built or replaced
         # directly must not bill a negative or undefined cache component.
-        for name in ("batch_cache_read_per_mtok", "batch_cache_write_5m_per_mtok"):
+        for name in (
+            "batch_cache_read_per_mtok",
+            "batch_cache_write_5m_per_mtok",
+            "batch_cache_write_1h_per_mtok",
+        ):
             rate = getattr(self, name)
             if rate is not None and not (
                 isinstance(rate, Decimal) and rate.is_finite() and rate >= 0
@@ -411,6 +416,7 @@ def _billed_terms(resolved: ResolvedPrice) -> tuple[Any, ...]:
         price.batch_output_per_mtok,
         price.batch_cache_read_per_mtok,
         price.batch_cache_write_5m_per_mtok,
+        price.batch_cache_write_1h_per_mtok,
         price.request_fee_per_1k_usd,
         resolved.rules,
     )
@@ -565,6 +571,7 @@ def _price_tokens(
     output_rate = price.output_per_mtok
     cache_read_rate = price.cache_read_per_mtok
     cache_write_5m_rate = price.cache_write_5m_per_mtok
+    cache_write_1h_rate = price.cache_write_1h_per_mtok
     if batch:
         if price.batch_input_per_mtok is None or price.batch_output_per_mtok is None:
             reasons.append("batch_rate_unavailable")
@@ -577,6 +584,8 @@ def _price_tokens(
             cache_read_rate = price.batch_cache_read_per_mtok
         if price.batch_cache_write_5m_per_mtok is not None:
             cache_write_5m_rate = price.batch_cache_write_5m_per_mtok
+        if price.batch_cache_write_1h_per_mtok is not None:
+            cache_write_1h_rate = price.batch_cache_write_1h_per_mtok
 
     input_multiplier = Decimal("1")
     output_multiplier = Decimal("1")
@@ -633,12 +642,12 @@ def _price_tokens(
                 / _MILLION
             )
     if cache_write_1h_count:
-        if price.cache_write_1h_per_mtok is None:
+        if cache_write_1h_rate is None:
             reasons.append("cache_write_1h_rate_unavailable")
         else:
             cache_write_usd += (
                 Decimal(cache_write_1h_count)
-                * price.cache_write_1h_per_mtok
+                * cache_write_1h_rate
                 * input_multiplier
                 / _MILLION
             )

{metergraph_core-0.8.6 → metergraph_core-0.8.7}/src/metergraph_core/catalog_delta.py

@@ -55,6 +55,7 @@ RATE_FIELDS = (
     "batch_output_per_mtok",
     "batch_cache_read_per_mtok",
     "batch_cache_write_5m_per_mtok",
+    "batch_cache_write_1h_per_mtok",
     "request_fee_per_1k_usd",
 )
 _PRICE_FIELDS = frozenset(

{metergraph_core-0.8.6 → metergraph_core-0.8.7}/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-29.3"
+version: "2026-11-02.1"
 currency: USD
-pricing_verified_at: "2026-10-29"
+pricing_verified_at: "2026-11-02"
 models:
   - canonical_id: openai/gpt-6-sol
     publisher: openai
@@ -1623,6 +1623,7 @@ models:
       - channel: anthropic-api
         region: global
         effective_from: "2026-10-07"
+        effective_to: "2026-10-30"
         input_per_mtok: 0.10
         output_per_mtok: 0.50
         cache_read_per_mtok: 0.01
@@ -1633,6 +1634,19 @@ models:
         rules:
           long_context: {threshold: 100000, input_multiplier: 5, output_multiplier: 5, threshold_counts_cached_tokens: true}
         source_url: https://www.anthropic.com/claude-haiku-5-5
+      - channel: anthropic-api
+        region: global
+        effective_from: "2026-10-30"
+        input_per_mtok: 0.10
+        output_per_mtok: 0.50
+        cache_read_per_mtok: 0.01
+        cache_write_5m_per_mtok: 0.125
+        cache_write_1h_per_mtok: 0.20
+        batch_input_per_mtok: 0.05
+        batch_output_per_mtok: 0.25
+        rules:
+          long_context: {threshold: 100000, input_multiplier: 5, output_multiplier: 5, threshold_counts_cached_tokens: true}
+        source_url: https://platform.claude.com/docs/en/about-claude/pricing
       - channel: vercel-ai-gateway
         region: global
         effective_from: "2026-10-07"
@@ -3620,12 +3634,46 @@ models:
       - channel: moonshot-api
         region: global
         effective_from: "2026-10-24"
+        effective_to: "2026-10-30"
+        input_per_mtok: 2.00
+        output_per_mtok: 10.00
+        cache_read_per_mtok: 0.20
+        cache_write_5m_per_mtok: 2.00
+        rules: {input_includes_cache_read: true, input_includes_cache_write: true}
+        source_url: https://platform.kimi.ai/
+      # Batch input/output are 60% of the standard price, the rule the platform
+      # states for this model: https://platform.kimi.ai/docs/pricing/batch
+      - channel: moonshot-api
+        region: global
+        effective_from: "2026-10-30"
+        effective_to: "2026-11-02"
         input_per_mtok: 2.00
         output_per_mtok: 10.00
         cache_read_per_mtok: 0.20
         cache_write_5m_per_mtok: 2.00
+        batch_input_per_mtok: 1.20
+        batch_output_per_mtok: 6.00
+        batch_cache_read_per_mtok: 0.12
+        batch_cache_write_5m_per_mtok: 1.20
         rules: {input_includes_cache_read: true, input_includes_cache_write: true}
         source_url: https://platform.kimi.ai/
+      # Current 1h rates: https://platform.kimi.ai/docs/pricing/chat
+      # Batch 1h rates: https://platform.kimi.ai/docs/pricing/batch
+      - channel: moonshot-api
+        region: global
+        effective_from: "2026-11-02"
+        input_per_mtok: 2.00
+        output_per_mtok: 10.00
+        cache_read_per_mtok: 0.20
+        cache_write_5m_per_mtok: 2.00
+        cache_write_1h_per_mtok: 4.00
+        batch_input_per_mtok: 1.20
+        batch_output_per_mtok: 6.00
+        batch_cache_read_per_mtok: 0.12
+        batch_cache_write_5m_per_mtok: 1.20
+        batch_cache_write_1h_per_mtok: 2.40
+        rules: {input_includes_cache_read: true, input_includes_cache_write: true}
+        source_url: https://platform.kimi.ai/docs/pricing/batch
 
   - canonical_id: moonshotai/kimi-k3.1-pro-highspeed
     publisher: moonshotai
@@ -3698,12 +3746,46 @@ models:
       - channel: moonshot-api
         region: global
         effective_from: "2026-10-29"
+        effective_to: "2026-10-30"
         input_per_mtok: 3.0
         output_per_mtok: 15.0
         cache_read_per_mtok: 0.3
         cache_write_5m_per_mtok: 3.0
         rules: {input_includes_cache_read: true, input_includes_cache_write: true}
         source_url: https://platform.kimi.ai/
+      # Batch input/output are 60% of the standard price, the rule the platform
+      # states for this model: https://platform.kimi.ai/docs/pricing/batch
+      - channel: moonshot-api
+        region: global
+        effective_from: "2026-10-30"
+        effective_to: "2026-11-02"
+        input_per_mtok: 3.0
+        output_per_mtok: 15.0
+        cache_read_per_mtok: 0.3
+        cache_write_5m_per_mtok: 3.0
+        batch_input_per_mtok: 1.80
+        batch_output_per_mtok: 9.00
+        batch_cache_read_per_mtok: 0.18
+        batch_cache_write_5m_per_mtok: 1.80
+        rules: {input_includes_cache_read: true, input_includes_cache_write: true}
+        source_url: https://platform.kimi.ai/
+      # Current 1h rates: https://platform.kimi.ai/docs/pricing/chat
+      # Batch 1h rates: https://platform.kimi.ai/docs/pricing/batch
+      - channel: moonshot-api
+        region: global
+        effective_from: "2026-11-02"
+        input_per_mtok: 3.0
+        output_per_mtok: 15.0
+        cache_read_per_mtok: 0.3
+        cache_write_5m_per_mtok: 3.0
+        cache_write_1h_per_mtok: 6.0
+        batch_input_per_mtok: 1.80
+        batch_output_per_mtok: 9.00
+        batch_cache_read_per_mtok: 0.18
+        batch_cache_write_5m_per_mtok: 1.80
+        batch_cache_write_1h_per_mtok: 3.60
+        rules: {input_includes_cache_read: true, input_includes_cache_write: true}
+        source_url: https://platform.kimi.ai/docs/pricing/batch
       - channel: fireworks-api
         region: global
         effective_from: "2026-07-19"
@@ -4574,10 +4656,6 @@ models:
         cache_read_per_mtok: 0.16
         source_url: https://fireworks.ai/models/fireworks/kimi-k2p6
 
-  # Google prices this model's output by modality: $9.00 text, $17.50 video.
-  # The catalog carries one output rate per price row, so this records the text
-  # rate. A video-heavy caller is therefore under-costed here, which is the
-  # known limitation to revisit if that traffic ever becomes material.
       - channel: openrouter-api
         region: global
         effective_from: "2026-10-20"
@@ -4609,7 +4687,9 @@ models:
       - {provider: google, alias: gemini-omni-1.1-flash, channel: google-api}
       - {provider: google, alias: models/gemini-omni-1.1-flash, channel: google-api}
     prices:
-      # Uses the video output rate: video is this model's only output modality.
+      # Google lists $9.00 text and $17.50 video output here; $17.50 is the
+      # billed rate, the one its stated 5,792 tokens per second of 720p video
+      # at about $0.10 per second resolves to.
       - channel: google-api
         region: global
         effective_from: "2026-08-27"
@@ -4629,6 +4709,20 @@ models:
       - channel: google-api
         region: global
         effective_from: "2026-10-29"
+        effective_to: "2026-10-30"
+        input_per_mtok: 1.50
+        output_per_mtok: 17.50
+        source_url: https://ai.google.dev/gemini-api/docs/pricing
+      - channel: google-api
+        region: global
+        effective_from: "2026-10-30"
+        effective_to: "2026-10-31"
+        input_per_mtok: 1.5
+        output_per_mtok: 9
+        source_url: https://ai.google.dev/gemini-api/docs/pricing
+      - channel: google-api
+        region: global
+        effective_from: "2026-10-31"
         input_per_mtok: 1.50
         output_per_mtok: 17.50
         source_url: https://ai.google.dev/gemini-api/docs/pricing

{metergraph_core-0.8.6 → metergraph_core-0.8.7}/src/metergraph_core/loader.py

@@ -428,6 +428,17 @@ def parse_catalog(
                     f"{canonical}: invalid batch_cache_write_5m_per_mtok "
                     f"{batch_cache_write!r}"
                 )
+            batch_cache_write_1h = price.get("batch_cache_write_1h_per_mtok")
+            batch_cache_write_1h_per_mtok = _decimal(batch_cache_write_1h)
+            if batch_cache_write_1h is not None and (
+                batch_cache_write_1h_per_mtok is None
+                or not batch_cache_write_1h_per_mtok.is_finite()
+                or batch_cache_write_1h_per_mtok < 0
+            ):
+                raise CatalogError(
+                    f"{canonical}: invalid batch_cache_write_1h_per_mtok "
+                    f"{batch_cache_write_1h!r}"
+                )
             prices.append(
                 Price(
                     id=f"{canonical}:{channel}:{region}:{_id_date(effective_from)}",
@@ -454,6 +465,7 @@ def parse_catalog(
                     currency=currency,
                     batch_cache_read_per_mtok=batch_cache_read_per_mtok,
                     batch_cache_write_5m_per_mtok=batch_cache_write_5m_per_mtok,
+                    batch_cache_write_1h_per_mtok=batch_cache_write_1h_per_mtok,
                 )
             )
     return version, {key: tuple(value) for key, value in aliases.items()}, _unique_ids(prices)

{metergraph_core-0.8.6 → metergraph_core-0.8.7/src/metergraph_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metergraph-core
-Version: 0.8.6
+Version: 0.8.7
 Summary: Open, effective-dated LLM pricing catalog and deterministic cost calculator for popular models across major providers and gateways, including OpenAI, Anthropic, Google Gemini, AWS Bedrock, OpenRouter, Vercel AI Gateway, and more.
 Author: Metergraph
 License-Expression: Apache-2.0
@@ -186,8 +186,9 @@ standard `cache_read_per_mtok`, as before. A standard call always uses the
 standard cache-read rate. A row with only a batch cache rate fully prices a
 cached batch call, while a cached standard call on it is `partial` with
 `cache_read_rate_unavailable`.
-Batch cache writes use `Price.batch_cache_write_5m_per_mtok` when stated;
-otherwise they retain the row's standard cache-write rate.
+Batch cache writes use `Price.batch_cache_write_5m_per_mtok` or
+`Price.batch_cache_write_1h_per_mtok` for the matching TTL when stated;
+otherwise each retains the row's standard cache-write rate.
 
 A `ModelUsage` count left `None` is unknown, not zero. A missing input or
 output count keeps the subtotal that is known, marks the result `partial`, and