Skip to content

fix(wecomai_event): 修复消息链提取纯文本时的空白处理 #8563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RC-CHN merged 3 commits into from
Jun 4, 2026
+19 −4
Merged

fix(wecomai_event): 修复消息链提取纯文本时的空白处理 #8563

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4521754
fix(wecomai_event): 修复消息链提取纯文本时的空白处理
NayukiChiba Jun 3, 2026
1d08fca
test(wecomai_event): 添加企业微信智能机器人消息事件处理的单元测试
NayukiChiba Jun 3, 2026
8e30a4d
fix(wecomai_event): 删除企业微信智能机器人消息事件处理的单元测试
NayukiChiba Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions astrbot/core/platform/sources/wecom_ai_bot/wecomai_event.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,17 @@ async def _send(
return data

@staticmethod
def _extract_plain_text_from_chain(message_chain: MessageChain | None) -> str:
def _extract_plain_text_from_chain(
message_chain: MessageChain | None,
strip_result: bool = True,
) -> str:
"""从消息链中提取纯文本

Args:
message_chain: 消息链
strip_result: 是否去除首尾空白。流式输出时应设为 False，
以保留换行等格式字符；非流式发送时可保留默认 True
"""
if not message_chain:
return ""
plain_parts: list[str] = []
Expand All @@ -134,7 +144,8 @@ def _extract_plain_text_from_chain(message_chain: MessageChain | None) -> str:
plain_parts.append(f"@{comp.name} ")
elif isinstance(comp, Plain):
plain_parts.append(comp.text)
return "".join(plain_parts).strip()
result = "".join(plain_parts)
return result.strip() if strip_result else result

async def send(self, message: MessageChain | None) -> None:
"""发送消息"""
Expand Down Expand Up @@ -254,7 +265,10 @@ async def send_streaming(self, generator, use_fallback=False) -> None:
)

chain.squash_plain()
chunk_text = self._extract_plain_text_from_chain(chain)
# 流式输出不 strip，保留换行等格式字符
chunk_text = self._extract_plain_text_from_chain(
chain, strip_result=False
)
if chunk_text:
increment_plain += chunk_text
now = asyncio.get_running_loop().time()
Expand Down Expand Up @@ -334,7 +348,8 @@ async def enqueue_stream_plain(text: str) -> None:
increment_plain = ""
continue

chunk_text = self._extract_plain_text_from_chain(chain)
# 流式输出不 strip，保留换行等格式字符
chunk_text = self._extract_plain_text_from_chain(chain, strip_result=False)
if chunk_text:
increment_plain += chunk_text
final_data += chunk_text
Expand Down
Loading