metergraph-core 0.2.58__tar.gz → 0.2.59__tar.gz

{metergraph_core-0.2.58/src/metergraph_core.egg-info → metergraph_core-0.2.59}/PKG-INFO

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

{metergraph_core-0.2.58 → metergraph_core-0.2.59}/pyproject.toml

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

{metergraph_core-0.2.58 → metergraph_core-0.2.59}/src/metergraph_core/catalog.py

@@ -380,7 +380,10 @@ def _price_tokens(
 
     billable_input = input_count
     deducted_input = 0
-    if counts_cache_read_in_input(price.publisher, price.pricing_channel, rules):
+    input_includes_cache_read = counts_cache_read_in_input(
+        price.publisher, price.pricing_channel, rules
+    )
+    if input_includes_cache_read:
         if cache_read_count > input_count:
             reasons.append("cache_read_exceeds_input")
             deducted_input = input_count
@@ -407,7 +410,13 @@ def _price_tokens(
     output_multiplier = Decimal("1")
     long_context = rules.get("long_context") or {}
     threshold = _tokens(long_context.get("threshold"))
-    if threshold is not None and input_count > threshold:
+    prompt_count = input_count
+    if long_context.get("threshold_counts_cached_tokens"):
+        if not input_includes_cache_read:
+            prompt_count += cache_read_count
+        if not rules.get("input_includes_cache_write"):
+            prompt_count += cache_write_count
+    if threshold is not None and prompt_count > threshold:
         input_multiplier = _decimal(long_context.get("input_multiplier")) or Decimal("1")
         output_multiplier = _decimal(
             long_context.get("output_multiplier")

{metergraph_core-0.2.58 → metergraph_core-0.2.59}/src/metergraph_core/data/models.yaml

@@ -1,4 +1,4 @@
-version: '2026-10-09'
+version: '2026-10-13'
 models:
 - canonical_id: openai/gpt-5.6-sol
   display_name: GPT-5.6 Sol
@@ -648,10 +648,38 @@ models:
     pricing_channel: vercel-ai-gateway
     execution_profiles:
     - default
+  - key: default:anthropic:claude-sonnet-5-5
+    id: anthropic:claude-sonnet-5-5
+    provider: anthropic
+    model_id: claude-sonnet-5-5
+    pricing_channel: anthropic-api
+    execution_profiles:
+    - default
+    display_name: Claude Sonnet 5.5 (direct)
+- canonical_id: anthropic/claude-haiku-5.5
+  display_name: Claude Haiku 5.5
+  publisher: anthropic
+  released: '2026-10-07'  # https://www.anthropic.com/claude-haiku-5-5
+  routes:
+  - key: default:anthropic/claude-haiku-5.5
+    id: anthropic/claude-haiku-5.5
+    provider: vercel
+    model_id: anthropic/claude-haiku-5.5
+    pricing_channel: vercel-ai-gateway
+    execution_profiles:
+    - default
+  - key: default:anthropic:claude-haiku-5-5
+    id: anthropic:claude-haiku-5-5
+    provider: anthropic
+    model_id: claude-haiku-5-5
+    pricing_channel: anthropic-api
+    execution_profiles:
+    - default
+    display_name: Claude Haiku 5.5 (direct)
 - canonical_id: openai/gpt-6.1-sol
   display_name: GPT-6.1 Sol
   publisher: openai
-  released: '2026-09-29'  # https://www.sitepoint.com/gpt-6-1-sol-developers-pricing-quickstart/
+  released: '2026-09-29'  # https://developers.openai.com/api/docs/models/gpt-6.1-sol
   routes:
   - key: default:openai/gpt-6.1-sol
     id: openai/gpt-6.1-sol
@@ -660,6 +688,50 @@ models:
     pricing_channel: vercel-ai-gateway
     execution_profiles:
     - default
+  - key: default:openai:gpt-6.1-sol
+    id: openai:gpt-6.1-sol
+    provider: openai
+    model_id: gpt-6.1-sol
+    pricing_channel: openai-api
+    execution_profiles:
+    - default
+    display_name: GPT-6.1 Sol (direct)
+- canonical_id: google/gemini-4-argon
+  display_name: Gemini 4 Argon
+  publisher: google
+  released: '2026-10-13'  # https://ai.google.dev/gemini-api/docs/generate-content/latest-model
+  routes:
+  - key: default:google/gemini-4-argon
+    id: google/gemini-4-argon
+    provider: vercel
+    model_id: google/gemini-4-argon
+    pricing_channel: vercel-ai-gateway
+    execution_profiles:
+    - default
+- canonical_id: mistral/mistral-large-4
+  display_name: Mistral Large 4
+  publisher: mistral
+  released: '2026-10-06'  # https://docs.mistral.ai/models/mistral-large
+  routes:
+  - key: default:mistral/mistral-large-4
+    id: mistral/mistral-large-4
+    provider: vercel
+    model_id: mistral/mistral-large-4
+    pricing_channel: vercel-ai-gateway
+    execution_profiles:
+    - default
+- canonical_id: meta/muse-wonder-1.0
+  display_name: Muse Wonder 1.0
+  publisher: meta
+  released: '2026-10-12'  # https://about.fb.com/news/2026/10/introducing-muse-wonder-models/
+  routes:
+  - key: default:meta/muse-wonder-1.0
+    id: meta/muse-wonder-1.0
+    provider: vercel
+    model_id: meta/muse-wonder-1.0
+    pricing_channel: vercel-ai-gateway
+    execution_profiles:
+    - default
 - canonical_id: xai/grok-4.7
   display_name: Grok 4.7
   publisher: xai
@@ -780,6 +852,13 @@ execution_profiles:
   - default:anthropic:claude-haiku-4-5
   - default:anthropic/claude-sonnet-4.6
   - default:xai/grok-4.3
+  - default:anthropic/claude-haiku-5.5
+  - default:google/gemini-4-argon
+  - default:mistral/mistral-large-4
+  - default:meta/muse-wonder-1.0
+  - default:openai:gpt-6.1-sol
+  - default:anthropic:claude-sonnet-5-5
+  - default:anthropic:claude-haiku-5-5
 - id: bedrock
   routes:
   - bedrock:anthropic/claude-sonnet-5
@@ -816,8 +895,6 @@ offer_groups:
   - default:anthropic/claude-fable-5
   - default:anthropic/claude-fable-5.1
   - default:google/gemini-3.8-flash
-  - default:google/gemini-3.7-flash
-  - default:google/gemini-3.5-flash
   - default:google/gemini-3.5-flash-lite
   - default:google/gemini-3.1-flash-lite
   - default:google/gemma-4-31b-it
@@ -839,6 +916,10 @@ offer_groups:
   - default:zai/glm-5.3
   - default:anthropic/claude-sonnet-4.6
   - default:xai/grok-4.3
+  - default:anthropic/claude-haiku-5.5
+  - default:google/gemini-4-argon
+  - default:mistral/mistral-large-4
+  - default:meta/muse-wonder-1.0
 - id: fireworks
   credential: FIREWORKS_API_KEY
   routes:
@@ -853,6 +934,7 @@ offer_groups:
   - default:openai:gpt-5.4
   - default:openai:gpt-5.4-mini
   - default:openai:gpt-5.4-nano
+  - default:openai:gpt-6.1-sol
 - id: anthropic-direct
   credential: ANTHROPIC_API_KEY
   routes:
@@ -860,6 +942,8 @@ offer_groups:
   - default:anthropic:claude-opus-4-8
   - default:anthropic:claude-sonnet-5
   - default:anthropic:claude-haiku-4-5
+  - default:anthropic:claude-sonnet-5-5
+  - default:anthropic:claude-haiku-5-5
 - id: bedrock
   credential: null
   routes:

{metergraph_core-0.2.58 → metergraph_core-0.2.59}/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-07"
+version: "2026-10-13"
 currency: USD
-pricing_verified_at: "2026-10-07"
+pricing_verified_at: "2026-10-13"
 models:
   - canonical_id: openai/gpt-6-sol
     publisher: openai
@@ -233,6 +233,9 @@ models:
   - canonical_id: openai/gpt-6.1-sol
     publisher: openai
     aliases:
+      - {provider: openai, alias: gpt-6.1-sol, channel: openai-api}
+      - {provider: litellm, alias: gpt-6.1-sol, channel: openai-api}
+      - {provider: unknown, alias: gpt-6.1-sol, channel: openai-api}
       # No global inference profile is available.
       - {provider: bedrock, alias: us.openai.gpt-6.1-sol, channel: aws-bedrock-geo, price_region: global}
       - {provider: bedrock, alias: openai.gpt-6.1-sol, channel: aws-bedrock, price_region: us-east-1}
@@ -243,6 +246,18 @@ models:
         effective_from: "2026-10-02"
         source_url: https://ai-gateway.vercel.sh/v1/models
     prices:
+      - channel: openai-api
+        region: global
+        effective_from: "2026-09-29"
+        input_per_mtok: 2.00
+        output_per_mtok: 10.00
+        cache_read_per_mtok: 0.10
+        cache_write_5m_per_mtok: 2.50
+        batch_input_per_mtok: 1.00
+        batch_output_per_mtok: 5.00
+        rules:
+          long_context: {threshold: 272000, input_multiplier: 2, output_multiplier: 1.5}
+        source_url: https://developers.openai.com/api/docs/models/gpt-6.1-sol
       # The 5m field stores AWS's unsplit cache-write rate.
       - channel: aws-bedrock-geo
         region: global
@@ -1123,6 +1138,7 @@ models:
       - channel: anthropic-api
         region: global
         effective_from: "2026-09-28"
+        effective_to: "2026-10-07"
         input_per_mtok: 2.00
         output_per_mtok: 10.00
         cache_read_per_mtok: 0.20
@@ -1134,11 +1150,67 @@ models:
       - channel: vercel-ai-gateway
         region: global
         effective_from: "2026-09-28"
+        effective_to: "2026-10-07"
         input_per_mtok: 2.00
         output_per_mtok: 10.00
         cache_read_per_mtok: 0.20
         cache_write_5m_per_mtok: 2.50
         source_url: https://ai-gateway.vercel.sh/v1/models
+      - channel: anthropic-api
+        region: global
+        effective_from: "2026-10-07"
+        input_per_mtok: 2.00
+        output_per_mtok: 10.00
+        cache_read_per_mtok: 0.10
+        cache_write_5m_per_mtok: 2.50
+        cache_write_1h_per_mtok: 4.00
+        batch_input_per_mtok: 1.00
+        batch_output_per_mtok: 5.00
+        source_url: https://www.anthropic.com/claude-haiku-5-5
+      - channel: vercel-ai-gateway
+        region: global
+        effective_from: "2026-10-07"
+        input_per_mtok: 2.00
+        output_per_mtok: 10.00
+        cache_read_per_mtok: 0.10
+        cache_write_5m_per_mtok: 2.50
+        source_url: https://vercel.com/ai-gateway/models/claude-sonnet-5.5
+
+  - canonical_id: anthropic/claude-haiku-5.5
+    publisher: anthropic
+    aliases:
+      - {provider: anthropic, alias: claude-haiku-5-5, channel: anthropic-api}
+      - {provider: anthropic, alias: anthropic/claude-haiku-5-5, channel: anthropic-api}
+      - {provider: litellm, alias: claude-haiku-5-5, channel: anthropic-api}
+      - {provider: unknown, alias: claude-haiku-5-5, channel: anthropic-api}
+      - provider: anthropic
+        alias: anthropic/claude-haiku-5.5
+        channel: vercel-ai-gateway
+        rules: {input_includes_cache_read: true, input_includes_cache_write: true}
+    prices:
+      - channel: anthropic-api
+        region: global
+        effective_from: "2026-10-07"
+        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://www.anthropic.com/claude-haiku-5-5
+      - channel: vercel-ai-gateway
+        region: global
+        effective_from: "2026-10-07"
+        input_per_mtok: 0.10
+        output_per_mtok: 0.50
+        cache_read_per_mtok: 0.01
+        cache_write_5m_per_mtok: 0.125
+        rules:
+          long_context: {threshold: 100000, input_multiplier: 5, output_multiplier: 5, threshold_counts_cached_tokens: true}
+        source_url: https://vercel.com/ai-gateway/models/claude-haiku-5.5
 
   - canonical_id: anthropic/claude-sonnet-5
     publisher: anthropic
@@ -1445,6 +1517,51 @@ models:
           long_context: {threshold: 200000, input_multiplier: 2, output_multiplier: 1.5}
         source_url: https://vercel.com/ai-gateway/models/gemini-3.1-pro-preview
 
+  - canonical_id: google/gemini-4-argon
+    publisher: google
+    aliases:
+      - {provider: google, alias: gemini-4-argon, channel: google-api}
+      - {provider: google, alias: models/gemini-4-argon, channel: google-api}
+      - {provider: litellm, alias: gemini-4-argon, channel: google-api}
+      - {provider: litellm, alias: models/gemini-4-argon, channel: google-api}
+      - {provider: unknown, alias: gemini-4-argon, channel: google-api}
+      - {provider: unknown, alias: models/gemini-4-argon, channel: google-api}
+      - provider: google
+        alias: google/gemini-4-argon
+        channel: vercel-ai-gateway
+        rules: {input_includes_cache_read: true}
+    prices:
+      - channel: google-api
+        region: global
+        effective_from: "2026-10-13"
+        effective_to: "2026-12-01"
+        input_per_mtok: 2.00
+        output_per_mtok: 10.00
+        cache_read_per_mtok: 0.10
+        source_url: https://ai.google.dev/gemini-api/docs/generate-content/latest-model
+      - channel: google-api
+        region: global
+        effective_from: "2026-12-01"
+        input_per_mtok: 4.00
+        output_per_mtok: 20.00
+        cache_read_per_mtok: 0.20
+        source_url: https://ai.google.dev/gemini-api/docs/generate-content/latest-model
+      - channel: vercel-ai-gateway
+        region: global
+        effective_from: "2026-10-13"
+        effective_to: "2026-12-01"
+        input_per_mtok: 2.00
+        output_per_mtok: 10.00
+        cache_read_per_mtok: 0.10
+        source_url: https://vercel.com/ai-gateway/models/gemini-4-argon
+      - channel: vercel-ai-gateway
+        region: global
+        effective_from: "2026-12-01"
+        input_per_mtok: 4.00
+        output_per_mtok: 20.00
+        cache_read_per_mtok: 0.20
+        source_url: https://vercel.com/ai-gateway/models/gemini-4-argon
+
   - canonical_id: google/gemini-3.5-flash
     publisher: google
     aliases:
@@ -1708,6 +1825,32 @@ models:
         output_per_mtok: 0.65
         source_url: https://ai-gateway.vercel.sh/v1/models
 
+  - canonical_id: meta/muse-wonder-1.0
+    publisher: meta
+    aliases:
+      - {provider: meta, alias: muse-wonder-1.0, channel: meta-api, rules: {input_includes_cache_read: true}}
+      - {provider: litellm, alias: muse-wonder-1.0, channel: meta-api, rules: {input_includes_cache_read: true}}
+      - {provider: unknown, alias: muse-wonder-1.0, channel: meta-api, rules: {input_includes_cache_read: true}}
+      - provider: meta
+        alias: meta/muse-wonder-1.0
+        channel: vercel-ai-gateway
+        rules: {input_includes_cache_read: true}
+    prices:
+      - channel: meta-api
+        region: global
+        effective_from: "2026-10-12"
+        input_per_mtok: 4.00
+        output_per_mtok: 20.00
+        cache_read_per_mtok: 0.20
+        source_url: https://dev.meta.ai/resources/blog/build-with-muse-wonder
+      - channel: vercel-ai-gateway
+        region: global
+        effective_from: "2026-10-12"
+        input_per_mtok: 4.00
+        output_per_mtok: 20.00
+        cache_read_per_mtok: 0.20
+        source_url: https://vercel.com/ai-gateway/models/muse-wonder-1.0
+
   - canonical_id: meta/muse-spark-1.1
     publisher: meta
     aliases:
@@ -1734,12 +1877,41 @@ models:
         output_per_mtok: 4.25
         cache_read_per_mtok: 0.15
         source_url: https://dev.meta.ai/docs/pricing-rate-limits
+  - canonical_id: mistral/mistral-large-4
+    publisher: mistral
+    aliases:
+      - {provider: mistral, alias: mistral-large-4, channel: mistral-api}
+      - {provider: mistral, alias: mistral-large-latest, channel: mistral-api, effective_from: "2026-10-06", source_url: https://docs.mistral.ai/resources/changelogs}
+      - {provider: litellm, alias: mistral-large-4, channel: mistral-api}
+      - {provider: unknown, alias: mistral-large-4, channel: mistral-api}
+      - provider: mistral
+        alias: mistral/mistral-large-4
+        channel: vercel-ai-gateway
+        rules: {input_includes_cache_read: true}
+    prices:
+      - channel: mistral-api
+        region: global
+        effective_from: "2026-10-06"
+        input_per_mtok: 1.36
+        output_per_mtok: 4.18
+        cache_read_per_mtok: 0.14
+        batch_input_per_mtok: 0.68
+        batch_output_per_mtok: 2.09
+        source_url: https://docs.mistral.ai/models/mistral-large
+      - channel: vercel-ai-gateway
+        region: global
+        effective_from: "2026-10-06"
+        input_per_mtok: 0.68
+        output_per_mtok: 2.09
+        cache_read_per_mtok: 0.07
+        source_url: https://vercel.com/ai-gateway/models/mistral-large-4
+
   - canonical_id: mistral/mistral-large-3
     publisher: mistral
     aliases:
       - {provider: bedrock, alias: mistral.mistral-large-3-675b-instruct, channel: aws-bedrock}
       - {provider: litellm, alias: mistral-large-3, channel: mistral-api}
-      - {provider: mistral, alias: mistral-large-latest, channel: mistral-api, effective_from: "2025-12-02", source_url: https://docs.mistral.ai/resources/changelogs}
+      - {provider: mistral, alias: mistral-large-latest, channel: mistral-api, effective_from: "2025-12-02", effective_to: "2026-10-06", source_url: https://docs.mistral.ai/resources/changelogs}
       - {provider: mistral, alias: mistral/mistral-large-3, channel: vercel-ai-gateway, rules: {"input_includes_cache_read": true, "input_includes_cache_write": true}}
       - {provider: mistral, alias: mistral-large-3, channel: mistral-api}
       - {provider: unknown, alias: mistral-large-3, channel: mistral-api}

{metergraph_core-0.2.58 → metergraph_core-0.2.59/src/metergraph_core.egg-info}/PKG-INFO

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