feat(usage): meter embedding tokens as embeddings_queries on both paths
embeddings_queries now records the embedding request's token count (the unit upstream providers bill on) instead of an operation count, and fires on the indexing path too. Previously only semantic search recorded it (value=1), so a re-indexing run produced no embeddings_queries events at all — only pages_chunks. - Provider layer: additive embed_with_usage / embed_batch_with_usage surface the per-request token count (Mistral/OpenAI usage.total_tokens, Bedrock Titan inputTextTokenCount, Ollama prompt_eval_count); a char-based estimate is the fallback (Simple, and any provider/response without a token field). Gateway and EmbeddingService forward through. The count travels as a return value / a per-request SearchAlgorithm attribute — never on the singleton — so concurrent indexing + search can't mis-attribute bills. - Indexing (vector/processor.py): records embeddings_queries (value=batch tokens) alongside the existing pages_chunks event. - Search (server/semantic.py): value is now the query embedding's token count, relayed from BM25HybridSearchAlgorithm via query_token_count. The astrolabe_embeddings_queries Stripe meter (sum aggregation) now sums tokens with no CP/Terraform change. The meter "queries"->tokens naming/unit clarification (homelab-terraform #254) + CP rollup/portal copy is a follow-up. Deck #67. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
fe17994c4d
commit
64318f0b25
@@ -6,6 +6,7 @@ tenant realm); creds are all-or-nothing.
|
||||
"""
|
||||
|
||||
import time
|
||||
from unittest.mock import AsyncMock, MagicMock
|
||||
|
||||
import httpx
|
||||
import pytest
|
||||
@@ -327,6 +328,69 @@ def test_trailing_slash_base_url_normalized():
|
||||
assert not base.endswith("/v1/v1")
|
||||
|
||||
|
||||
async def test_gateway_embed_with_usage_forwards_after_bearer(monkeypatch):
|
||||
"""embed_with_usage refreshes the bearer, then returns the (embedding,
|
||||
token_count) from the inherited OpenAI implementation."""
|
||||
provider = GatewayProvider(
|
||||
base_url="http://gw:8083/v1", embedding_model="mistral/mistral-embed"
|
||||
)
|
||||
|
||||
order: list[str] = []
|
||||
|
||||
async def _ensure_bearer():
|
||||
order.append("bearer")
|
||||
|
||||
monkeypatch.setattr(provider, "_ensure_bearer", _ensure_bearer)
|
||||
|
||||
item = MagicMock()
|
||||
item.embedding = [0.1, 0.2]
|
||||
item.index = 0
|
||||
response = MagicMock()
|
||||
response.data = [item]
|
||||
response.usage = MagicMock(total_tokens=8)
|
||||
|
||||
async def _create(**_kwargs):
|
||||
order.append("embed")
|
||||
return response
|
||||
|
||||
monkeypatch.setattr(provider.client.embeddings, "create", _create)
|
||||
|
||||
embedding, tokens = await provider.embed_with_usage("hello")
|
||||
|
||||
assert embedding == [0.1, 0.2]
|
||||
assert tokens == 8
|
||||
assert order == ["bearer", "embed"] # bearer refreshed before the embed call
|
||||
|
||||
|
||||
async def test_gateway_embed_batch_with_usage_forwards_after_bearer(monkeypatch):
|
||||
"""embed_batch_with_usage also refreshes the bearer before delegating."""
|
||||
provider = GatewayProvider(
|
||||
base_url="http://gw:8083/v1", embedding_model="mistral/mistral-embed"
|
||||
)
|
||||
ensured = {"n": 0}
|
||||
|
||||
async def _ensure_bearer():
|
||||
ensured["n"] += 1
|
||||
|
||||
monkeypatch.setattr(provider, "_ensure_bearer", _ensure_bearer)
|
||||
|
||||
item = MagicMock()
|
||||
item.embedding = [0.3, 0.4]
|
||||
item.index = 0
|
||||
response = MagicMock()
|
||||
response.data = [item]
|
||||
response.usage = MagicMock(total_tokens=5)
|
||||
monkeypatch.setattr(
|
||||
provider.client.embeddings, "create", AsyncMock(return_value=response)
|
||||
)
|
||||
|
||||
embeddings, tokens = await provider.embed_batch_with_usage(["x"])
|
||||
|
||||
assert embeddings == [[0.3, 0.4]]
|
||||
assert tokens == 5
|
||||
assert ensured["n"] == 1
|
||||
|
||||
|
||||
async def test_detect_dimension_with_bare_base_url_hits_v1_models(monkeypatch):
|
||||
"""End-to-end of the fix: a bare-origin base_url still resolves the
|
||||
dimension because discovery lands on /v1/models."""
|
||||
|
||||
Reference in New Issue
Block a user