Skip to content

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

fix(embedding): expose DashScope multimodal capability (#2701)

Weng Qiang6f9a20858dae
diff --git a/src/agentscope/embedding/_dashscope/_model.py b/src/agentscope/embedding/_dashscope/_model.py
index 81f1b0892..c570bd431 100644
--- a/src/agentscope/embedding/_dashscope/_model.py
+++ b/src/agentscope/embedding/_dashscope/_model.py
@@ -147,8 +147,6 @@ class DashScopeEmbeddingModel(EmbeddingModelBase[str | TextBlock | DataBlock]):
retry_delay (`float`, defaults to ``1.0``):
Seconds between retry attempts.
"""
- self._is_multimodal: bool = model.startswith(_MULTIMODAL_PREFIXES)
-
super().__init__(
credential=credential,
model=model,
@@ -159,11 +157,12 @@ class DashScopeEmbeddingModel(EmbeddingModelBase[str | TextBlock | DataBlock]):
max_retries=max_retries,
retry_delay=retry_delay,
)
+ self.supports_multimodal = model.startswith(_MULTIMODAL_PREFIXES)
self.api_key: str = credential.api_key.get_secret_value()
self.embedding_cache: EmbeddingCacheBase | None = embedding_cache
# Resolve multimodal constraints.
- if self._is_multimodal:
+ if self.supports_multimodal:
self._limits = _MODEL_LIMITS.get(model, _DEFAULT_LIMITS)
@classmethod
@@ -209,7 +208,7 @@ class DashScopeEmbeddingModel(EmbeddingModelBase[str | TextBlock | DataBlock]):
for item in inputs
]
- if not self._is_multimodal:
+ if not self.supports_multimodal:
# Text mode — use base class batching.
return await super().__call__(normalized, **kwargs)
@@ -315,7 +314,7 @@ class DashScopeEmbeddingModel(EmbeddingModelBase[str | TextBlock | DataBlock]):
Returns:
`EmbeddingResponse`: Embedding vectors and usage info.
"""
- if self._is_multimodal:
+ if self.supports_multimodal:
return await self._call_multimodal(inputs, **kwargs)
return await self._call_text(inputs, **kwargs)
diff --git a/tests/embedding_dashscope_test.py b/tests/embedding_dashscope_test.py
index 68e0cd3ed..828087b02 100644
--- a/tests/embedding_dashscope_test.py
+++ b/tests/embedding_dashscope_test.py
@@ -62,6 +62,28 @@ def _mock_resp(embeddings: list[list[float]]) -> EmbeddingResponse:
class DashScopeListModelsTest(IsolatedAsyncioTestCase):
"""Test list_models for DashScope."""
+ def test_multimodal_capability(self) -> None:
+ """Instances expose the multimodal capability of their model cards."""
+ self.assertDictEqual(
+ {
+ card.name: DashScopeEmbeddingModel(
+ credential=_cred(),
+ model=card.name,
+ dimensions=card.dimensions,
+ ).supports_multimodal
+ for card in DashScopeEmbeddingModel.list_models()
+ },
+ {
+ "text-embedding-v4": False,
+ "tongyi-embedding-vision-flash": True,
+ "qwen3-vl-embedding": True,
+ "qwen2.5-vl-embedding": True,
+ "text-embedding-v3": False,
+ "multimodal-embedding-v1": True,
+ "tongyi-embedding-vision-plus": True,
+ },
+ )
+
async def test_list_models(self) -> None:
"""Should list 7 models (text + multimodal)."""
cards = DashScopeEmbeddingModel.list_models()
diff --git a/tests/realtime_agent_test.py b/tests/realtime_agent_test.py
index c10a78687..aec8813e4 100644
--- a/tests/realtime_agent_test.py
+++ b/tests/realtime_agent_test.py
@@ -214,13 +214,20 @@ class FakeTransport(TransportBase):
)
-class InterruptingTransport(FakeTransport):
- """Sends one INTERRUPT frame once the reply is playing."""
+class GatedTransport(FakeTransport):
+ """Stays open until ``gate`` is set, then sends its control frames, so
+ a test decides when the user acts instead of a clock."""
+
+ def __init__(self, control_frames: list[ControlFrame]) -> None:
+ super().__init__(frames=0)
+ self.control_frames = control_frames
+ self.gate = asyncio.Event()
async def incoming(self) -> AsyncIterator[ControlFrame]:
- """Emit the interrupt after the scripted reply has streamed."""
- await asyncio.sleep(0.02)
- yield ControlFrame(type=ControlFrameType.INTERRUPT)
+ """Emit the control frames once the gate opens, then end."""
+ await self.gate.wait()
+ for frame in self.control_frames:
+ yield frame
class EndOnSecondFrameVAD(VADBase):
@@ -336,7 +343,7 @@ class RealtimeAgentTest(IsolatedAsyncioTestCase):
"""``interrupt()`` cuts the reply in flight to what was heard."""
model = ScriptedModel([REPLY_R1])
agent = RealtimeAgent("Friday", "be brief", model)
- transport = FakeTransport(frames=3)
+ transport = GatedTransport([])
reply_ends = []
async with agent, transport:
@@ -344,6 +351,7 @@ class RealtimeAgentTest(IsolatedAsyncioTestCase):
if isinstance(event, TextBlockDeltaEvent):
if event.delta == "老和尚":
await agent.interrupt()
+ transport.gate.set()
elif isinstance(event, ReplyEndEvent):
reply_ends.append((event.reply_id, event.finished_reason))
@@ -361,13 +369,22 @@ class RealtimeAgentTest(IsolatedAsyncioTestCase):
"""An INTERRUPT control frame cuts the reply in flight."""
model = ScriptedModel([REPLY_R1])
agent = RealtimeAgent("Friday", "be brief", model)
+ transport = GatedTransport(
+ [ControlFrame(type=ControlFrameType.INTERRUPT)],
+ )
- async with agent:
- summary = await self._collect(agent, InterruptingTransport(0))
+ reply_ends = []
+ async with agent, transport:
+ async for event in agent.reply_stream(transport):
+ if isinstance(event, TextBlockDeltaEvent):
+ if event.delta == "老和尚":
+ transport.gate.set()
+ elif isinstance(event, ReplyEndEvent):
+ reply_ends.append((event.reply_id, event.finished_reason))
self.assertListEqual(
- summary,
- [("user", "讲个故事"), ("reply_end", "interrupted")],
+ reply_ends,
+ [("u1", "completed"), ("r1", "interrupted")],
)
self.assertListEqual(
model.calls,