mirror of
https://github.com/ThearchyHelios/AgentLab.git
synced 2026-11-20 16:32:00 +00:00
86d2840e41
邮件(04 细案 B2,集成-I4 / I5,改写应用平台 Q6): - notify/mail.py:标准库 smtplib 放进 asyncio.to_thread,单次超时 10 秒;4xx 和连不上按 1/2/4 秒重试,5xx 不重试; 报错只写主机名和服务器回话,口令一律抹掉;纯文本 + 转义过的 HTML,带 List-Unsubscribe 和 Auto-Submitted;测试可换假的 SMTP 工厂。模块说明写清改写 Q6 的理由:SMTP 是可选配置、退信不追踪照实说「已交给邮件服务器」 - 通知渠道多一种格式「邮件」(core.CHANNEL_FORMATS;定时任务的 Webhook 只会发 HTTP,FORMATS 不加,免得定时任务能选 邮件):个人邮件渠道不收地址,只发到名录里的账号邮箱,没有邮箱记一条失败投递并写明去「设置 → 身份」填;全局、应用的填 固定地址,最多 20 个;邮件服务没启用时不收新的邮件渠道;渠道列表另给 mail(启没启用、本人的账号邮箱),投递记录带格式 - 设置的 mail 一组(只有管理员能改):口令用 core/crypto 加密,读的时候只说配没配;启用时要配全;发件人名称、主机不许 换行;「发测试邮件」只发到管理员自己的账号邮箱,关登录、没有邮箱时 422 说清怎么办 - mail.default_for_assignees(缺省关):开了之后第一次派到待办的人自动有一个个人邮件渠道(订阅待办打开、动作结果未知、 审核有结果),本人删了不再建回来;关登录时不建 待办汇总与密钥到期(04 细案 B3): - notify/digest.py 接进调度循环的步骤列表:每天到 notify.digest_at(缺省 09:00,服务端时区)给订阅了 task.digest 的 个人渠道发汇总(条数、最早时限、最多 5 条节点名、去待办箱的链接,没有待办不发);按日期在 settings 表里插一行认领, 重启不重发;认领行和自动建邮件渠道的名单是通知自己记的账,设置接口不列不收 - key.expiring:到期前 7 天、1 天各推一次,个人密钥推本人的个人渠道、服务账号的推全局渠道,推之前记审计、按审计去重; 轮换下来的旧密钥、撤销了的、建的时候就在这一档里的不推 - 两个事件推送实现了,才在 notify/service.EVENTS 打开它们的订阅范围 设置的 notify 一组加 digest_at;只给一部分时补上存着的另几项;环境变量锁住对外访问地址时只核对那一项,汇总时间照常能改。 apps 一组加 share_links(分享链接的开关,缺省关,下一个提交用)。测试:假 SMTP 工厂下的收件人、失败投递、重试、口令、 设置与权限、自动建渠道;汇总按时、只发一次、重启不重发;密钥两档、谁收、不该推的几种。
172 lines
9.0 KiB
Python
172 lines
9.0 KiB
Python
"""通知事件的登记表(app/notify/service.EVENTS;总方案 X6)。
|
||
|
||
本轮新增的六个事件(数据源变化、口径召回、评测退步 / 失败、待办汇总、密钥到期)在第 1 波一次登记好:名字、界面上的叫法、
|
||
推给哪几条路都在 EVENTS 一处,前端的叫法在 lib/terms.ts 的 NOTIFY_TEXT 一处。第 2、3 波实现推送的那一块只改自己那一行
|
||
的范围,不再去改同一个元组、同一张叫法表(几块并行改同一处必然冲突)。这里守:
|
||
|
||
- 登记表:六个事件都在,叫法不空;推给哪几条路是空的就是「登记了、还没有推送」——接口不收这种订阅、GET /api/notify/events
|
||
照实给空的 scopes,设置页和应用的通知里都不列(勾了收不到就是「看着生效、其实没生效」,个人渠道「实例完成」的老问题);
|
||
- 前后端对照:terms.ts 的 eventLabel 和 EVENTS 一一对应、逐字一致;投递记录才有的事件(改派、升级、催办、测试消息)另有一张
|
||
叫法表,和服务端 _AS 对上(写法同 test_chat_turn_policy.py,两边一改就对不上);
|
||
- 推给哪几条路是真的:_channels 只走事件登记了的路;没登记的事件推不出去,直接报错;
|
||
- 订阅的范围不对(全局渠道勾只推个人的事件)拒收,但只核对这次新勾的:以前存下的照旧,开关、改名不会因此 422。
|
||
|
||
渠道名、地址都是虚构的。
|
||
"""
|
||
from __future__ import annotations
|
||
|
||
import re
|
||
from pathlib import Path
|
||
|
||
import pytest
|
||
from httpx import ASGITransport, AsyncClient
|
||
from sqlalchemy import delete
|
||
|
||
from app.core.crypto import encrypt
|
||
from app.db.base import SessionLocal
|
||
from app.db.models import NotifyChannel
|
||
from app.notify import service
|
||
|
||
TERMS_TS = Path(__file__).resolve().parents[2] / "frontend" / "src" / "lib" / "terms.ts"
|
||
URL = "https://hooks.example.com/agentlab/notify-events-5d1c"
|
||
|
||
#: 本轮登记的六个(总方案 X6)
|
||
THIS_ROUND = ("source.changed", "ledger.recall", "eval.regressed", "eval.failed", "task.digest", "key.expiring")
|
||
#: 其中已经实现了推送、打开了订阅的(推给哪几条路):每天的待办汇总只推个人渠道;访问密钥快到期,个人密钥推本人、服务账号的
|
||
#: 推全局渠道(第 3 波 W3-d,notify/digest.py)
|
||
PUSHED_THIS_ROUND = {"task.digest": {"user"}, "key.expiring": {"global", "user"}}
|
||
|
||
|
||
@pytest.fixture
|
||
async def client():
|
||
from app.main import app
|
||
|
||
async with AsyncClient(transport=ASGITransport(app=app), base_url="http://test") as c:
|
||
yield c
|
||
async with SessionLocal() as session:
|
||
await session.execute(delete(NotifyChannel).where(NotifyChannel.name.like("事件登记-%")))
|
||
await session.commit()
|
||
|
||
|
||
# --------------------------------------------------------------------------
|
||
# 登记表
|
||
# --------------------------------------------------------------------------
|
||
|
||
|
||
def test_this_rounds_events_are_registered_once_and_not_pushed_yet():
|
||
for name in THIS_ROUND:
|
||
assert name in service.EVENTS, f"{name} 没有登记"
|
||
assert service.EVENTS[name].label, name
|
||
if name in PUSHED_THIS_ROUND:
|
||
assert set(service.EVENTS[name].scopes) == PUSHED_THIS_ROUND[name], name
|
||
else:
|
||
assert service.EVENTS[name].scopes == (), f"{name} 还没有推送:不该有人订阅得到"
|
||
assert len({e.label for e in service.EVENTS.values()}) == len(service.EVENTS), "两个事件叫成了同一句"
|
||
assert service.EVENT_LABEL == {k: v.label for k, v in service.EVENTS.items()}
|
||
|
||
|
||
def test_events_that_are_pushed_today_keep_their_audience():
|
||
"""现有五个事件推给哪几条路,照 _channels 和各个 notify_* 现在的做法登记(行为不变)。"""
|
||
every = {"global", "user", "app"}
|
||
assert {k: set(v.scopes) for k, v in service.EVENTS.items() if v.scopes} == {
|
||
"task.opened": every, "run.finished": every, "run.failed": every, "action.unknown": every,
|
||
# 发给提交人自己(和订阅了它的全局渠道),不归哪个应用
|
||
"review.done": {"global", "user"},
|
||
**PUSHED_THIS_ROUND,
|
||
}
|
||
for event in service.EVENTS.values():
|
||
assert set(event.scopes) <= every
|
||
|
||
|
||
def _object_block(source: str, name: str) -> str:
|
||
"""terms.ts 里 NOTIFY_TEXT 下面名叫 name 的那个对象字面量(到配对的右花括号为止)。"""
|
||
head = source.index("export const NOTIFY_TEXT = {")
|
||
start = source.index(f"{name}: {{", head) + len(name) + 2
|
||
depth, i = 1, start + 1
|
||
while depth:
|
||
depth += {"{": 1, "}": -1}.get(source[i], 0)
|
||
i += 1
|
||
return source[start:i]
|
||
|
||
|
||
def _entries(block: str) -> dict[str, str]:
|
||
return dict(re.findall(r"'?([a-z]+(?:\.[a-z_]+)?)'?:\s*'([^']*)'", block))
|
||
|
||
|
||
def test_frontend_labels_match_the_registry_word_for_word():
|
||
source = TERMS_TS.read_text(encoding="utf-8")
|
||
labels = _entries(_object_block(source, "eventLabel"))
|
||
assert labels == service.EVENT_LABEL, "设置页的叫法和服务端登记的对不上(一种说法)"
|
||
delivery = _entries(_object_block(source, "deliveryEventLabel"))
|
||
assert set(delivery) == set(service._AS) | {"test"}, "投递记录里会出现的事件都要有叫法"
|
||
assert not set(delivery) & set(labels)
|
||
|
||
|
||
# --------------------------------------------------------------------------
|
||
# 接口
|
||
# --------------------------------------------------------------------------
|
||
|
||
|
||
async def test_events_endpoint_says_who_receives_each_event(client):
|
||
rows = (await client.get("/api/notify/events")).json()
|
||
assert [r["event"] for r in rows] == list(service.EVENTS)
|
||
by = {r["event"]: r for r in rows}
|
||
assert by["eval.regressed"] == {"event": "eval.regressed", "label": "评测有退步", "scopes": []}
|
||
assert by["review.done"]["scopes"] == ["global", "user"]
|
||
|
||
|
||
async def test_events_not_pushed_yet_cannot_be_subscribed(client):
|
||
resp = await client.post("/api/notify/channels", json={
|
||
"name": "事件登记-评测", "url": URL, "events": ["task.opened", "eval.regressed"]})
|
||
assert resp.status_code == 422, resp.text
|
||
detail = resp.json()["detail"]
|
||
assert "评测有退步" in detail and "还没有推送" in detail
|
||
unknown = await client.post("/api/notify/channels", json={"name": "事件登记-未知", "url": URL, "events": ["nope"]})
|
||
assert unknown.status_code == 422
|
||
assert "评测有退步" not in unknown.json()["detail"], "可选的里面不列还没有推送的"
|
||
assert "待办打开" in unknown.json()["detail"]
|
||
|
||
|
||
async def test_scope_mismatch_is_refused_only_for_newly_ticked_events(client):
|
||
refused = await client.post("/api/notify/channels", json={
|
||
"name": "事件登记-应用", "scope": "app", "url": URL, "events": ["review.done"]})
|
||
assert refused.status_code == 422, refused.text
|
||
assert "我提交审核的应用有结果" in refused.json()["detail"] and "应用" in refused.json()["detail"]
|
||
# 以前存下的(当时界面对哪种渠道都列这一项):开关、改名照旧,不因此 422
|
||
async with SessionLocal() as session:
|
||
row = NotifyChannel(name="事件登记-旧", scope="app", url=encrypt(URL), events=["task.opened", "review.done"])
|
||
session.add(row)
|
||
await session.commit()
|
||
channel_id = row.id
|
||
toggled = await client.patch(f"/api/notify/channels/{channel_id}", json={"enabled": False})
|
||
assert toggled.status_code == 200, toggled.text
|
||
assert toggled.json()["events"] == ["task.opened", "review.done"]
|
||
again = await client.patch(f"/api/notify/channels/{channel_id}", json={"events": ["review.done", "run.failed"]})
|
||
assert again.status_code == 200, again.text
|
||
added = await client.patch(f"/api/notify/channels/{channel_id}", json={"events": ["review.done", "eval.failed"]})
|
||
assert added.status_code == 422 and "评测失败" in added.json()["detail"]
|
||
|
||
|
||
# --------------------------------------------------------------------------
|
||
# 推送只走登记了的路
|
||
# --------------------------------------------------------------------------
|
||
|
||
|
||
async def test_channels_only_walk_the_paths_the_event_is_registered_for(monkeypatch):
|
||
monkeypatch.setitem(service.EVENTS, "demo.personal", service.Event("只推个人的演示事件", ("user",)))
|
||
async with SessionLocal() as session:
|
||
row = NotifyChannel(name="事件登记-全局", scope="global", url=encrypt(URL),
|
||
events=["demo.personal", "task.opened", "eval.failed"])
|
||
session.add(row)
|
||
await session.commit()
|
||
try:
|
||
ids = lambda found: [c.id for c in found] # noqa: E731
|
||
assert row.id not in ids(await service._channels(session, "demo.personal", None, [])), "全局渠道这条路没登记"
|
||
assert row.id in ids(await service._channels(session, "task.opened", None, []))
|
||
assert await service._channels(session, "eval.failed", None, []) == [], "还没有推送的:谁都不推"
|
||
with pytest.raises(ValueError, match="没有登记"):
|
||
await service._channels(session, "demo.unregistered", None, [])
|
||
finally:
|
||
await session.delete(row)
|
||
await session.commit()
|