metergraph-core 0.2.18__tar.gz → 0.2.20__tar.gz

{metergraph_core-0.2.18/src/metergraph_core.egg-info → metergraph_core-0.2.20}/PKG-INFO

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

{metergraph_core-0.2.18 → metergraph_core-0.2.20}/pyproject.toml

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

{metergraph_core-0.2.18 → metergraph_core-0.2.20}/src/metergraph_core/catalog.py

@@ -14,6 +14,8 @@ _PROVIDER_ALIASES = {
     "aws-bedrock": "bedrock",
     "gemini": "google",
     "google-genai": "google",
+    "perplexity": "perplexity-ai",
+    "xai": "x-ai",
 }
 
 # The direct catalog channel each captured source provider was actually billed
@@ -29,6 +31,9 @@ _DIRECT_CHANNEL_BY_PROVIDER = {
     "vertex-ai": "google-vertex-ai",
     "fireworks": "fireworks-api",
     "bedrock": "aws-bedrock",
+    "deepseek": "deepseek-api",
+    "perplexity-ai": "perplexity-api",
+    "x-ai": "xai-api",
 }
 
 
@@ -137,6 +142,8 @@ def _price_tokens(
     output_tokens: Any,
     cache_read_tokens: Any,
     cache_write_tokens: Any,
+    cache_write_5m_tokens: Any,
+    cache_write_1h_tokens: Any,
     batch: bool,
 ) -> tuple[Decimal, list[str]]:
     """Cost a token usage against one already-selected price and its merged
@@ -146,7 +153,11 @@ def _price_tokens(
     input_count = _tokens(input_tokens)
     output_count = _tokens(output_tokens)
     cache_read_count = _tokens(cache_read_tokens) or 0
-    cache_write_count = _tokens(cache_write_tokens) or 0
+    cache_write_5m_count = _tokens(cache_write_5m_tokens)
+    if cache_write_5m_count is None:
+        cache_write_5m_count = _tokens(cache_write_tokens) or 0
+    cache_write_1h_count = _tokens(cache_write_1h_tokens) or 0
+    cache_write_count = cache_write_5m_count + cache_write_1h_count
     if input_count is None:
         reasons.append("missing_input_tokens")
         input_count = 0
@@ -210,16 +221,26 @@ def _price_tokens(
                 * input_multiplier
                 / _MILLION
             )
-    if cache_write_count:
+    if cache_write_5m_count:
         if price.cache_write_5m_per_mtok is None:
-            reasons.append("cache_write_rate_unavailable")
+            reasons.append("cache_write_5m_rate_unavailable")
         else:
             cost += (
-                Decimal(cache_write_count)
+                Decimal(cache_write_5m_count)
                 * price.cache_write_5m_per_mtok
                 * input_multiplier
                 / _MILLION
             )
+    if cache_write_1h_count:
+        if price.cache_write_1h_per_mtok is None:
+            reasons.append("cache_write_1h_rate_unavailable")
+        else:
+            cost += (
+                Decimal(cache_write_1h_count)
+                * price.cache_write_1h_per_mtok
+                * input_multiplier
+                / _MILLION
+            )
     if rules.get("uncaptured_fees"):
         reasons.append("uncaptured_fees")
 
@@ -333,6 +354,8 @@ class CatalogSnapshot:
         output_tokens: Any,
         cache_read_tokens: Any = None,
         cache_write_tokens: Any = None,
+        cache_write_5m_tokens: Any = None,
+        cache_write_1h_tokens: Any = None,
         batch: bool = False,
     ) -> CostResult:
         provider_key = str(provider or "").strip().lower()
@@ -358,6 +381,8 @@ class CatalogSnapshot:
             output_tokens=output_tokens,
             cache_read_tokens=cache_read_tokens,
             cache_write_tokens=cache_write_tokens,
+            cache_write_5m_tokens=cache_write_5m_tokens,
+            cache_write_1h_tokens=cache_write_1h_tokens,
             batch=batch,
         )
         return CostResult(
@@ -378,6 +403,8 @@ class CatalogSnapshot:
         output_tokens: Any,
         cache_read_tokens: Any = None,
         cache_write_tokens: Any = None,
+        cache_write_5m_tokens: Any = None,
+        cache_write_1h_tokens: Any = None,
         batch: bool = False,
     ) -> CostResult:
         """Price an observed deployment from the identity a caller already has:
@@ -401,6 +428,8 @@ class CatalogSnapshot:
             output_tokens=output_tokens,
             cache_read_tokens=cache_read_tokens,
             cache_write_tokens=cache_write_tokens,
+            cache_write_5m_tokens=cache_write_5m_tokens,
+            cache_write_1h_tokens=cache_write_1h_tokens,
             batch=batch,
         )
         return CostResult(

{metergraph_core-0.2.18 → metergraph_core-0.2.20}/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-09-07"
+version: "2026-09-11"
 currency: USD
-pricing_verified_at: "2026-09-07"
+pricing_verified_at: "2026-09-11"
 models:
   - canonical_id: openai/gpt-5.6-sol
     publisher: openai
@@ -756,6 +756,18 @@ models:
     aliases:
       - {provider: google, alias: gemini-2.5-flash-lite, channel: google-api}
       - {provider: google, alias: models/gemini-2.5-flash-lite, channel: google-api}
+      - {provider: google, alias: gemini-flash-lite-latest, channel: google-api}
+      - {provider: google, alias: models/gemini-flash-lite-latest, channel: google-api}
+      - {provider: google, alias: google/gemini-flash-lite-latest, channel: google-api}
+      - {provider: google, alias: google/models/gemini-flash-lite-latest, channel: google-api}
+      - {provider: unknown, alias: gemini-flash-lite-latest, channel: google-api}
+      - {provider: unknown, alias: models/gemini-flash-lite-latest, channel: google-api}
+      - {provider: unknown, alias: google/gemini-flash-lite-latest, channel: google-api}
+      - {provider: unknown, alias: google/models/gemini-flash-lite-latest, channel: google-api}
+      - {provider: litellm, alias: gemini-flash-lite-latest, channel: google-api}
+      - {provider: litellm, alias: models/gemini-flash-lite-latest, channel: google-api}
+      - {provider: litellm, alias: google/gemini-flash-lite-latest, channel: google-api}
+      - {provider: litellm, alias: google/models/gemini-flash-lite-latest, channel: google-api}
     prices:
       - channel: google-api
         region: global
@@ -1104,6 +1116,44 @@ models:
         cache_read_per_mtok: 0.075
         source_url: https://ai-gateway.vercel.sh/v1/models
 
+  - canonical_id: google/gemini-3.8-flash
+    publisher: google
+    aliases:
+      - {provider: google, alias: gemini-3.8-flash, channel: google-api}
+      - {provider: google, alias: models/gemini-3.8-flash, channel: google-api}
+      - {provider: google, alias: gemini-flash-latest, channel: google-api}
+      - {provider: google, alias: models/gemini-flash-latest, channel: google-api}
+      - {provider: google, alias: google/gemini-flash-latest, channel: google-api}
+      - {provider: google, alias: google/models/gemini-flash-latest, channel: google-api}
+      - {provider: unknown, alias: gemini-flash-latest, channel: google-api}
+      - {provider: unknown, alias: models/gemini-flash-latest, channel: google-api}
+      - {provider: unknown, alias: google/gemini-flash-latest, channel: google-api}
+      - {provider: unknown, alias: google/models/gemini-flash-latest, channel: google-api}
+      - {provider: litellm, alias: gemini-flash-latest, channel: google-api}
+      - {provider: litellm, alias: models/gemini-flash-latest, channel: google-api}
+      - {provider: litellm, alias: google/gemini-flash-latest, channel: google-api}
+      - {provider: litellm, alias: google/models/gemini-flash-latest, channel: google-api}
+    prices:
+      - channel: google-api
+        region: global
+        effective_from: "2026-09-01"
+        effective_to: "2027-01-01"
+        input_per_mtok: 0.75
+        output_per_mtok: 3.75
+        cache_read_per_mtok: 0.075
+        batch_input_per_mtok: 0.375
+        batch_output_per_mtok: 1.875
+        source_url: https://ai.google.dev/gemini-api/docs/pricing
+      - channel: google-api
+        region: global
+        effective_from: "2027-01-01"
+        input_per_mtok: 1.50
+        output_per_mtok: 7.50
+        cache_read_per_mtok: 0.15
+        batch_input_per_mtok: 0.75
+        batch_output_per_mtok: 3.75
+        source_url: https://ai.google.dev/gemini-api/docs/pricing
+
   - canonical_id: google/gemma-4-31b-it
     publisher: google
     aliases:
@@ -1142,6 +1192,38 @@ models:
         cache_read_per_mtok: 0.04
         source_url: https://ai-gateway.vercel.sh/v1/models
 
+  - canonical_id: deepseek/deepseek-v4.1-flash
+    publisher: deepseek
+    aliases:
+      - provider: deepseek
+        alias: deepseek/deepseek-v4.1-flash
+        channel: vercel-ai-gateway
+        rules: {input_includes_cache_read: true}
+    prices:
+      - channel: vercel-ai-gateway
+        region: global
+        effective_from: "2026-09-08"
+        input_per_mtok: 0.30
+        output_per_mtok: 1.20
+        cache_read_per_mtok: 0.03
+        source_url: https://ai-gateway.vercel.sh/v1/models
+
+  - canonical_id: meta/muse-spark-1.3
+    publisher: meta
+    aliases:
+      - provider: meta
+        alias: meta/muse-spark-1.3
+        channel: vercel-ai-gateway
+        rules: {input_includes_cache_read: true}
+    prices:
+      - channel: vercel-ai-gateway
+        region: global
+        effective_from: "2026-09-11"
+        input_per_mtok: 1.25
+        output_per_mtok: 4.25
+        cache_read_per_mtok: 0.15
+        source_url: https://ai-gateway.vercel.sh/v1/models
+
   - canonical_id: thinkingmachines/inkling
     publisher: thinkingmachines
     aliases:
@@ -1403,9 +1485,17 @@ models:
       - channel: vercel-ai-gateway
         region: global
         effective_from: "2026-08-14"
+        effective_to: "2026-09-11"
         input_per_mtok: 0.70
         output_per_mtok: 2.20
         source_url: https://vercel.com/ai-gateway/models/glm-5.3
+      - channel: vercel-ai-gateway
+        region: global
+        effective_from: "2026-09-11"
+        input_per_mtok: 1.40
+        output_per_mtok: 4.40
+        cache_read_per_mtok: 0.14
+        source_url: https://ai-gateway.vercel.sh/v1/models
       - channel: fireworks-api
         region: global
         effective_from: "2026-08-14"
@@ -1435,9 +1525,18 @@ models:
       - channel: vercel-ai-gateway
         region: global
         effective_from: "2026-08-26"
+        effective_to: "2026-09-11"
         input_per_mtok: 0.07125
         output_per_mtok: 0.2375
         source_url: https://vercel.com/ai-gateway/models/glm-5.3-flash
+      - channel: vercel-ai-gateway
+        region: global
+        effective_from: "2026-09-11"
+        input_per_mtok: 0.15
+        output_per_mtok: 0.50
+        cache_read_per_mtok: 0.03
+        source_url: https://ai-gateway.vercel.sh/v1/models
+
       - channel: fireworks-api
         region: global
         effective_from: "2026-08-26"
@@ -1446,6 +1545,22 @@ models:
         cache_read_per_mtok: 0.03
         source_url: https://fireworks.ai/models/fireworks/glm-5p3-flash
 
+  - canonical_id: zai/glm-5.3-fast
+    publisher: zai
+    aliases:
+      - provider: zai
+        alias: zai/glm-5.3-fast
+        channel: vercel-ai-gateway
+        rules: {input_includes_cache_read: true}
+    prices:
+      - channel: vercel-ai-gateway
+        region: global
+        effective_from: "2026-09-02"
+        input_per_mtok: 2.10
+        output_per_mtok: 6.60
+        cache_read_per_mtok: 0.21
+        source_url: https://ai-gateway.vercel.sh/v1/models
+
   - canonical_id: moonshotai/kimi-k2.6
     publisher: moonshotai
     aliases:

{metergraph_core-0.2.18 → metergraph_core-0.2.20}/src/metergraph_core/loader.py

@@ -100,6 +100,8 @@ class LoadedCatalog:
         output_tokens: Any,
         cache_read_tokens: Any = None,
         cache_write_tokens: Any = None,
+        cache_write_5m_tokens: Any = None,
+        cache_write_1h_tokens: Any = None,
         batch: bool = False,
     ) -> CostResult:
         """Price an observed deployment channel-exactly. See
@@ -112,6 +114,8 @@ class LoadedCatalog:
             output_tokens=output_tokens,
             cache_read_tokens=cache_read_tokens,
             cache_write_tokens=cache_write_tokens,
+            cache_write_5m_tokens=cache_write_5m_tokens,
+            cache_write_1h_tokens=cache_write_1h_tokens,
             batch=batch,
         )
 

{metergraph_core-0.2.18 → metergraph_core-0.2.20/src/metergraph_core.egg-info}/PKG-INFO

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