metergraph-core 0.7.0__tar.gz → 0.7.1__tar.gz

{metergraph_core-0.7.0/src/metergraph_core.egg-info → metergraph_core-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metergraph-core
-Version: 0.7.0
+Version: 0.7.1
 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
@@ -225,7 +225,9 @@ It accepts the object a provider SDK returned or the same response as JSON:
 | Bedrock Converse (pass `model=`, the response does not name one) | `bedrock` |
 
 `provider` names who served the call and selects its direct channel unless
-`channel` is given. The response shape is detected from its fields. Only the
+`channel` is given. The response format is detected from its fields; pass
+`format=`, one of `RESPONSE_FORMATS`, for a response too sparse to detect.
+`response_format(response)` returns the detected format, or `None`. Only the
 model, usage counts, service tier and creation time are read; prompt and
 output content never are.
 
@@ -240,7 +242,8 @@ The price in effect when the response was created applies, from `created`,
 creation time is priced now. `catalog=` costs against a catalog you loaded;
 the default is the bundled one.
 
-A batch service tier bills at batch rates. Any other tier besides standard,
+A batch service tier bills at batch rates. Pass `service_tier=` when the
+response does not state its tier, such as an OpenAI batch output line. Any other tier besides standard,
 such as `priority` or `flex`, returns `partial` with `service_tier` in
 `missing_dimensions`, since the catalog carries no tier rates. Cost a streamed
 call from its final response or final usage chunk. Fees outside token usage,
@@ -508,6 +511,7 @@ from metergraph_core import (
     PriceResult,
     PriceRowKey,
     PriceSource,
+    RESPONSE_FORMATS,
     RefreshResult,
     ResolvedPrice,
     SourceRegistry,
@@ -524,6 +528,7 @@ from metergraph_core import (
     parse_catalog_delta,
     plan_low_risk_refresh,
     resolve_billing,
+    response_format,
     structural_fingerprint,
     validate_model_registry,
     validate_source_registry,

{metergraph_core-0.7.0 → metergraph_core-0.7.1}/README.md

@@ -195,7 +195,9 @@ It accepts the object a provider SDK returned or the same response as JSON:
 | Bedrock Converse (pass `model=`, the response does not name one) | `bedrock` |
 
 `provider` names who served the call and selects its direct channel unless
-`channel` is given. The response shape is detected from its fields. Only the
+`channel` is given. The response format is detected from its fields; pass
+`format=`, one of `RESPONSE_FORMATS`, for a response too sparse to detect.
+`response_format(response)` returns the detected format, or `None`. Only the
 model, usage counts, service tier and creation time are read; prompt and
 output content never are.
 
@@ -210,7 +212,8 @@ The price in effect when the response was created applies, from `created`,
 creation time is priced now. `catalog=` costs against a catalog you loaded;
 the default is the bundled one.
 
-A batch service tier bills at batch rates. Any other tier besides standard,
+A batch service tier bills at batch rates. Pass `service_tier=` when the
+response does not state its tier, such as an OpenAI batch output line. Any other tier besides standard,
 such as `priority` or `flex`, returns `partial` with `service_tier` in
 `missing_dimensions`, since the catalog carries no tier rates. Cost a streamed
 call from its final response or final usage chunk. Fees outside token usage,
@@ -478,6 +481,7 @@ from metergraph_core import (
     PriceResult,
     PriceRowKey,
     PriceSource,
+    RESPONSE_FORMATS,
     RefreshResult,
     ResolvedPrice,
     SourceRegistry,
@@ -494,6 +498,7 @@ from metergraph_core import (
     parse_catalog_delta,
     plan_low_risk_refresh,
     resolve_billing,
+    response_format,
     structural_fingerprint,
     validate_model_registry,
     validate_source_registry,

{metergraph_core-0.7.0 → metergraph_core-0.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "metergraph-core"
-version = "0.7.0"
+version = "0.7.1"
 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.7.0 → metergraph_core-0.7.1}/src/metergraph_core/__init__.py

@@ -59,7 +59,7 @@ from .catalog_delta import (
     apply_catalog_delta,
     parse_catalog_delta,
 )
-from .responses import cost_from_response
+from .responses import RESPONSE_FORMATS, cost_from_response, response_format
 from .extractors import (
     ExtractedRate,
     Extraction,
@@ -135,6 +135,8 @@ __all__ = [
     "count_fetch_units",
     "count_search_units",
     "cost_from_response",
+    "response_format",
+    "RESPONSE_FORMATS",
     "counts_cache_read_in_input",
     "direct_channel_for_provider",
     "normalize_provider",

{metergraph_core-0.7.0 → metergraph_core-0.7.1}/src/metergraph_core/responses.py

@@ -12,7 +12,7 @@ from datetime import datetime, timezone
 from functools import lru_cache
 from typing import Any, Callable, Mapping
 
-from .catalog import CostResult, ModelUsage
+from .catalog import CostResult, ModelUsage, _coerce_datetime
 from .loader import LoadedCatalog, load_catalog
 
 _STANDARD_TIERS = frozenset({"default", "standard", "standard_only", "auto", "on_demand"})
@@ -188,23 +188,41 @@ def _bedrock_converse(response: Mapping[str, Any]) -> _Facts:
     )
 
 
-def _reader(response: Mapping[str, Any]) -> Callable[[Mapping[str, Any]], _Facts] | None:
-    """The reader for this response's shape, told apart by the fields each
-    API always returns."""
+_READERS: dict[str, Callable[[Mapping[str, Any]], _Facts]] = {
+    "openai.chat_completions": _openai_chat_completions,
+    "openai.responses": _openai_responses,
+    "anthropic.messages": _anthropic_messages,
+    "gemini.generate_content": _gemini,
+    "bedrock.converse": _bedrock_converse,
+}
+
+# The response formats :func:`cost_from_response` reads.
+RESPONSE_FORMATS = tuple(_READERS)
+
+
+def _detect(response: Mapping[str, Any]) -> str | None:
+    """The format of this response, told apart by the fields each API
+    always returns."""
     if _first(response, "usage_metadata", "usageMetadata") is not None:
-        return _gemini
+        return "gemini.generate_content"
     usage = _object(response.get("usage"))
     if "prompt_tokens" in usage:
-        return _openai_chat_completions
+        return "openai.chat_completions"
     if "inputTokens" in usage:
-        return _bedrock_converse
+        return "bedrock.converse"
     if response.get("type") == "message" or "cache_read_input_tokens" in usage:
-        return _anthropic_messages
+        return "anthropic.messages"
     if response.get("object") == "response" or "input_tokens_details" in usage:
-        return _openai_responses
+        return "openai.responses"
     return None
 
 
+def response_format(response: Any) -> str | None:
+    """The :data:`RESPONSE_FORMATS` entry ``response`` is in, or None when its
+    shape is not recognized."""
+    return _detect(_as_mapping(response))
+
+
 def _as_mapping(response: Any) -> Mapping[str, Any]:
     if isinstance(response, Mapping):
         return response
@@ -270,6 +288,8 @@ def cost_from_response(
     at: Any = None,
     channel: str | None = None,
     region: str | None = None,
+    service_tier: str | None = None,
+    format: str | None = None,
 ) -> CostResult:
     """The cost of one provider response, from the usage it reports.
 
@@ -280,24 +300,36 @@ def cost_from_response(
     is given. ``model`` overrides the response's model id and is required for
     Bedrock Converse, whose responses do not name one. ``at`` defaults to the
     response's creation time when it reports one, else now. ``catalog``
-    defaults to the catalog bundled with this package.
+    defaults to the catalog bundled with this package. ``format``, one of
+    :data:`RESPONSE_FORMATS`, names the response's format; without it the
+    format is detected from the response's fields.
 
     A streamed call is costed from its final response or final usage chunk.
-    Fees outside token usage, such as web search, are not included. A service
-    tier other than standard or batch turns the result ``partial`` with
-    ``service_tier`` missing, since the catalog does not carry tier rates.
+    Fees outside token usage, such as web search, are not included.
+    ``service_tier`` overrides the tier the response reports, for responses
+    that do not state it, such as an OpenAI batch output line. A tier other
+    than standard or batch turns the result ``partial`` with ``service_tier``
+    missing, since the catalog does not carry tier rates.
     """
     data = _as_mapping(response)
-    reader = _reader(data)
-    if reader is None:
+    if format is not None and format not in _READERS:
+        raise ValueError(f"format must be one of {', '.join(RESPONSE_FORMATS)}")
+    detected = format or _detect(data)
+    if detected is None:
         raise ValueError("response carries no usage this function can read")
-    facts = reader(data)
+    facts = _READERS[detected](data)
     when = at if at is not None else facts.at or datetime.now(timezone.utc)
     model_id = _text(model) or facts.model
-    tier = (facts.service_tier or "").lower() or None
+    tier = (_text(service_tier) or facts.service_tier or "").lower() or None
     if model_id is None:
         return CostResult(
-            None, None, None, "unpriced", ("missing_model",), missing_dimensions=("model",)
+            None,
+            None,
+            None,
+            "unpriced",
+            ("missing_model",),
+            effective_at=_coerce_datetime(when),
+            missing_dimensions=("model",),
         )
     loaded = catalog if catalog is not None else _bundled_catalog()
     batch = tier == _BATCH_TIER

{metergraph_core-0.7.0 → metergraph_core-0.7.1/src/metergraph_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metergraph-core
-Version: 0.7.0
+Version: 0.7.1
 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
@@ -225,7 +225,9 @@ It accepts the object a provider SDK returned or the same response as JSON:
 | Bedrock Converse (pass `model=`, the response does not name one) | `bedrock` |
 
 `provider` names who served the call and selects its direct channel unless
-`channel` is given. The response shape is detected from its fields. Only the
+`channel` is given. The response format is detected from its fields; pass
+`format=`, one of `RESPONSE_FORMATS`, for a response too sparse to detect.
+`response_format(response)` returns the detected format, or `None`. Only the
 model, usage counts, service tier and creation time are read; prompt and
 output content never are.
 
@@ -240,7 +242,8 @@ The price in effect when the response was created applies, from `created`,
 creation time is priced now. `catalog=` costs against a catalog you loaded;
 the default is the bundled one.
 
-A batch service tier bills at batch rates. Any other tier besides standard,
+A batch service tier bills at batch rates. Pass `service_tier=` when the
+response does not state its tier, such as an OpenAI batch output line. Any other tier besides standard,
 such as `priority` or `flex`, returns `partial` with `service_tier` in
 `missing_dimensions`, since the catalog carries no tier rates. Cost a streamed
 call from its final response or final usage chunk. Fees outside token usage,
@@ -508,6 +511,7 @@ from metergraph_core import (
     PriceResult,
     PriceRowKey,
     PriceSource,
+    RESPONSE_FORMATS,
     RefreshResult,
     ResolvedPrice,
     SourceRegistry,
@@ -524,6 +528,7 @@ from metergraph_core import (
     parse_catalog_delta,
     plan_low_risk_refresh,
     resolve_billing,
+    response_format,
     structural_fingerprint,
     validate_model_registry,
     validate_source_registry,