Build and run agents you can see, understand and trust.
Python agentchatbotlarge-language-modelsllmllm-agentmcpmulti-agentmulti-modalreact-agentrealtime-agentvoice-agentvoice-assistant
feat(embedding): preserve Ollama input token usage (#3393)
HootRocked357feb78a4
diff --git a/src/agentscope/embedding/_ollama/_model.py b/src/agentscope/embedding/_ollama/_model.pyindex 901350030..454551335 100644--- a/src/agentscope/embedding/_ollama/_model.py+++ b/src/agentscope/embedding/_ollama/_model.py@@ -139,5 +139,8 @@ class OllamaEmbeddingModel(EmbeddingModelBase[str | TextBlock]):return EmbeddingResponse(embeddings=response.embeddings,- usage=EmbeddingUsage(time=time),+ usage=EmbeddingUsage(+ tokens=getattr(response, "prompt_eval_count", None),+ time=time,+ ),)diff --git a/tests/embedding_ollama_test.py b/tests/embedding_ollama_test.pyindex fb4ae4d27..515098f9b 100644--- a/tests/embedding_ollama_test.py+++ b/tests/embedding_ollama_test.py@@ -7,7 +7,10 @@ from tempfile import TemporaryDirectoryfrom types import SimpleNamespacefrom typing import Anyfrom unittest import IsolatedAsyncioTestCase-from unittest.mock import AsyncMock, patch+from unittest.mock import AsyncMock, Mock, patch++import httpx+import ollamafrom utils import AnyValue@@ -44,7 +47,7 @@ class OllamaListModelsTest(IsolatedAsyncioTestCase):class OllamaEmbeddingCallTest(IsolatedAsyncioTestCase):- """Test Ollama embedding via mocked _call_api."""+ """Test Ollama embedding calls and token usage."""async def test_basic_call(self) -> None:"""Basic call returns correct embeddings."""@@ -109,6 +112,57 @@ class OllamaEmbeddingCallTest(IsolatedAsyncioTestCase):)self.assertEqual(call_count, 2)+ async def test_token_usage(self) -> None:+ """Preserve optional token counts parsed by the real Ollama SDK."""+ cases: list[tuple[dict[str, Any], int | None]] = [+ ({"prompt_eval_count": 8}, 8),+ ({"prompt_eval_count": 0}, 0),+ ({"prompt_eval_count": None}, None),+ ({}, None),+ ]+ for fields, expected in cases:+ with self.subTest(fields=fields):+ transport = httpx.MockTransport(+ Mock(+ return_value=httpx.Response(+ 200,+ json={+ "embeddings": [[0.25, 0.5]],+ **fields,+ },+ ),+ ),+ )+ client = ollama.AsyncClient(+ host="http://offline.invalid:11434",+ transport=transport,+ trust_env=False,+ )+ self.addAsyncCleanup(client._client.aclose)+ with patch("ollama.AsyncClient", return_value=client):+ model = OllamaEmbeddingModel(+ credential=_cred(),+ model="embeddinggemma",+ dimensions=2,+ max_retries=0,+ )+ response = await model(["one"])+ self.assertDictEqual(+ asdict(response),+ {+ "embeddings": [[0.25, 0.5]],+ "id": A,+ "created_at": A,+ "type": "embedding",+ "usage": {+ "tokens": expected,+ "time": A,+ "type": "embedding",+ },+ "source": "api",+ },+ )+class OllamaEmbeddingCacheHostTest(IsolatedAsyncioTestCase):"""The embedding cache must not be shared across Ollama hosts."""