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:
@@ -28,6 +28,44 @@ from app.ai.exceptions import (
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def _field_value(source: Any, key: str, default: Any = None) -> Any:
|
||||
"""兼容 dict、DashScope DictMixin 和普通对象取字段。"""
|
||||
if isinstance(source, dict):
|
||||
return source.get(key, default)
|
||||
return getattr(source, key, default)
|
||||
|
||||
|
||||
def _safe_int(value: Any) -> int:
|
||||
"""把 token 字段安全转换为 int，异常值按 0 处理。"""
|
||||
try:
|
||||
return int(value or 0)
|
||||
except (TypeError, ValueError):
|
||||
return 0
|
||||
|
||||
|
||||
def _extract_tokens_used(usage: Any) -> int:
|
||||
"""从 DashScope usage 多种结构中提取 tokens_used。"""
|
||||
if not usage:
|
||||
return 0
|
||||
|
||||
models = _field_value(usage, "models")
|
||||
if models:
|
||||
total = 0
|
||||
for model_usage in models:
|
||||
total += _safe_int(_field_value(model_usage, "input_tokens"))
|
||||
total += _safe_int(_field_value(model_usage, "output_tokens"))
|
||||
return total
|
||||
|
||||
total_tokens = _field_value(usage, "total_tokens")
|
||||
if total_tokens is not None:
|
||||
return _safe_int(total_tokens)
|
||||
|
||||
return (
|
||||
_safe_int(_field_value(usage, "input_tokens"))
|
||||
+ _safe_int(_field_value(usage, "output_tokens"))
|
||||
)
|
||||
|
||||
|
||||
class DashScopeClient:
|
||||
"""DashScope Application API 统一封装层。
|
||||
|
||||
@@ -54,22 +92,28 @@ class DashScopeClient:
|
||||
prompt: str,
|
||||
session_id: str | None = None,
|
||||
biz_params: dict | None = None,
|
||||
) -> AsyncGenerator[str, None]:
|
||||
"""App1 流式调用。
|
||||
) -> AsyncGenerator[tuple[str, str | None], None]:
|
||||
"""App1 流式调用，支持 multi-turn session_id 透传。
|
||||
|
||||
在线程中消费同步迭代器，通过 asyncio.Queue 桥接到 async generator。
|
||||
错误通过 queue 传递给调用方。
|
||||
每个 yield 返回 (text_chunk, session_id_or_none) 元组：
|
||||
- 首次调用（传入 session_id=None）时，百炼在流中会返回新 session_id，
|
||||
应由调用方在流结束后回写 DB。
|
||||
- 后续调用传入 DB 中的 session_id 后，百炼自动关联历史上下文，
|
||||
返回的 session_id 通常一致。
|
||||
|
||||
Args:
|
||||
app_id: 百炼应用 ID
|
||||
prompt: 用户输入
|
||||
session_id: 百炼 session_id（多轮对话）
|
||||
session_id: 百炼 session_id；首次对话传 None
|
||||
biz_params: 业务参数（如 user_prompt_params）
|
||||
|
||||
Yields:
|
||||
文本 chunk
|
||||
(text_chunk, session_id_or_none) 元组。
|
||||
text_chunk 为空字符串时（例如仅承载 session_id 的心跳 chunk），
|
||||
调用方应忽略文本但保留 session_id。
|
||||
"""
|
||||
queue: asyncio.Queue[str | BaseException | None] = asyncio.Queue()
|
||||
queue: asyncio.Queue[tuple[str, str | None] | BaseException | None] = asyncio.Queue()
|
||||
loop = asyncio.get_running_loop()
|
||||
|
||||
def _consume_in_thread() -> None:
|
||||
@@ -91,10 +135,17 @@ class DashScopeClient:
|
||||
response = Application.call(**call_kwargs)
|
||||
for chunk in response:
|
||||
if chunk.status_code == 200:
|
||||
text = chunk.output.get("text", "")
|
||||
if text:
|
||||
output = chunk.output if hasattr(chunk, "output") else {}
|
||||
if isinstance(output, dict):
|
||||
text = output.get("text", "") or ""
|
||||
new_sid = output.get("session_id")
|
||||
else:
|
||||
text = getattr(output, "text", "") or ""
|
||||
new_sid = getattr(output, "session_id", None)
|
||||
# 文本或 session_id 任一非空都推入（心跳 chunk 也传出 session_id）
|
||||
if text or new_sid:
|
||||
asyncio.run_coroutine_threadsafe(
|
||||
queue.put(text), loop
|
||||
queue.put((text, new_sid)), loop
|
||||
)
|
||||
else:
|
||||
# 非 200 状态码，构造异常传递给调用方
|
||||
@@ -180,16 +231,12 @@ class DashScopeClient:
|
||||
raw_text = output.text or ""
|
||||
|
||||
# 提取 tokens_used
|
||||
# DashScope Application.call() 返回的 usage 实际结构（2026-04 验证）：
|
||||
# ApplicationUsage(models=[ApplicationModelUsage(model_id, input_tokens, output_tokens)])
|
||||
# 旧代码只处理 dict / total_tokens 两种分支，导致该嵌套结构下 tokens_used 恒为 0
|
||||
tokens_used = 0
|
||||
if hasattr(response, "usage") and response.usage:
|
||||
usage = response.usage
|
||||
if isinstance(usage, dict):
|
||||
# input_tokens + output_tokens
|
||||
tokens_used = usage.get("input_tokens", 0) + usage.get(
|
||||
"output_tokens", 0
|
||||
)
|
||||
elif hasattr(usage, "total_tokens"):
|
||||
tokens_used = usage.total_tokens or 0
|
||||
tokens_used = _extract_tokens_used(response.usage)
|
||||
|
||||
# 提取 new_session_id
|
||||
new_session_id: str | None = None
|
||||
|
||||
Reference in New Issue
Block a user