refactor: 全栈架构升级 - 风险控制、会话管理、审计日志和验证码功能
后端变更: - 新增 risk_config.py: 风险配置数据类,支持环境变量驱动 - 新增 risk_control.py: 风险控制控制器,管理并发和预算 - 新增 session_store.py: 匿名会话存储,基于 cookie 的 session ID - 新增 audit_store.py: API 审计日志存储,记录请求和 LLM 调用 - 新增 captcha_api.py: 验证码 API,用于验证用户操作真实性 - 新增 llm_policy.py: LLM 策略配置,管理 completion/pro/vision 模型 - main.py: 集成 middleware、risk/audit/session 模块 (+467/-7) - job_handlers.py: LLM 执行流程重构,新增 risk/audit 集成 (+207/-4) - llm.py: 异步客户端封装,新增 max_output_tokens 参数 (+78/-1) - job_system.py: stream_events 逻辑优化,支持心跳检测 (+12/-4) - pro_completions.py: SSE heartbeat 机制,防止连接超时 (+14/-4) - prompt.py: _normalize_preferences 支持 Mapping 类型 (+13/-0) - tts_asr.py: asyncio loop 初始化,router export (+10/-0) 前端变更: - src/components/CaptchaComponent.vue: 新增验证码组件 (NEW) - src/utils/cookie_policy.js: Cookie 策略工具 (NEW) - SettingsPanel.vue: 集成验证码组件,新增安全设置部分 (+59/-0) - MilkdownEditor.vue: 移除硬编码 API_KEY,新增 credentials (+32/-10) - ProBlockCrepe.vue: 样式简化,移除渐变动画 (+18/-4) - proBlockPlugin.ts: 重构 schema/serializer 引用方式,通过 Ctx 管理 (+40/-10) - api.js: 新增 credentials,重构 headers 条件逻辑 (+50/-14) - config.js: API 基址改为 https://api.imageteach.tech:8002 (+8/-4) - convert.js, docsApi.js, i18n.js: 新增 credentials 和验证码 i18n (+54/-12) - proAccept.js: 重构正则和转义处理,修复捕获组索引 (+14/-4) 配置和基础设施: - docker-compose.yml: 新增端口映射 8001:8001 (+2/-0) - docker/nginx.conf: 改为 307 redirect,优化代理配置 (+8/-6) - vite.config.js: 移除 proxy 配置,直接调用远程 API (+8/-4) - .env.example: 新增 VITE_API_BASE_URL, VITE_API_KEY (+3/-1) - backend/.env.example: 大量 RISK_*, SESSION_*, CORS_* 配置 (+54/-0) - pytest.ini: 扩展 coverage 范围到整个 backend,移除 fail_under (+3/-2) - .coveragerc: 移除 fail_under = 90 (+0/-1) - .gitignore: 新增 docker-data/ (+3/-0) - package.json: 新增 vue3-captcha 依赖 (+3/-1) - AGENTS.md, README.md: 更新 Docker 部署和前端网络约定 (+20/-5) - public/sw.js: Service Worker cache 版本从 v1 升级到 v2 (+0/-1) 测试变更: - test_main_endpoints.py: 新增 session/risk/audit reset,新增测试用例 (+63/-4) - test_main_cancel.py: 新增 reset 调用 (+6/-0) - test_pro_completions.py: 新增 preferences 序列化和测试 (+23/-0) 总计: 45 个文件变更,+1009/-280 行
This commit is contained in:
@@ -0,0 +1,220 @@
|
||||
import json
|
||||
import os
|
||||
import threading
|
||||
from typing import Any
|
||||
|
||||
try:
|
||||
import psycopg
|
||||
except Exception: # pragma: no cover
|
||||
psycopg = None
|
||||
|
||||
|
||||
class BaseAuditStore:
|
||||
def record_api_request(self, payload: dict[str, Any]) -> None:
|
||||
return None
|
||||
|
||||
def record_llm_call(self, payload: dict[str, Any]) -> None:
|
||||
return None
|
||||
|
||||
def upsert_daily_usage(self, payload: dict[str, Any]) -> None:
|
||||
return None
|
||||
|
||||
|
||||
class NullAuditStore(BaseAuditStore):
|
||||
pass
|
||||
|
||||
|
||||
class PostgresAuditStore(BaseAuditStore):
|
||||
def __init__(self, database_url: str) -> None:
|
||||
if psycopg is None:
|
||||
raise RuntimeError("psycopg 未安装,无法使用 PostgreSQL 审计存储")
|
||||
self.database_url = database_url
|
||||
self._init_lock = threading.Lock()
|
||||
self._initialized = False
|
||||
|
||||
def _connect(self):
|
||||
return psycopg.connect(self.database_url, autocommit=True)
|
||||
|
||||
def _ensure_initialized(self) -> None:
|
||||
if self._initialized:
|
||||
return
|
||||
with self._init_lock:
|
||||
if self._initialized:
|
||||
return
|
||||
with self._connect() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS api_request_audit (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
request_id TEXT NOT NULL,
|
||||
session_hash TEXT NOT NULL,
|
||||
ip_hash TEXT NOT NULL,
|
||||
route TEXT NOT NULL,
|
||||
method TEXT NOT NULL,
|
||||
status_code INTEGER NOT NULL,
|
||||
decision TEXT NOT NULL,
|
||||
delay_ms INTEGER NOT NULL DEFAULT 0,
|
||||
queue_ms INTEGER NOT NULL DEFAULT 0,
|
||||
error_code TEXT NOT NULL DEFAULT '',
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
metadata_json JSONB NOT NULL DEFAULT '{}'::jsonb
|
||||
)
|
||||
"""
|
||||
)
|
||||
cur.execute(
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS llm_call_audit (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
request_id TEXT NOT NULL,
|
||||
session_hash TEXT NOT NULL,
|
||||
ip_hash TEXT NOT NULL,
|
||||
job_type TEXT NOT NULL,
|
||||
model TEXT NOT NULL,
|
||||
estimated_input_tokens INTEGER NOT NULL DEFAULT 0,
|
||||
max_output_tokens INTEGER NOT NULL DEFAULT 0,
|
||||
estimated_cost NUMERIC(18, 8) NOT NULL DEFAULT 0,
|
||||
actual_output_chars INTEGER NOT NULL DEFAULT 0,
|
||||
actual_cost NUMERIC(18, 8) NOT NULL DEFAULT 0,
|
||||
status TEXT NOT NULL,
|
||||
error_code TEXT NOT NULL DEFAULT '',
|
||||
started_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
finished_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
metadata_json JSONB NOT NULL DEFAULT '{}'::jsonb
|
||||
)
|
||||
"""
|
||||
)
|
||||
cur.execute(
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS risk_events (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
session_hash TEXT NOT NULL,
|
||||
ip_hash TEXT NOT NULL,
|
||||
event_type TEXT NOT NULL,
|
||||
severity TEXT NOT NULL,
|
||||
reason TEXT NOT NULL,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
metadata_json JSONB NOT NULL DEFAULT '{}'::jsonb
|
||||
)
|
||||
"""
|
||||
)
|
||||
cur.execute(
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS daily_budget_usage (
|
||||
usage_day DATE NOT NULL,
|
||||
scope TEXT NOT NULL,
|
||||
scope_hash TEXT NOT NULL,
|
||||
estimated_cost NUMERIC(18, 8) NOT NULL DEFAULT 0,
|
||||
actual_cost NUMERIC(18, 8) NOT NULL DEFAULT 0,
|
||||
request_count INTEGER NOT NULL DEFAULT 0,
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
PRIMARY KEY (usage_day, scope, scope_hash)
|
||||
)
|
||||
"""
|
||||
)
|
||||
self._initialized = True
|
||||
|
||||
def record_api_request(self, payload: dict[str, Any]) -> None:
|
||||
self._ensure_initialized()
|
||||
metadata = payload.get("metadata") or {}
|
||||
with self._connect() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""
|
||||
INSERT INTO api_request_audit (
|
||||
request_id, session_hash, ip_hash, route, method, status_code,
|
||||
decision, delay_ms, queue_ms, error_code, metadata_json
|
||||
)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s::jsonb)
|
||||
""",
|
||||
(
|
||||
payload["request_id"],
|
||||
payload["session_hash"],
|
||||
payload["ip_hash"],
|
||||
payload["route"],
|
||||
payload["method"],
|
||||
int(payload["status_code"]),
|
||||
payload["decision"],
|
||||
int(payload.get("delay_ms", 0)),
|
||||
int(payload.get("queue_ms", 0)),
|
||||
payload.get("error_code", ""),
|
||||
json.dumps(metadata, ensure_ascii=False),
|
||||
),
|
||||
)
|
||||
|
||||
def record_llm_call(self, payload: dict[str, Any]) -> None:
|
||||
self._ensure_initialized()
|
||||
metadata = payload.get("metadata") or {}
|
||||
with self._connect() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""
|
||||
INSERT INTO llm_call_audit (
|
||||
request_id, session_hash, ip_hash, job_type, model,
|
||||
estimated_input_tokens, max_output_tokens, estimated_cost,
|
||||
actual_output_chars, actual_cost, status, error_code, metadata_json
|
||||
)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s::jsonb)
|
||||
""",
|
||||
(
|
||||
payload["request_id"],
|
||||
payload["session_hash"],
|
||||
payload["ip_hash"],
|
||||
payload["job_type"],
|
||||
payload["model"],
|
||||
int(payload.get("estimated_input_tokens", 0)),
|
||||
int(payload.get("max_output_tokens", 0)),
|
||||
float(payload.get("estimated_cost", 0.0)),
|
||||
int(payload.get("actual_output_chars", 0)),
|
||||
float(payload.get("actual_cost", 0.0)),
|
||||
payload["status"],
|
||||
payload.get("error_code", ""),
|
||||
json.dumps(metadata, ensure_ascii=False),
|
||||
),
|
||||
)
|
||||
|
||||
def upsert_daily_usage(self, payload: dict[str, Any]) -> None:
|
||||
self._ensure_initialized()
|
||||
with self._connect() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""
|
||||
INSERT INTO daily_budget_usage (
|
||||
usage_day, scope, scope_hash, estimated_cost, actual_cost, request_count
|
||||
)
|
||||
VALUES (%s, %s, %s, %s, %s, %s)
|
||||
ON CONFLICT (usage_day, scope, scope_hash)
|
||||
DO UPDATE SET
|
||||
estimated_cost = daily_budget_usage.estimated_cost + EXCLUDED.estimated_cost,
|
||||
actual_cost = daily_budget_usage.actual_cost + EXCLUDED.actual_cost,
|
||||
request_count = daily_budget_usage.request_count + EXCLUDED.request_count,
|
||||
updated_at = CURRENT_TIMESTAMP
|
||||
""",
|
||||
(
|
||||
payload["usage_day"],
|
||||
payload["scope"],
|
||||
payload["scope_hash"],
|
||||
float(payload.get("estimated_cost", 0.0)),
|
||||
float(payload.get("actual_cost", 0.0)),
|
||||
int(payload.get("request_count", 0)),
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
_audit_store: BaseAuditStore | None = None
|
||||
|
||||
|
||||
def get_audit_store(database_url: str | None = None) -> BaseAuditStore:
|
||||
global _audit_store
|
||||
if _audit_store is not None:
|
||||
return _audit_store
|
||||
if database_url or os.getenv("DATABASE_URL"):
|
||||
_audit_store = PostgresAuditStore(database_url or os.getenv("DATABASE_URL", ""))
|
||||
else:
|
||||
_audit_store = NullAuditStore()
|
||||
return _audit_store
|
||||
|
||||
|
||||
def reset_audit_store() -> None:
|
||||
global _audit_store
|
||||
_audit_store = None
|
||||
Reference in New Issue
Block a user