b597d715c8
后端: - 修复 get_current_user 未校验 is_active,被封禁用户仍可用旧 Token - auth.py 捕获 ValueError 转 HTTPException(验证码错误、账号被封、Token 无效等不再返回 500) - 修正 SMS 每日上限注释(3次 → 10次) - 修复迁移脚本外键引用错误:users.id → mjk_users.id - 新建积分系统 4 张表的迁移(mjk_user_points/batches/transactions/recharge_orders) - pyproject.toml 补充 alembic + psycopg2-binary 依赖 - ruff 格式修复(import 排序等) 前端: - 修复 doRefreshToken 成功后不持久化新 Token 的严重 bug - 修复应用重启后 SSE 不自动重连(收不到踢人通知) - 修复 App.tsx handleLogout 未 await - client.ts 统一从 utils/env 导入 isTauri,默认 base URL 兜底 localhost:8000 - 清理 ~20 个未使用的 hooks/utils/api 模块/组件导出 - 修复所有 ESLint 警告(206 → 0)和 TSC 错误 - 测试通过(5/5) 其他: - 更新 requirements.lock 和 uv.lock
145 lines
5.1 KiB
Python
145 lines
5.1 KiB
Python
"""
|
|
Script 任务处理器
|
|
================
|
|
|
|
管理脚本生成的执行。
|
|
不占用 Volc 槽位,使用独立的 script 槽位池。
|
|
"""
|
|
|
|
import logging
|
|
from typing import Any
|
|
|
|
from app.ai.prompts.loader import _load_system_meta
|
|
from app.core.platform_config import get_platform_config_loader
|
|
from app.scheduler.handlers.base import AsyncHandler
|
|
from app.scheduler.models import StateChange
|
|
from app.scheduler.registry import TaskRegistry
|
|
from app.scheduler.slot_manager import SlotManager
|
|
from app.services.script_service import ScriptService
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def _get_category_name(category: str, subcategory: str) -> str:
|
|
"""从 _meta.json 查找分类中文名称,组合为 title"""
|
|
meta = _load_system_meta()
|
|
for cat in meta.get("categories", []):
|
|
if cat.get("code") == category:
|
|
cat_name = cat.get("name", category)
|
|
for sub in cat.get("subcategories", []):
|
|
if sub.get("code") == subcategory:
|
|
sub_name = sub.get("name", subcategory)
|
|
return f"{cat_name} · {sub_name}"
|
|
return cat_name
|
|
return f"{category}/{subcategory}"
|
|
|
|
SLOT_KEY = "script:slots"
|
|
|
|
|
|
def _get_script_max_slots() -> int:
|
|
"""从 platform-config.yaml 读取 rate_limit 配置作为 max_slots"""
|
|
try:
|
|
loader = get_platform_config_loader()
|
|
platform = loader.get_platform("volcengine_ark")
|
|
if platform:
|
|
# LLM 推理是慢请求,max_slots 不应超过服务器承载能力
|
|
return min(int(platform.rate_limit_qps), 10)
|
|
except Exception:
|
|
pass
|
|
return 10
|
|
|
|
|
|
class ScriptHandler(AsyncHandler):
|
|
name = "script"
|
|
slot_key = SLOT_KEY
|
|
max_slots = _get_script_max_slots()
|
|
|
|
def __init__(self, service: ScriptService | None = None):
|
|
self.service = service
|
|
|
|
def _get_service(self) -> ScriptService:
|
|
if self.service is None:
|
|
raise RuntimeError(
|
|
"ScriptHandler 需要通过构造函数传入 ScriptService 实例"
|
|
)
|
|
return self.service
|
|
|
|
async def tick(
|
|
self, tasks: list[Any], registry: TaskRegistry, slots: SlotManager
|
|
) -> list[StateChange]:
|
|
changes: list[StateChange] = []
|
|
|
|
for task in tasks:
|
|
async with slots.acquire_ctx(SLOT_KEY, task.task_id, self.max_slots) as acquired:
|
|
if not acquired:
|
|
continue
|
|
|
|
try:
|
|
changes.extend(await self._process_task(task, registry, slots))
|
|
except Exception as e:
|
|
logger.exception(f"[Script {task.task_id}] failed")
|
|
changes.append(StateChange(task_id=task.task_id, field_path="status", value="failed"))
|
|
changes.append(
|
|
StateChange(task_id=task.task_id, field_path="error", value=str(e)[:500])
|
|
)
|
|
|
|
return changes
|
|
|
|
async def _process_task(
|
|
self, task: Any, registry: TaskRegistry, slots: SlotManager
|
|
) -> list[StateChange]:
|
|
changes: list[StateChange] = []
|
|
params = task.params or {}
|
|
category = params.get("category", "")
|
|
subcategory = params.get("subcategory", "")
|
|
|
|
await registry.update(
|
|
task.task_id,
|
|
status="running",
|
|
progress=10,
|
|
message="分析需求中...",
|
|
completed=0,
|
|
total=1,
|
|
)
|
|
|
|
try:
|
|
await registry.update(
|
|
task.task_id,
|
|
progress=10,
|
|
message="构思脚本中...",
|
|
)
|
|
|
|
service = self._get_service()
|
|
shots = await service.generate_script(
|
|
category=category,
|
|
subcategory=subcategory,
|
|
)
|
|
|
|
# 计算分镜真实总时长
|
|
total_duration = sum(s.duration for s in shots if s.duration)
|
|
result_data = {
|
|
"title": _get_category_name(category, subcategory),
|
|
"scenes": [s.model_dump() for s in shots],
|
|
"total_duration": total_duration,
|
|
"shot_count": len(shots),
|
|
}
|
|
|
|
changes.append(StateChange(task_id=task.task_id, field_path="status", value="completed"))
|
|
changes.append(StateChange(task_id=task.task_id, field_path="progress", value=100))
|
|
changes.append(
|
|
StateChange(task_id=task.task_id, field_path="message", value="脚本生成完成")
|
|
)
|
|
changes.append(StateChange(task_id=task.task_id, field_path="completed", value=1))
|
|
changes.append(StateChange(task_id=task.task_id, field_path="total", value=1))
|
|
changes.append(StateChange(task_id=task.task_id, field_path="result", value=result_data))
|
|
|
|
except Exception as exc:
|
|
logger.exception(f"[ScriptTask {task.task_id}] Failed")
|
|
changes.append(StateChange(task_id=task.task_id, field_path="status", value="failed"))
|
|
changes.append(
|
|
StateChange(task_id=task.task_id, field_path="message", value=str(exc)[:200])
|
|
)
|
|
changes.append(StateChange(task_id=task.task_id, field_path="error", value=str(exc)[:500]))
|
|
|
|
return changes
|