Skip to content

Build and run agents you can see, understand and trust.

fix(embedding): isolate OpenAI caches by API endpoint (#3142)

fhgffyd74b833943d8
diff --git a/src/agentscope/embedding/_openai/_model.py b/src/agentscope/embedding/_openai/_model.py
index 64fc9001e..d071c8ba2 100644
--- a/src/agentscope/embedding/_openai/_model.py
+++ b/src/agentscope/embedding/_openai/_model.py
@@ -139,9 +139,13 @@ class OpenAIEmbeddingModel(EmbeddingModelBase[str | TextBlock]):
if self.pass_dimensions:
api_kwargs.setdefault("dimensions", self.dimensions)
+ cache_identifier: dict[str, Any] = {
+ "base_url": str(self.client.base_url),
+ "api_kwargs": api_kwargs,
+ }
if self.embedding_cache:
cached = await self.embedding_cache.retrieve(
- identifier=api_kwargs,
+ identifier=cache_identifier,
)
if cached:
return EmbeddingResponse(
@@ -168,7 +172,7 @@ class OpenAIEmbeddingModel(EmbeddingModelBase[str | TextBlock]):
if self.embedding_cache:
await self.embedding_cache.store(
- identifier=api_kwargs,
+ identifier=cache_identifier,
embeddings=embeddings,
)
diff --git a/tests/embedding_openai_test.py b/tests/embedding_openai_test.py
index bfea21858..f84b9e0f2 100644
--- a/tests/embedding_openai_test.py
+++ b/tests/embedding_openai_test.py
@@ -354,3 +354,77 @@ class OpenAIEmbeddingCallTest(IsolatedAsyncioTestCase):
self.assertEqual(result["embeddings"], [[0.1]])
self.assertEqual(mock_client.embeddings.create.await_count, 2)
+
+ async def test_cache_isolated_by_base_url(self) -> None:
+ """Different endpoints do not share cached embedding vectors."""
+ import httpx
+ import openai
+
+ requests = []
+
+ def handle_request(request: httpx.Request) -> httpx.Response:
+ requests.append(request)
+ self.assertEqual(request.url.path, "/v1/embeddings")
+ self.assertEqual(
+ json.loads(request.content),
+ {
+ "input": ["hello"],
+ "model": "shared-name",
+ "encoding_format": "float",
+ "dimensions": 2,
+ },
+ )
+ vector = (
+ [1.0, 0.0]
+ if request.url.host == "endpoint-a.test"
+ else [0.0, 1.0]
+ )
+ return httpx.Response(
+ 200,
+ json={
+ "object": "list",
+ "model": "shared-name",
+ "data": [
+ {
+ "object": "embedding",
+ "index": 0,
+ "embedding": vector,
+ },
+ ],
+ "usage": {"prompt_tokens": 1, "total_tokens": 1},
+ },
+ )
+
+ def create_client(**kwargs: Any) -> openai.AsyncOpenAI:
+ return openai.AsyncOpenAI(
+ http_client=httpx.AsyncClient(
+ transport=httpx.MockTransport(handle_request),
+ ),
+ **kwargs,
+ )
+
+ cases = [
+ ("https://endpoint-a.test/v1", [[1.0, 0.0]], "api"),
+ ("https://endpoint-b.test/v1", [[0.0, 1.0]], "api"),
+ ("https://endpoint-a.test/v1/", [[1.0, 0.0]], "cache"),
+ ("https://endpoint-b.test/v1/", [[0.0, 1.0]], "cache"),
+ ]
+ with TemporaryDirectory() as cache_dir:
+ with patch("openai.AsyncClient", side_effect=create_client):
+ for base_url, vectors, source in cases:
+ with self.subTest(base_url=base_url):
+ model = OpenAIEmbeddingModel(
+ credential=OpenAICredential(
+ api_key="local-test-key",
+ base_url=base_url,
+ ),
+ model="shared-name",
+ dimensions=2,
+ embedding_cache=FileEmbeddingCache(cache_dir),
+ )
+ async with model.client:
+ result = await model(["hello"])
+ self.assertEqual(result.embeddings, vectors)
+ self.assertEqual(result.source, source)
+
+ self.assertEqual(len(requests), 2)