metergraph-core 0.2.35__tar.gz → 0.2.36__tar.gz

{metergraph_core-0.2.35/src/metergraph_core.egg-info → metergraph_core-0.2.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metergraph-core
-Version: 0.2.35
+Version: 0.2.36
 Summary: Reusable MeterGraph catalog and deterministic billing engine
 License-Expression: Apache-2.0
 Requires-Python: >=3.10
@@ -81,6 +81,13 @@ and surrounding whitespace, applies the configured region fallback and
 effective-date windows, and returns `None` when no exact model/channel price
 exists. It never substitutes a direct-provider price for a gateway price.
 
+On Bedrock only (provider `bedrock` for `cost`, channel `aws-bedrock` or
+`aws-bedrock-geo` for `resolve_price`), an id with no exact alias falls back to
+the id without its model-version suffix (`anthropic.claude-sonnet-5-v1:0` to
+`anthropic.claude-sonnet-5`) and then without a `global.` inference-profile
+prefix, the latter only onto an `aws-bedrock` alias. Geographic prefixes such as
+`us.` or `eu.` are never stripped, because they bill on `aws-bedrock-geo`.
+
 `LoadedCatalog.currency` is currently always `USD`, and
 `LoadedCatalog.pricing_verified_at` records when the bundled catalog was last
 checked against its linked provider sources.

{metergraph_core-0.2.35 → metergraph_core-0.2.36}/README.md

@@ -69,6 +69,13 @@ and surrounding whitespace, applies the configured region fallback and
 effective-date windows, and returns `None` when no exact model/channel price
 exists. It never substitutes a direct-provider price for a gateway price.
 
+On Bedrock only (provider `bedrock` for `cost`, channel `aws-bedrock` or
+`aws-bedrock-geo` for `resolve_price`), an id with no exact alias falls back to
+the id without its model-version suffix (`anthropic.claude-sonnet-5-v1:0` to
+`anthropic.claude-sonnet-5`) and then without a `global.` inference-profile
+prefix, the latter only onto an `aws-bedrock` alias. Geographic prefixes such as
+`us.` or `eu.` are never stripped, because they bill on `aws-bedrock-geo`.
+
 `LoadedCatalog.currency` is currently always `USD`, and
 `LoadedCatalog.pricing_verified_at` records when the bundled catalog was last
 checked against its linked provider sources.

{metergraph_core-0.2.35 → metergraph_core-0.2.36}/pyproject.toml

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

{metergraph_core-0.2.35 → metergraph_core-0.2.36}/src/metergraph_core/catalog.py

@@ -1,5 +1,6 @@
 """Effective-dated model catalog and deterministic token-cost enrichment."""
 
+import re
 from dataclasses import dataclass
 from datetime import date, datetime, timezone
 from decimal import Decimal, InvalidOperation, ROUND_HALF_UP
@@ -71,6 +72,35 @@ _INPUT_INCLUDES_CACHE_READ_PAIRS = frozenset({
 })
 
 
+# Bedrock ids carry a model-version suffix (`anthropic.claude-sonnet-5-v1:0`)
+# and may name the global inference profile (`global.`). Both are fallbacks
+# tried only after an exact match fails, and only on Bedrock. Geographic
+# profile prefixes (`us.`, `eu.`, ...) are never stripped: they bill on
+# aws-bedrock-geo, and the bare id would price them at the lower rate.
+_BEDROCK_CHANNEL = "aws-bedrock"
+_BEDROCK_CHANNELS = frozenset({_BEDROCK_CHANNEL, "aws-bedrock-geo"})
+_BEDROCK_VERSION_SUFFIX = re.compile(r"-v\d+(?::\d+)?$")
+_BEDROCK_GLOBAL_PREFIX = "global."
+
+
+def _bedrock_fallback_ids(model_key: str) -> tuple[tuple[str, bool], ...]:
+    """Candidate ids for an unmatched Bedrock model, most specific first.
+
+    Each candidate is paired with whether it dropped the ``global.`` prefix;
+    such a match is only valid on the in-region ``aws-bedrock`` channel.
+    """
+    unversioned = _BEDROCK_VERSION_SUFFIX.sub("", model_key)
+    candidates: list[tuple[str, bool]] = []
+    if unversioned != model_key:
+        candidates.append((unversioned, False))
+    if model_key.startswith(_BEDROCK_GLOBAL_PREFIX):
+        for name in dict.fromkeys((model_key, unversioned)):
+            bare = name[len(_BEDROCK_GLOBAL_PREFIX):]
+            if bare:
+                candidates.append((bare, True))
+    return tuple(candidates)
+
+
 def counts_cache_read_in_input(
     publisher: Any, channel: Any, rules: Mapping[str, Any]
 ) -> bool:
@@ -474,6 +504,13 @@ class CatalogSnapshot:
         model_key = str(model or "").strip().lower()
         channel_key = str(channel or "").strip().lower()
         alias = self._deployment_aliases.get((model_key, channel_key))
+        if alias is None and channel_key in _BEDROCK_CHANNELS:
+            for candidate, dropped_global in _bedrock_fallback_ids(model_key):
+                if dropped_global and channel_key != _BEDROCK_CHANNEL:
+                    continue
+                alias = self._deployment_aliases.get((candidate, channel_key))
+                if alias is not None:
+                    break
         if alias is None:
             return None
         price = self._price_for(alias, at)
@@ -503,6 +540,15 @@ class CatalogSnapshot:
         provider_key = _PROVIDER_ALIASES.get(provider_key, provider_key)
         model_key = str(model or "").strip().lower()
         alias = self._aliases.get((provider_key, model_key))
+        if alias is None and provider_key == "bedrock":
+            for candidate, dropped_global in _bedrock_fallback_ids(model_key):
+                found = self._aliases.get((provider_key, candidate))
+                if found is None or found.pricing_channel not in _BEDROCK_CHANNELS:
+                    continue
+                if dropped_global and found.pricing_channel != _BEDROCK_CHANNEL:
+                    continue
+                alias = found
+                break
         if alias is None:
             return CostResult(None, None, None, "unpriced", ("unknown_model",))
         price = self._price_for(alias, at)

{metergraph_core-0.2.35 → metergraph_core-0.2.36/src/metergraph_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metergraph-core
-Version: 0.2.35
+Version: 0.2.36
 Summary: Reusable MeterGraph catalog and deterministic billing engine
 License-Expression: Apache-2.0
 Requires-Python: >=3.10
@@ -81,6 +81,13 @@ and surrounding whitespace, applies the configured region fallback and
 effective-date windows, and returns `None` when no exact model/channel price
 exists. It never substitutes a direct-provider price for a gateway price.
 
+On Bedrock only (provider `bedrock` for `cost`, channel `aws-bedrock` or
+`aws-bedrock-geo` for `resolve_price`), an id with no exact alias falls back to
+the id without its model-version suffix (`anthropic.claude-sonnet-5-v1:0` to
+`anthropic.claude-sonnet-5`) and then without a `global.` inference-profile
+prefix, the latter only onto an `aws-bedrock` alias. Geographic prefixes such as
+`us.` or `eu.` are never stripped, because they bill on `aws-bedrock-geo`.
+
 `LoadedCatalog.currency` is currently always `USD`, and
 `LoadedCatalog.pricing_verified_at` records when the bundled catalog was last
 checked against its linked provider sources.