Build and run agents you can see, understand and trust.
Python agentchatbotlarge-language-modelsllmllm-agentmcpmulti-agentmulti-modalreact-agentrealtime-agentvoice-agentvoice-assistant
fix(message): return an empty string when no text blocks are present (#3565)
qbc2f8c02996699
diff --git a/src/agentscope/agent/_realtime/_agent.py b/src/agentscope/agent/_realtime/_agent.pyindex 9fa8fcc5e..d8c8ed642 100644--- a/src/agentscope/agent/_realtime/_agent.py+++ b/src/agentscope/agent/_realtime/_agent.py@@ -523,7 +523,7 @@ class RealtimeAgent:if isinstance(inputs, str)else inputs)- text = msg.get_text_content() or ""+ text = msg.get_text_content()await self._barge_in()# A typed turn reconnects the session the way audio does,# and takes the audio kept meanwhile along with it.@@ -915,13 +915,13 @@ class RealtimeAgent:context = self.state.contextif context and context[-1].role == "assistant":tail = context[-1]- if not (tail.get_text_content() or "").strip() and all(+ if not tail.get_text_content().strip() and all(isinstance(b, TextBlock) for b in tail.content):context.pop()if not context or context[-1].role != "user":return False- previous = context[-1].get_text_content() or ""+ previous = context[-1].get_text_content()context[-1].content = [TextBlock(text=f"{previous}{text}")]return Truediff --git a/src/agentscope/app/_service/_chat.py b/src/agentscope/app/_service/_chat.pyindex a8f374cb7..baba54fb6 100644--- a/src/agentscope/app/_service/_chat.py+++ b/src/agentscope/app/_service/_chat.py@@ -1238,7 +1238,7 @@ class ChatService:elif isinstance(input_msg, list):trigger_msgs = input_msgtrigger_text = "\n".join(- msg.get_text_content() or "" for msg in trigger_msgs+ msg.get_text_content() for msg in trigger_msgs).strip()await register_inbox_consumer(self._message_bus, session_id)try:diff --git a/src/agentscope/formatter/_gemini_formatter.py b/src/agentscope/formatter/_gemini_formatter.pyindex 5c6d76fb0..de789d391 100644--- a/src/agentscope/formatter/_gemini_formatter.py+++ b/src/agentscope/formatter/_gemini_formatter.py@@ -486,7 +486,7 @@ class GeminiMultiAgentFormatter(_GeminiFormatterBase):"role": "user","parts": [{- "text": msg.get_text_content() or "",+ "text": msg.get_text_content(),},],}diff --git a/src/agentscope/message/_base.py b/src/agentscope/message/_base.pyindex 3cf9c81ac..36d8deb79 100644--- a/src/agentscope/message/_base.py+++ b/src/agentscope/message/_base.py@@ -152,10 +152,14 @@ class Msg(BaseModel):typs = [block_type] if isinstance(block_type, str) else block_typereturn any(b.type in typs for b in self.content)- def get_text_content(self, separator: str = "\n") -> str | None:- """Get the concatenated text from all TextBlocks."""+ def get_text_content(self, separator: str = "\n") -> str:+ """Join all top-level TextBlocks, returning "" if none are present.++ Use ``has_content_blocks("text")`` to distinguish missing text+ blocks from text blocks containing empty strings.+ """gathered = [b.text for b in self.content if b.type == "text"]- return separator.join(gathered) if gathered else None+ return separator.join(gathered)@overloaddef get_content_blocks(diff --git a/src/agentscope/middleware/_longterm_memory/_agentic_memory/_middleware.py b/src/agentscope/middleware/_longterm_memory/_agentic_memory/_middleware.pyindex 320bda688..56e49436f 100644--- a/src/agentscope/middleware/_longterm_memory/_agentic_memory/_middleware.py+++ b/src/agentscope/middleware/_longterm_memory/_agentic_memory/_middleware.py@@ -601,9 +601,9 @@ class AgenticMemoryMiddleware(MiddlewareBase):if msgs is not None:self._cached_input = "\n".join([- f"{_.name}: " + _.get_text_content()+ f"{_.name}: {_.get_text_content()}"for _ in msgs- if _.get_text_content() is not None+ if _.has_content_blocks("text")],)diff --git a/tests/formatter_xai_test.py b/tests/formatter_xai_test.pyindex 5cb2e1750..a799caf7e 100644--- a/tests/formatter_xai_test.py+++ b/tests/formatter_xai_test.py@@ -631,6 +631,13 @@ class TestXAIFormatter( # pylint: disable=too-many-public-methods# XAIMultiAgentFormatter tests# -------------------------------------------------------------------+ async def test_multiagent_formatter_textless_system_message(self) -> None:+ """A system message without text blocks passes an empty string."""+ res = await XAIMultiAgentFormatter().format(+ [SystemMsg(name="system", content=[])],+ )+ self.assertEqual(res, [system("")])+async def test_multiagent_formatter_system_message(self) -> None:"""System message is passed through as a system() stub."""fmt = XAIMultiAgentFormatter()diff --git a/tests/message_test.py b/tests/message_test.pyindex f5187344b..c21134d60 100644--- a/tests/message_test.py+++ b/tests/message_test.py@@ -23,6 +23,43 @@ from agentscope.message import (class MessageTest(IsolatedAsyncioTestCase):"""The template test case."""+ def test_get_text_content(self) -> None:+ """Extract only top-level text and always return a string."""+ data = DataBlock(+ source=URLSource(+ url="https://example.com/image.png",+ media_type="image/png",+ ),+ )+ thinking = ThinkingBlock(thinking="internal reasoning")+ result = ToolResultBlock(+ id="tool-result",+ name="tool",+ output=[TextBlock(text="nested text")],+ )+ cases = [+ ([], "\n", ""),+ ([data, thinking, result], "\n", ""),+ ([TextBlock(text="")], "\n", ""),+ ([TextBlock(text="hello")], "\n", "hello"),+ (+ [TextBlock(text="first"), data, TextBlock(text="second")],+ "\n",+ "first\nsecond",+ ),+ (+ [TextBlock(text="first"), thinking, TextBlock(text="last")],+ " | ",+ "first | last",+ ),+ ([TextBlock(text=""), TextBlock(text="")], "\n", "\n"),+ ([TextBlock(text="a"), TextBlock(text="b")], "", "ab"),+ ]+ for content, separator, expected in cases:+ with self.subTest(content=content, separator=separator):+ msg = AssistantMsg(name="assistant", content=content)+ self.assertEqual(msg.get_text_content(separator), expected)+async def test_creating_message(self) -> None:"""The template test."""# Test string contentdiff --git a/tests/middleware_filesystem_memory_test.py b/tests/middleware_filesystem_memory_test.pyindex 8a9be6034..3ca016c38 100644--- a/tests/middleware_filesystem_memory_test.py+++ b/tests/middleware_filesystem_memory_test.py@@ -4,20 +4,23 @@ import asyncioimport osimport shutilimport tempfile-from typing import Any, Type+from typing import Any, AsyncGenerator, Typefrom unittest import TestCasefrom unittest.async_case import IsolatedAsyncioTestCase+from unittest.mock import AsyncMock, call, patchfrom pydantic import BaseModelfrom utils import AnyString, AnyValue, MockModelfrom agentscope.agent import Agent, InjectionConfigfrom agentscope.message import (+ DataBlock,HintBlock,Msg,TextBlock,ToolCallBlock,UserMsg,+ URLSource,)from agentscope.middleware import AgenticMemoryMiddlewarefrom agentscope.model import ChatResponse, StructuredResponse@@ -320,6 +323,62 @@ class AgenticMemoryMiddlewareTest(IsolatedAsyncioTestCase):"""Remove the temporary workspace after each test."""shutil.rmtree(self.temp_dir, ignore_errors=True)+ async def test_retrieval_input_skips_messages_without_text_blocks(+ self,+ ) -> None:+ """Keep text-block presence distinct from empty text content."""+ textless = [+ UserMsg(name="empty", content=[]),+ UserMsg(+ name="image",+ content=[+ DataBlock(+ source=URLSource(+ url="https://example.com/image.png",+ media_type="image/png",+ ),+ ),+ ],+ ),+ ]+ cases = [+ (textless, []),+ (+ [+ *textless,+ UserMsg(name="blank", content=""),+ UserMsg(name="user", content="hello"),+ ],+ ["blank: \nuser: hello"],+ ),+ ]+ middleware = AgenticMemoryMiddleware(workdir=self.temp_dir)+ agent = self._make_agent(_RecordingMockModel(), middleware)++ async def next_handler(**_kwargs: Any) -> AsyncGenerator:+ await asyncio.sleep(0)+ yield "done"++ for inputs, expected in cases:+ with self.subTest(inputs=inputs), patch.object(+ middleware,+ "_retrieve_relevant_files",+ new_callable=AsyncMock,+ ) as retrieve:+ actual = [+ item+ async for item in middleware.on_reply(+ agent,+ {"inputs": inputs},+ next_handler,+ )+ ]+ self.assertEqual(actual, ["done"])+ self.assertEqual(+ retrieve.await_args_list,+ [call(agent, text) for text in expected],+ )+def _make_agent(self,model: _RecordingMockModel,diff --git a/tests/reme_middleware_test.py b/tests/reme_middleware_test.pyindex 69d97fff1..96c4be843 100644--- a/tests/reme_middleware_test.py+++ b/tests/reme_middleware_test.py@@ -345,7 +345,7 @@ def _msg_text(m: Any) -> str:records dicts whose ``content`` is a list of typed blocks."""if hasattr(m, "get_text_content"):- return m.get_text_content() or ""+ return m.get_text_content()content = m.get("content") if isinstance(m, dict) else Noneif isinstance(content, str):return contentdiff --git a/tests/tui_test.py b/tests/tui_test.pyindex e4f526117..991ba448c 100644--- a/tests/tui_test.py+++ b/tests/tui_test.py@@ -1419,7 +1419,7 @@ class LauncherTest(unittest.IsolatedAsyncioTestCase):msg.get_text_content()for msg in app.query_one(ChatUI).messages],- ["first", None, "second"],+ ["first", "", "second"],)target.release_first.set()diff --git a/tests/webrtc_audio_transport_test.py b/tests/webrtc_audio_transport_test.pyindex 46bd99726..0e2f9f5b2 100644--- a/tests/webrtc_audio_transport_test.py+++ b/tests/webrtc_audio_transport_test.py@@ -1296,8 +1296,8 @@ class WebRTCSessionTest(unittest.IsolatedAsyncioTestCase):"""A new page can replay an older turn after a newer one settles."""for old_event, old_text in [(me.InputTranscriptionEvent(item_id="u1", text="first"), "first"),- (me.InputTranscriptionFailedEvent(item_id="u1"), None),- (me.InputTranscriptionEvent(item_id="u1", text=""), None),+ (me.InputTranscriptionFailedEvent(item_id="u1"), ""),+ (me.InputTranscriptionEvent(item_id="u1", text=""), ""),]:with self.subTest(event=old_event):await self._check_transcript_replay(old_event, old_text)@@ -1305,7 +1305,7 @@ class WebRTCSessionTest(unittest.IsolatedAsyncioTestCase):async def _check_transcript_replay(self,old_event: me.ModelEvent,- old_text: str | None,+ old_text: str,) -> None:"""Check replay and persistence for one delayed transcript result."""agent = RealtimeAgent(