feat(channels): 媒体入站链路接入,出站骨架就位(未接线)+ 空内容判定修复
媒体功能是上一轮智能体自改代码时留下的 WIP(那轮步数耗尽被中断)。 本次把手头完成度较高的部分整理到可提交状态,并修掉其中两处判定 bug。 入站(已可用): - 新增 flows/media_input.py:附件先落盘再进上下文,小图内联为 base64, 大图与音视频退化为「路径 + 元信息」,附件级失败只降级为说明而不打断整轮 - processor 改用 prepare_inbound,文本 / 多模态输入据此决定发纯文本还是 content blocks 出站(骨架就位,尚未接线): - 新增 agent/outbox.py、channels/media.py(大小与类型校验、限长下载 / 读取) - 新增 send_image / send_file 工具、ChannelServices.send_content、 MessageEvent.content_event / media_event - 目前还没有任何调用方创建 MediaOutbox,因此这两个工具一律返回 「当前不在渠道会话中」;渠道侧的 _send_media 由各平台子类实现 修复: - prepare_inbound 不再塞「(无内容)」占位块:占位块会让 has_content 恒真, 空消息也能一路跑到 run_task,白烧一次模型调用 - 新增 PreparedInbound.is_multimodal 取代 len(blocks) > 1 的猜测: 「只有一张图、没有正文」时 blocks 只有 1 个,原逻辑会把附件丢掉 - 附件全部接收失败时回「附件未能接收:<原因>」,不再误报「空消息」 - 顺手清掉 ruff 告警(未用导入、__all__ 未排序、嵌套 if / with) 测试:test_processor 拆成三个用例(空消息 / 附件全失败 / 仅附件必须发 blocks,最后一条是防回潮的回归测试),全量 243 passed,ruff 全绿。
This commit is contained in:
1 parent
5da55f8d17
commit
9ce0ba0e13
10 files changed
+1186
-22
No files matched your search
+52
-2
@@ -16,6 +16,7 @@ from bot042.channels.models import (
|
||||
)
|
||||
from bot042.db import repo
|
||||
from bot042.flows import processor as processor_mod
|
||||
from bot042.flows.media_input import PreparedInbound
|
||||
from bot042.flows.processor import make_processor
|
||||
|
||||
|
||||
@@ -210,7 +211,7 @@ def test_build_history_rules() -> None:
|
||||
]
|
||||
|
||||
|
||||
def test_processor_rejects_empty_and_media(
|
||||
def test_processor_rejects_empty_message(
|
||||
monkeypatch: pytest.MonkeyPatch, tmp_path: Path
|
||||
) -> None:
|
||||
async def fake_run_task(task, settings=None, history=None, *, cache=None): # pragma: no cover
|
||||
@@ -223,6 +224,55 @@ def test_processor_rejects_empty_and_media(
|
||||
assert events[-1].type == MessageEventType.ERROR
|
||||
assert "空消息" in (events[-1].error or "")
|
||||
|
||||
|
||||
def test_processor_explains_unreadable_attachments(
|
||||
monkeypatch: pytest.MonkeyPatch, tmp_path: Path
|
||||
) -> None:
|
||||
"""附件全部没接收成功:给附件级说明,不要含糊成「空消息」。"""
|
||||
|
||||
async def fake_prepare(message, *, root, **kwargs):
|
||||
_ = message, root, kwargs
|
||||
return PreparedInbound(text="", notes=["图片未接收:超过大小上限"])
|
||||
|
||||
async def fake_run_task(task, settings=None, history=None, *, cache=None): # pragma: no cover
|
||||
raise AssertionError("不应执行任务")
|
||||
|
||||
monkeypatch.setattr(processor_mod, "prepare_inbound", fake_prepare)
|
||||
monkeypatch.setattr(processor_mod, "run_task", fake_run_task)
|
||||
processor = make_processor(db=tmp_path / "bot.db")
|
||||
|
||||
events = _events(processor, _message("", media=True))
|
||||
assert events[-1].type == MessageEventType.ERROR
|
||||
assert "仅支持文本" in (events[-1].error or "")
|
||||
error = events[-1].error or ""
|
||||
assert "附件未能接收" in error
|
||||
assert "超过大小上限" in error
|
||||
|
||||
|
||||
def test_processor_sends_blocks_for_attachment_only_message(
|
||||
monkeypatch: pytest.MonkeyPatch, tmp_path: Path
|
||||
) -> None:
|
||||
"""只有一张图、没有正文时也必须发多模态块,否则附件被静默丢掉。"""
|
||||
|
||||
async def fake_prepare(message, *, root, **kwargs):
|
||||
_ = message, root, kwargs
|
||||
return PreparedInbound(
|
||||
text="",
|
||||
blocks=[
|
||||
{"type": "image_url", "image_url": {"url": "data:image/png;base64,AA=="}}
|
||||
],
|
||||
)
|
||||
|
||||
seen: list[object] = []
|
||||
|
||||
async def fake_run_task(task, settings=None, history=None, *, cache=None):
|
||||
seen.append(task)
|
||||
return {"messages": [{"role": "assistant", "content": "看到了"}]}
|
||||
|
||||
monkeypatch.setattr(processor_mod, "prepare_inbound", fake_prepare)
|
||||
monkeypatch.setattr(processor_mod, "run_task", fake_run_task)
|
||||
processor = make_processor(db=tmp_path / "bot.db")
|
||||
|
||||
events = _events(processor, _message("", media=True))
|
||||
assert isinstance(seen[0], list)
|
||||
assert seen[0][0]["type"] == "image_url"
|
||||
assert events[-1].type == MessageEventType.COMPLETED
|
||||
Reference in new issue
Block a user