feat: 重构为 agent / channels / flows / db 分层架构
- agent: 新增 base.py 执行基类、execution.py 执行器、web.py 网络工具, middlewares/steering.py 中间件;移除旧的 agent.py - channels: 新增 ChannelManager、registry、models 与 IM 渠道(企业微信), 扩展 base.py - flows: 新增 agent_task / bus / cron / scheduler / service / stream / rpc / processor / tasks / model_settings / builtin;移除旧的 task.py - db: 新增 sqlite schema 与 repo 层 - docs: 新增架构说明、Channel × EventBus 设计、任务编写教程 - 依赖新增 aiosqlite / httpx / langgraph / primp / pydantic / ripgrep / wecom-aibot-sdk;新增 bot 命令入口 - 测试:232 passed
This commit is contained in:
1 parent
94421e5c2b
commit
fbb01c4c83
65 files changed
+15322
-173
No files matched your search
@@ -0,0 +1,169 @@
|
||||
"""插话(steer)测试:缓冲、中间件注入、运行器派发与 AgentReply 汇点。"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
from datetime import datetime
|
||||
from typing import Any
|
||||
|
||||
from bot042.agent.middlewares.steering import (
|
||||
STEER_PREFIX,
|
||||
SteeringBuffer,
|
||||
SteeringMiddleware,
|
||||
bind,
|
||||
unbind,
|
||||
)
|
||||
from bot042.channels.models import (
|
||||
ChannelMessage,
|
||||
ChannelSubject,
|
||||
InboundMessage,
|
||||
TextContent,
|
||||
)
|
||||
from bot042.flows.builtin import AgentReply
|
||||
from bot042.flows.bus import EventBus
|
||||
from bot042.flows.scheduler import CN_TZ
|
||||
from bot042.flows.tasks import (
|
||||
EventTrigger,
|
||||
OverlapPolicy,
|
||||
Task,
|
||||
TaskContext,
|
||||
TaskRunner,
|
||||
)
|
||||
|
||||
|
||||
def test_buffer_ignores_blank_and_drains() -> None:
|
||||
buffer = SteeringBuffer()
|
||||
assert buffer.push(" ") is False
|
||||
assert buffer.push("补充一句") is True
|
||||
assert len(buffer) == 1
|
||||
assert buffer.drain() == ["补充一句"]
|
||||
assert not buffer
|
||||
|
||||
|
||||
def test_middleware_injects_buffer_into_messages() -> None:
|
||||
buffer = SteeringBuffer()
|
||||
buffer.push("改用英语回答")
|
||||
token = bind(buffer)
|
||||
try:
|
||||
update = asyncio.run(SteeringMiddleware().abefore_model({}, None)) # type: ignore[arg-type]
|
||||
finally:
|
||||
unbind(token)
|
||||
|
||||
assert update is not None
|
||||
messages = update["messages"]
|
||||
assert len(messages) == 1
|
||||
assert messages[0].content == STEER_PREFIX + "改用英语回答"
|
||||
assert not buffer
|
||||
|
||||
|
||||
def test_middleware_noop_without_buffer() -> None:
|
||||
assert asyncio.run(SteeringMiddleware().abefore_model({}, None)) is None # type: ignore[arg-type]
|
||||
|
||||
|
||||
def test_runner_steers_running_task_instead_of_queueing() -> None:
|
||||
async def _run() -> tuple[list[object], int]:
|
||||
bus = EventBus()
|
||||
bus.bind_loop()
|
||||
runner = TaskRunner(bus)
|
||||
seen: list[object] = []
|
||||
|
||||
class Demo(Task):
|
||||
name = "steer.demo"
|
||||
overlap = OverlapPolicy.QUEUE
|
||||
supports_steer = True
|
||||
|
||||
def steer(self, payload: object) -> bool:
|
||||
seen.append(payload)
|
||||
return True
|
||||
|
||||
async def run(self) -> None:
|
||||
await asyncio.sleep(0.1)
|
||||
|
||||
runner.register(Demo)
|
||||
_ = runner.add_task("steer.demo", EventTrigger(event="pulse"))
|
||||
await runner.start()
|
||||
|
||||
bus.emit("pulse", 1)
|
||||
await asyncio.sleep(0.02)
|
||||
bus.emit("pulse", 2) # 运行中 → 注入,不排队
|
||||
await asyncio.sleep(0.15)
|
||||
await runner.wait_idle()
|
||||
await runner.stop()
|
||||
return seen, len(runner.runs("steer.demo"))
|
||||
|
||||
seen, total = asyncio.run(_run())
|
||||
assert seen == [2]
|
||||
assert total == 1 # 没有产生第二次运行
|
||||
|
||||
|
||||
def _message(text: str = "你好") -> ChannelMessage:
|
||||
return ChannelMessage.of(
|
||||
InboundMessage(
|
||||
channel_id="c1",
|
||||
channel_type="stream-test",
|
||||
channel_subject=ChannelSubject(subject_id="u1"),
|
||||
content=[TextContent(text=text)],
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
def test_agent_reply_steer_collects_text() -> None:
|
||||
payload = _message()
|
||||
ctx = TaskContext(
|
||||
run_id="r1",
|
||||
task=AgentReply.name,
|
||||
event="channel.inbound",
|
||||
fired_at=datetime.now(CN_TZ),
|
||||
payload=payload,
|
||||
)
|
||||
task = AgentReply(ctx)
|
||||
|
||||
assert task.steer(payload) is True
|
||||
assert task.steering.drain() == ["你好"]
|
||||
# 非消息载荷交给运行器按原策略处理
|
||||
assert task.steer(object()) is False
|
||||
|
||||
|
||||
def test_agent_reply_steer_rejects_empty_text() -> None:
|
||||
payload = _message(" ")
|
||||
ctx = TaskContext(
|
||||
run_id="r2",
|
||||
task=AgentReply.name,
|
||||
event="channel.inbound",
|
||||
fired_at=datetime.now(CN_TZ),
|
||||
payload=payload,
|
||||
)
|
||||
assert AgentReply(ctx).steer(payload) is False
|
||||
|
||||
|
||||
def test_slot_sink_cleared_after_run() -> None:
|
||||
"""运行结束后汇点必须清空,否则空闲任务会被持续注入。"""
|
||||
|
||||
async def _run() -> tuple[int, Any]:
|
||||
bus = EventBus()
|
||||
bus.bind_loop()
|
||||
runner = TaskRunner(bus)
|
||||
|
||||
class Demo(Task):
|
||||
name = "steer.cleanup"
|
||||
supports_steer = True
|
||||
|
||||
def steer(self, payload: object) -> bool: # pragma: no cover - 不应被调用
|
||||
return True
|
||||
|
||||
async def run(self) -> None:
|
||||
return
|
||||
|
||||
runner.register(Demo)
|
||||
_ = runner.add_task("steer.cleanup", EventTrigger(event="go"))
|
||||
await runner.start()
|
||||
bus.emit("go", None)
|
||||
await asyncio.sleep(0.05)
|
||||
await runner.wait_idle()
|
||||
sink = runner._slots[("steer.cleanup", "")].steer_sink
|
||||
await runner.stop()
|
||||
return len(runner.runs("steer.cleanup")), sink
|
||||
|
||||
total, sink = asyncio.run(_run())
|
||||
assert total == 1
|
||||
assert sink is None
|
||||
Reference in new issue
Block a user