feat: 2026-04-15~05-02 累积变更基线 — AI 重构 + Runtime Context + DWS 修复
涵盖(每条对应已存的审计记录): - AI 模块拆分:apps/backend/app/ai/apps -> prompts/(8 个 APP + app2a 派生) audit: 2026-04-20__ai-module-complete.md - admin-web AI 管理套件:AIDashboard / AIOperations / AIRunLogs / AITriggers / TriggerManager audit: 2026-04-21__admin-web-ai-management-suite.md - App2 财务洞察 prompt v3 -> v5.1 + 小程序 AI 接入(chat / board-finance) audit: 2026-04-22__app2_prompt_v5_1_and_miniprogram_ai_insight.md - App2 prewarm 全过滤器 + AI 触发器 cron reschedule audit: 2026-04-21__app2-finance-prewarm-all-filters.md migration: 20260420_ai_trigger_jobs_and_app2_prewarm.sql / 20260421_app2_prewarm_cron_reschedule.sql - AppType 联合类型对齐 + adminAiAppTypes.test.ts audit: 2026-04-30__admin_web_ai_app_type_alignment.md - DashScope tokens_used 提取修复 audit: 2026-04-30__backend_dashscope_tokens_used_extraction.md - App3 线索完整详情 prompt audit: 2026-05-01__backend_app3_full_detail_prompt.md - Runtime Context 沙箱(5-1~5-2 主线): - 后端 schema/service + admin_runtime_context / xcx_runtime_clock 两个 router - admin-web RuntimeContext.tsx + miniprogram runtime-clock.ts - migration: 20260501__runtime_context_sandbox.sql - tools/db/verify_admin_web_sandbox.py + verify_sandbox_end_to_end.py - database/changes: 7 份 sandbox_* 验证报告 - 飞球 DWS 修复:finance_area_daily 区域汇总 + task_engine 调整 + RLS 视图业务日上界(migration 20260502 + scripts/ops/gen_rls_business_date_migration.py) 合规: - .gitignore 启用 tmp/ 排除 - 不入仓:apps/etl/connectors/feiqiu/.env(API_TOKEN secret,本地修改保留) 待验证清单: - docs/audit/changes/2026-05-04__cumulative_baseline_pending_verification.md 每个主题的功能完整性 / 上线验证几乎都未收口,按优先级 P0~P3 逐一处理
This commit is contained in:
@@ -207,6 +207,25 @@ class AIDispatcher:
|
||||
|
||||
# 内存 trigger_job 计数器(DB 迁移完成后改为 INSERT RETURNING id)
|
||||
self._next_job_id = 1
|
||||
self._running_tasks: dict[int, asyncio.Task] = {}
|
||||
self._running_task_sites: dict[int, int] = {}
|
||||
|
||||
def _forget_running_task(self, job_id: int) -> None:
|
||||
self._running_tasks.pop(job_id, None)
|
||||
self._running_task_sites.pop(job_id, None)
|
||||
|
||||
def cancel_running(self, site_id: int) -> int:
|
||||
"""取消当前进程内指定门店未完成的 AI 调用链。"""
|
||||
cancelled = 0
|
||||
for job_id, task in list(self._running_tasks.items()):
|
||||
if self._running_task_sites.get(job_id) != site_id:
|
||||
continue
|
||||
if task.done():
|
||||
self._forget_running_task(job_id)
|
||||
continue
|
||||
task.cancel()
|
||||
cancelled += 1
|
||||
return cancelled
|
||||
|
||||
# ── 统一事件入口 ─────────────────────────────────────
|
||||
|
||||
@@ -242,7 +261,10 @@ class AIDispatcher:
|
||||
self._dedup_set.add(dedup_key)
|
||||
|
||||
# 后台异步执行调用链,不阻塞返回
|
||||
asyncio.create_task(self._execute_chain(job_id, event))
|
||||
task = asyncio.create_task(self._execute_chain(job_id, event))
|
||||
self._running_tasks[job_id] = task
|
||||
self._running_task_sites[job_id] = event.site_id
|
||||
task.add_done_callback(lambda _task, _job_id=job_id: self._forget_running_task(_job_id))
|
||||
return job_id
|
||||
|
||||
# ── 调用链分发 ───────────────────────────────────────
|
||||
@@ -278,6 +300,10 @@ class AIDispatcher:
|
||||
await asyncio.wait_for(handler(event), timeout=chain_timeout)
|
||||
logger.info("调用链完成: job_id=%d event_type=%s", job_id, event.event_type)
|
||||
_update_trigger_job_status(job_id, "completed", set_finished=True)
|
||||
except asyncio.CancelledError:
|
||||
logger.warning("调用链已取消: job_id=%d event_type=%s", job_id, event.event_type)
|
||||
_update_trigger_job_status(job_id, "cancelled", error_message="业务运行上下文切换取消", set_finished=True)
|
||||
raise
|
||||
except asyncio.TimeoutError:
|
||||
logger.error("调用链超时: job_id=%d event_type=%s", job_id, event.event_type)
|
||||
_update_trigger_job_status(job_id, "failed", error_message="调用链超时", set_finished=True)
|
||||
|
||||
Reference in New Issue
Block a user