mirror of
https://github.com/langbot-app/LangBot.git
synced 2026-08-26 04:07:41 +00:00
DongXiaoming
e934f08adf
* fix(wecombot): align media upload protocol * fix(wecombot): deliver outbox media in reply and fix tool call recording - Integrate _send_media into reply_message and reply_message_chunk so sandbox outbox images/voices/files are uploaded and sent instead of being silently dropped. - Add missing import base64 that caused _send_media to fail with a NameError swallowed by its except clause. - Change yiri2target to return component dicts (text/image/voice/file) so callers can distinguish text from media. - Fix _get_message_for_tool_context using result.first()/row[0] which returned a raw string instead of the ORM object, causing "'str' object has no attribute 'pipeline_id'" in tool call recording. Use result.scalars().first() per SQLAlchemy 2.0 convention. * fix(pipeline): collect outbox attachments on final chunk with empty content When the last streaming chunk has is_final=True but empty content (e.g. the LLM sends all text in earlier chunks), the 'if result.content' branch is skipped entirely, so _append_outbound_attachments never runs and sandbox outbox images are silently dropped. Add an elif branch for _is_final_assistant_message that creates an empty MessageChain and still collects outbox attachments, so images are delivered even when the final chunk carries no text. * fix(box): bypass stdout truncation when reading outbox via exec _read_outbox_via_exec used execute_tool which returns _serialize_result where stdout is truncated to output_limit_chars (4000). A 7KB JPEG encodes to ~9400 base64 chars, so the JSON payload was truncated and json.loads failed silently, returning an empty list. Call client.execute directly to get the raw BoxExecutionResult with untruncated stdout, so base64 file data is preserved. * fix(tests): adapt box and wrapper tests for client.execute and strict is_final check - wrapper.py: restrict outbox collection on empty-content chunks to actual MessageChunk instances with is_final=True, not generic Mock objects that happen to have role='assistant' - test_box_service.py: update _read_outbox_via_exec tests to mock client.execute (returning BoxExecutionResult) instead of execute_tool, matching the implementation change * chore(wecombot): remove temporary upload log * test(box): preserve direct outbox read and cleanup coverage --------- Co-authored-by: fdc310 <2213070223@qq.com> Co-authored-by: dadachann <185672915+dadachann@users.noreply.github.com>
226 lines
11 KiB
Python
226 lines
11 KiB
Python
from __future__ import annotations
|
|
|
|
import typing
|
|
|
|
from .. import entities
|
|
from .. import plugin_diagnostics
|
|
from .. import stage
|
|
|
|
import langbot_plugin.api.entities.builtin.platform.message as platform_message
|
|
import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
|
|
import langbot_plugin.api.entities.builtin.provider.message as provider_message
|
|
import langbot_plugin.api.entities.events as events
|
|
|
|
|
|
@stage.stage_class('ResponseWrapper')
|
|
class ResponseWrapper(stage.PipelineStage):
|
|
"""回复包装阶段
|
|
|
|
把回复的 message 包装成人类识读的形式。
|
|
|
|
改写：
|
|
- resp_message_chain
|
|
"""
|
|
|
|
async def initialize(self, pipeline_config: dict):
|
|
pass
|
|
|
|
def _is_final_assistant_message(self, result) -> bool:
|
|
"""Whether *result* is the agent's final, tool-call-free answer.
|
|
|
|
Intermediate streaming chunks and tool-call rounds must NOT trigger
|
|
outbound attachment collection — only the terminal assistant message.
|
|
"""
|
|
if getattr(result, 'role', None) != 'assistant':
|
|
return False
|
|
if result.tool_calls:
|
|
return False
|
|
if isinstance(result, provider_message.MessageChunk):
|
|
return bool(result.is_final)
|
|
return True
|
|
|
|
async def _append_outbound_attachments(
|
|
self,
|
|
query: pipeline_query.Query,
|
|
message_chain: platform_message.MessageChain,
|
|
) -> None:
|
|
"""Collect sandbox outbox files and append them to *message_chain*.
|
|
|
|
Runs at most once per query (guarded by a query variable) and never
|
|
raises into the pipeline — attachment delivery is best-effort.
|
|
"""
|
|
if query.variables.get('_sandbox_outbound_collected'):
|
|
return
|
|
box_service = getattr(self.ap, 'box_service', None)
|
|
if box_service is None or not getattr(box_service, 'available', False):
|
|
return
|
|
query.variables['_sandbox_outbound_collected'] = True
|
|
try:
|
|
attachments = await box_service.collect_outbound_attachments(query)
|
|
except Exception as e:
|
|
self.ap.logger.warning(f'Outbound attachment collection failed: {e}')
|
|
return
|
|
for att in attachments:
|
|
att_type = att.get('type')
|
|
if att_type == 'Image':
|
|
message_chain.append(platform_message.Image(base64=att['base64']))
|
|
elif att_type == 'Voice':
|
|
message_chain.append(platform_message.Voice(base64=att['base64']))
|
|
else:
|
|
message_chain.append(platform_message.File(name=att.get('name', 'file'), base64=att['base64']))
|
|
|
|
async def process(
|
|
self,
|
|
query: pipeline_query.Query,
|
|
stage_inst_name: str,
|
|
) -> typing.AsyncGenerator[entities.StageProcessResult, None]:
|
|
"""处理"""
|
|
|
|
# 如果 resp_messages[-1] 已经是 MessageChain 了
|
|
if isinstance(query.resp_messages[-1], platform_message.MessageChain):
|
|
query.resp_message_chain.append(query.resp_messages[-1])
|
|
plugin_diagnostics.consume_pending_plugin_response_source(
|
|
query,
|
|
query.resp_messages[-1],
|
|
len(query.resp_message_chain) - 1,
|
|
)
|
|
|
|
yield entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
|
|
|
|
else:
|
|
if query.resp_messages[-1].role == 'command':
|
|
query.resp_message_chain.append(
|
|
query.resp_messages[-1].get_content_platform_message_chain(prefix_text='[bot] ')
|
|
)
|
|
|
|
yield entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
|
|
elif query.resp_messages[-1].role == 'plugin':
|
|
query.resp_message_chain.append(query.resp_messages[-1].get_content_platform_message_chain())
|
|
|
|
yield entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
|
|
else:
|
|
if query.resp_messages[-1].role == 'assistant':
|
|
result = query.resp_messages[-1]
|
|
session = await self.ap.sess_mgr.get_session(query)
|
|
|
|
reply_text = ''
|
|
|
|
if result.content: # 有内容
|
|
reply_text = str(result.get_content_platform_message_chain())
|
|
|
|
# ============= 触发插件事件 ===============
|
|
event = events.NormalMessageResponded(
|
|
launcher_type=query.launcher_type.value,
|
|
launcher_id=query.launcher_id,
|
|
sender_id=query.sender_id,
|
|
session=session,
|
|
prefix='',
|
|
response_text=reply_text,
|
|
finish_reason='stop',
|
|
funcs_called=[fc.function.name for fc in result.tool_calls]
|
|
if result.tool_calls is not None
|
|
else [],
|
|
query=query,
|
|
)
|
|
|
|
# Get bound plugins for filtering
|
|
bound_plugins = query.variables.get('_pipeline_bound_plugins', None)
|
|
event_ctx = await self.ap.plugin_connector.emit_event(event, bound_plugins)
|
|
|
|
if event_ctx.is_prevented_default():
|
|
yield entities.StageProcessResult(
|
|
result_type=entities.ResultType.INTERRUPT,
|
|
new_query=query,
|
|
)
|
|
else:
|
|
if event_ctx.event.reply_message_chain is not None:
|
|
reply_chain = event_ctx.event.reply_message_chain
|
|
is_plugin_reply = True
|
|
else:
|
|
reply_chain = result.get_content_platform_message_chain()
|
|
is_plugin_reply = False
|
|
|
|
# Attach files the agent produced in the sandbox
|
|
# outbox, but only on the terminal assistant message.
|
|
if self._is_final_assistant_message(result):
|
|
await self._append_outbound_attachments(query, reply_chain)
|
|
|
|
query.resp_message_chain.append(reply_chain)
|
|
if is_plugin_reply:
|
|
plugin_diagnostics.record_last_plugin_response_source(
|
|
query,
|
|
plugin_diagnostics.get_response_sources(event_ctx),
|
|
plugin_diagnostics.get_emitted_plugins(event_ctx),
|
|
event.event_name,
|
|
)
|
|
|
|
yield entities.StageProcessResult(
|
|
result_type=entities.ResultType.CONTINUE,
|
|
new_query=query,
|
|
)
|
|
elif (
|
|
isinstance(result, provider_message.MessageChunk) and result.is_final and not result.tool_calls
|
|
):
|
|
# Final streaming chunk with no text content but
|
|
# possibly carrying sandbox outbox attachments.
|
|
reply_chain = platform_message.MessageChain([])
|
|
await self._append_outbound_attachments(query, reply_chain)
|
|
query.resp_message_chain.append(reply_chain)
|
|
yield entities.StageProcessResult(
|
|
result_type=entities.ResultType.CONTINUE,
|
|
new_query=query,
|
|
)
|
|
|
|
if result.tool_calls is not None and len(result.tool_calls) > 0: # 有函数调用
|
|
function_names = [tc.function.name for tc in result.tool_calls]
|
|
|
|
reply_text = f'Call {".".join(function_names)}...'
|
|
|
|
query.resp_message_chain.append(
|
|
platform_message.MessageChain([platform_message.Plain(text=reply_text)])
|
|
)
|
|
|
|
if query.pipeline_config['output']['misc']['track-function-calls']:
|
|
event = events.NormalMessageResponded(
|
|
launcher_type=query.launcher_type.value,
|
|
launcher_id=query.launcher_id,
|
|
sender_id=query.sender_id,
|
|
session=session,
|
|
prefix='',
|
|
response_text=reply_text,
|
|
finish_reason='stop',
|
|
funcs_called=[fc.function.name for fc in result.tool_calls]
|
|
if result.tool_calls is not None
|
|
else [],
|
|
query=query,
|
|
)
|
|
|
|
# Get bound plugins for filtering
|
|
bound_plugins = query.variables.get('_pipeline_bound_plugins', None)
|
|
event_ctx = await self.ap.plugin_connector.emit_event(event, bound_plugins)
|
|
|
|
if event_ctx.is_prevented_default():
|
|
yield entities.StageProcessResult(
|
|
result_type=entities.ResultType.INTERRUPT,
|
|
new_query=query,
|
|
)
|
|
else:
|
|
if event_ctx.event.reply_message_chain is not None:
|
|
query.resp_message_chain.append(event_ctx.event.reply_message_chain)
|
|
plugin_diagnostics.record_last_plugin_response_source(
|
|
query,
|
|
plugin_diagnostics.get_response_sources(event_ctx),
|
|
plugin_diagnostics.get_emitted_plugins(event_ctx),
|
|
event.event_name,
|
|
)
|
|
|
|
else:
|
|
query.resp_message_chain.append(
|
|
platform_message.MessageChain([platform_message.Plain(text=reply_text)])
|
|
)
|
|
|
|
yield entities.StageProcessResult(
|
|
result_type=entities.ResultType.CONTINUE,
|
|
new_query=query,
|
|
)
|