Build and run agents you can see, understand and trust.
Python agentchatbotlarge-language-modelsllmllm-agentmcpmulti-agentmulti-modalreact-agentrealtime-agentvoice-agentvoice-assistant
fix(embedding): avoid blocking the event loop (#2703)
Weng Qiang5ef84e2c592a
diff --git a/src/agentscope/embedding/_dashscope/_model.py b/src/agentscope/embedding/_dashscope/_model.pyindex c570bd431..5da7aad7f 100644--- a/src/agentscope/embedding/_dashscope/_model.py+++ b/src/agentscope/embedding/_dashscope/_model.py@@ -368,7 +368,8 @@ class DashScopeEmbeddingModel(EmbeddingModelBase[str | TextBlock | DataBlock]):import dashscopestart_time = datetime.now()- response = dashscope.embeddings.TextEmbedding.call(+ response = await asyncio.to_thread(+ dashscope.embeddings.TextEmbedding.call,api_key=self.api_key,**api_kwargs,)@@ -453,7 +454,10 @@ class DashScopeEmbeddingModel(EmbeddingModelBase[str | TextBlock | DataBlock]):import dashscopestart_time = datetime.now()- res = dashscope.MultiModalEmbedding.call(**api_kwargs)+ res = await asyncio.to_thread(+ dashscope.MultiModalEmbedding.call,+ **api_kwargs,+ )time = (datetime.now() - start_time).total_seconds()if res.status_code != 200:diff --git a/src/agentscope/embedding/_gemini/_model.py b/src/agentscope/embedding/_gemini/_model.pyindex 89cb8a47d..dc994ced8 100644--- a/src/agentscope/embedding/_gemini/_model.py+++ b/src/agentscope/embedding/_gemini/_model.py@@ -351,7 +351,7 @@ class GeminiEmbeddingModel(EmbeddingModelBase[str | TextBlock | DataBlock]):)start_time = datetime.now()- response = self.client.models.embed_content(+ response = await self.client.aio.models.embed_content(model=self.model,contents=texts,config=config,@@ -423,7 +423,7 @@ class GeminiEmbeddingModel(EmbeddingModelBase[str | TextBlock | DataBlock]):)start_time = datetime.now()- response = self.client.models.embed_content(+ response = await self.client.aio.models.embed_content(model=self.model,contents=contents,config=config,diff --git a/tests/embedding_dashscope_test.py b/tests/embedding_dashscope_test.pyindex 828087b02..1f660e3db 100644--- a/tests/embedding_dashscope_test.py+++ b/tests/embedding_dashscope_test.py@@ -2,6 +2,7 @@# pylint: disable=protected-access,unused-argument"""Unit tests for DashScopeEmbeddingModel."""from dataclasses import asdict+from threading import get_identfrom typing import Anyfrom unittest import IsolatedAsyncioTestCasefrom unittest.mock import AsyncMock, MagicMock, patch@@ -159,6 +160,26 @@ class DashScopeTextCallTest(IsolatedAsyncioTestCase):},)+ @patch("dashscope.embeddings.TextEmbedding.call")+ async def test_sdk_thread(self, mock_api: Any) -> None:+ """The SDK executes on a worker instead of the event loop thread."""+ loop_thread = get_ident()+ on_loop_thread: list[bool] = []++ def record_thread(**_kwargs: Any) -> MagicMock:+ """Capture the thread that executes the SDK request."""+ on_loop_thread.append(get_ident() == loop_thread)+ return _text_resp([[1.0]])++ mock_api.side_effect = record_thread+ model = DashScopeEmbeddingModel(+ credential=_cred(),+ model="text-embedding-v4",+ dimensions=1,+ )+ await model(["hello"])+ self.assertListEqual(on_loop_thread, [False])+@patch("dashscope.embeddings.TextEmbedding.call")async def test_text_rejects_datablock(self, mock_api: Any) -> None:"""Text mode rejects DataBlock inputs."""diff --git a/tests/embedding_gemini_test.py b/tests/embedding_gemini_test.pyindex 67fa05bc1..eba99b9bc 100644--- a/tests/embedding_gemini_test.py+++ b/tests/embedding_gemini_test.py@@ -4,7 +4,7 @@from dataclasses import asdictfrom typing import Anyfrom unittest import IsolatedAsyncioTestCase-from unittest.mock import AsyncMock+from unittest.mock import AsyncMock, MagicMockfrom utils import AnyValue@@ -112,6 +112,16 @@ class GeminiTextCallTest(IsolatedAsyncioTestCase):},)+ async def test_sdk_async(self) -> None:+ """Text embedding awaits the asynchronous SDK call."""+ model = self._make_text_model()+ model.client = MagicMock()+ model.client.aio.models.embed_content = AsyncMock(+ return_value=MagicMock(embeddings=[]),+ )+ await model(["hello"])+ model.client.aio.models.embed_content.assert_awaited_once()+async def test_text_rejects_datablock(self) -> None:"""Text mode rejects DataBlock inputs."""model = self._make_text_model()