qyqy
7677aeaee1
冲突仅 3 个文件，全部取并集（双方都没有需要丢弃的改动）： - app/main.py：import 双方路由（我方 knowledge_management + 同事的 offsite_fund/ promotion_material）；include_router 段本已自动合并 - app/service/agent/bootstrap.py：import 与工具注册均取并集 （query_customer_profile + query_financial_data 都注册） - tests/integration/test_config_release_mysql.py：outbox 清理同时保留 架构师的 event_type 限定（防误删其它域 outbox 行）与同事新增的 peer_release_id 同事这轮带入：11 个 alembic 迁移（建 offsite_* / promotion_* 等表）、 场外申购与推广素材 Agent、financial NL2SQL 工具。 注意：本库尚无 offsite_*/promotion_* 表，跑相关测试前需要执行 alembic upgrade。 边界核对：同事的场外代码未写入场内交易表（fin_sim_order/fin_capital_flow/fin_cash_ledger）， 符合 AGENTS.md 规则 8。
113 lines
6.1 KiB
Python
113 lines
6.1 KiB
Python
import asyncio
|
|
from uuid import uuid4
|
|
|
|
import httpx
|
|
import pytest
|
|
from sqlalchemy import delete, select, update
|
|
|
|
from app.api.dependencies.auth import build_request_context
|
|
from app.core.contracts import AgentRequest, AgentResult, CoreResult, RequestContext
|
|
from app.core.errors import RunLeaseLostError
|
|
from app.infrastructure.db import SessionFactory
|
|
from app.main import create_app
|
|
from app.model.audit import InteractionAudit
|
|
from app.model.conversation import ConversationMessage
|
|
from app.model.platform import AgentRun, DomainEventOutbox, OutboxDelivery, RequestIdempotency
|
|
from app.service.agent.governance import FALLBACK_DISCLAIMER
|
|
from app.service.agent_persistence_service import AgentPersistenceService
|
|
from app.service.agent_run_application_service import AgentRunApplicationService
|
|
from app.worker.runtime import WorkerRuntime
|
|
|
|
|
|
@pytest.mark.integration
|
|
@pytest.mark.parametrize("revoked", [False, True])
|
|
async def test_http_accept_worker_commit_query_and_repeat(acceptance_registry, revoked):
|
|
context = RequestContext(user_id="1", trace_id=str(uuid4()), roles=("customer",),
|
|
permissions=("agent:run",))
|
|
app = create_app()
|
|
app.dependency_overrides[build_request_context] = lambda: context
|
|
session_id = f"runtime-{uuid4()}"
|
|
run_id = None
|
|
|
|
async def identity(value):
|
|
return context if not revoked else value
|
|
|
|
runtime = WorkerRuntime(acceptance_registry, resolve_identity=identity)
|
|
async with httpx.AsyncClient(transport=httpx.ASGITransport(app=app),
|
|
base_url="http://test") as client:
|
|
try:
|
|
# 消息必须命中显式记忆信号：P2 之后触发判定改为事件/事实驱动，
|
|
# 无信号的普通消息不再产生 memory.extraction_requested，而下方断言依赖该事件。
|
|
response = await client.post("/api/v1/agent-runs", json={
|
|
"agent_type": "customer_service",
|
|
"message": "hello runtime，我的风险偏好是稳健型",
|
|
"session_id": session_id, "idempotency_key": str(uuid4()),
|
|
})
|
|
assert response.status_code == 202
|
|
# 文档 §3.3 + §19：成功响应统一为 {data, meta} 信封。
|
|
run_id = response.json()["data"]["run_id"]
|
|
assert await runtime.dispatch_one(run_id=run_id)
|
|
assert not await runtime.dispatch_one(run_id=run_id)
|
|
await asyncio.gather(runtime.execute(run_id), runtime.execute(run_id))
|
|
result = (await client.get(f"/api/v1/agent-runs/{run_id}")).json()["data"]
|
|
assert result["status"] == ("failed" if revoked else "succeeded")
|
|
if not revoked:
|
|
# 治理层强制注入固定免责声明（门禁 F5：面向客户输出 100% 附固定话术），
|
|
# 落库正文因此是「Agent 正文 + 免责声明」，不再是纯正文——断言改为包含。
|
|
assert result["result"]["content"].startswith("test result")
|
|
assert FALLBACK_DISCLAIMER in result["result"]["content"]
|
|
assert not await runtime.execute(run_id)
|
|
async with SessionFactory() as session:
|
|
messages = list(await session.scalars(select(ConversationMessage).where(
|
|
ConversationMessage.session_id == session_id,
|
|
ConversationMessage.role == "assistant")))
|
|
assert len(messages) == (0 if revoked else 1)
|
|
events = list(await session.scalars(select(DomainEventOutbox).where(
|
|
DomainEventOutbox.aggregate_id == run_id,
|
|
DomainEventOutbox.event_type == "memory.extraction_requested")))
|
|
assert len(events) == (0 if revoked else 1)
|
|
finally:
|
|
await cleanup(session_id, run_id)
|
|
|
|
|
|
async def test_expired_worker_cannot_commit(acceptance_registry):
|
|
context = RequestContext(user_id="1", trace_id=str(uuid4()), roles=("customer",),
|
|
permissions=("agent:run",))
|
|
request = AgentRequest(agent_type="customer_service", message="fence test",
|
|
session_id=f"fence-{uuid4()}", idempotency_key=str(uuid4()))
|
|
async with SessionFactory() as session:
|
|
accepted = await AgentRunApplicationService(session, acceptance_registry).accept(
|
|
request, context)
|
|
try:
|
|
async with SessionFactory() as session, session.begin():
|
|
await session.execute(update(AgentRun).where(AgentRun.run_id == accepted.run_id)
|
|
.values(status="running", worker_id="new-owner"))
|
|
async with SessionFactory() as session:
|
|
with pytest.raises(RunLeaseLostError):
|
|
await AgentPersistenceService(session).complete_run(
|
|
accepted.run_id, AgentResult(run_id=accepted.run_id,
|
|
result=CoreResult(text="stale")),
|
|
worker_id="old-owner")
|
|
async with SessionFactory() as session:
|
|
assert await session.scalar(select(ConversationMessage.id).where(
|
|
ConversationMessage.session_id == request.session_id,
|
|
ConversationMessage.role == "assistant")) is None
|
|
finally:
|
|
await cleanup(request.session_id, accepted.run_id)
|
|
|
|
|
|
async def cleanup(session_id, run_id):
|
|
async with SessionFactory() as session, session.begin():
|
|
event_ids = select(DomainEventOutbox.event_id).where(
|
|
DomainEventOutbox.aggregate_id == run_id)
|
|
await session.execute(delete(OutboxDelivery).where(OutboxDelivery.event_id.in_(event_ids)))
|
|
await session.execute(delete(DomainEventOutbox).where(
|
|
DomainEventOutbox.aggregate_id == run_id))
|
|
await session.execute(delete(InteractionAudit).where(
|
|
InteractionAudit.session_id == session_id))
|
|
await session.execute(delete(AgentRun).where(AgentRun.session_id == session_id))
|
|
await session.execute(delete(RequestIdempotency).where(
|
|
RequestIdempotency.session_id == session_id))
|
|
await session.execute(delete(ConversationMessage).where(
|
|
ConversationMessage.session_id == session_id))
|