fengxiangdebaoziandClaude Opus 4.8
a8da6c2632
taskId 深链会商存储独立化： - 新增独立表 roundtable_task_drafts + 路由 /api/roundtable-task-drafts，只按 task_id 归属、完全不按 user 分权（created_by 仅审计），与个人 roundtable_drafts 物理分离； 个人草稿表恢复严格按用户隔离（去掉原 task 放权）。 - 后台研讨作业按 taskId 共享：roundtable_jobs 加 task_id，get/get_by_draft/stream/ resume/cancel 支持 ?task_id= 跨用户读取与控制，作业报告写回 task-draft 存储。 - 前端：新增 api/task-drafts.ts 客户端，useDraftPersistence / useRoundtableDrafts / roundtable-jobs / DispatchChainJobModal / RoundtablePlanningPage 按 taskId 路由读写。 - 迁移 20260618_01 + column_additions_mysql.sql(jobs.task_id) + 数据搬迁脚本 scripts/migrate_roundtable_task_drafts.py（把历史 task_id 行迁出个人表）。 第三步聊天记录像第二步一样存全： - 总结报告 / 经典看板 / 大屏 三条流的生成过程对话（中间文字 + 步骤条 + stub）落库， 加载草稿整段回显，而非只剩最终 md / 流程图 / HTML。DraftStep3Snapshot 扩展 dialogues/seatStubMessages 槽位；存稿走页面 render 期 ref，恢复走各 hook hydrateSaved （旧草稿无字段则回退单条「历史记录」气泡）。 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
334 lines
13 KiB
Python
334 lines
13 KiB
Python
"""SQLAlchemy-backed roundtable background-job storage.
|
|
|
|
JSON columns (``dispatch_chain`` / ``thread_ids`` / ``chain``) are stored as
|
|
serialized strings in ``PortableLongText`` and round-tripped here with
|
|
``json.dumps`` / ``json.loads`` — same approach as ``ai_writing_sessions`` /
|
|
``roundtable_drafts``.
|
|
|
|
User isolation mirrors ``ai_writing_sessions``: methods take ``user_id`` defaulting
|
|
to ``AUTO`` (resolved from the run context) so backend graph nodes can write without
|
|
threading a user id through, while gateway routes pass it explicitly.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from datetime import UTC, datetime
|
|
from typing import Any
|
|
|
|
from sqlalchemy import delete, select
|
|
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
|
|
|
|
from deerflow.persistence.roundtable_jobs.model import RoundtableJobRow
|
|
from deerflow.runtime.user_context import AUTO, _AutoSentinel, resolve_user_id
|
|
|
|
_UNSET = object()
|
|
|
|
# 终态：列表/清理判定用。
|
|
TERMINAL_STATUSES = ("done", "error", "cancelled")
|
|
|
|
|
|
def _loads(value: Any) -> Any:
|
|
if not isinstance(value, str):
|
|
return value
|
|
if not value:
|
|
return None
|
|
try:
|
|
return json.loads(value)
|
|
except Exception:
|
|
return None
|
|
|
|
|
|
def _dumps(value: Any) -> str | None:
|
|
if value is None:
|
|
return None
|
|
return json.dumps(value, ensure_ascii=False)
|
|
|
|
|
|
class RoundtableJobRepository:
|
|
def __init__(self, session_factory: async_sessionmaker[AsyncSession]) -> None:
|
|
self._sf = session_factory
|
|
|
|
@staticmethod
|
|
def _row_to_dict(row: RoundtableJobRow) -> dict[str, Any]:
|
|
d = row.to_dict()
|
|
for k in ("created_at", "updated_at"):
|
|
if isinstance(d.get(k), datetime):
|
|
d[k] = d[k].isoformat()
|
|
for k in ("dispatch_chain", "thread_ids", "chain", "orchestration_plan", "dialogues", "step3"):
|
|
d[k] = _loads(d.get(k))
|
|
return d
|
|
|
|
# ── create ────────────────────────────────────────────────────────────
|
|
|
|
async def create(
|
|
self,
|
|
*,
|
|
id: str,
|
|
draft_id: str | None = None,
|
|
user_id: str | None | _AutoSentinel = AUTO,
|
|
task_id: str | None = None,
|
|
orchestration_mode: str = "recommend",
|
|
coordinator_name: str | None = None,
|
|
thread_ids: dict[str, str] | None = None,
|
|
chain: dict[str, Any] | None = None,
|
|
orchestration_plan: dict[str, Any] | None = None,
|
|
dispatch_chain: list[dict[str, Any]] | None = None,
|
|
status: str = "queued",
|
|
phase: str = "initializing",
|
|
) -> dict[str, Any]:
|
|
resolved_user_id = resolve_user_id(user_id, method_name="RoundtableJobRepository.create")
|
|
now = datetime.now(UTC)
|
|
row = RoundtableJobRow(
|
|
id=id,
|
|
draft_id=draft_id,
|
|
user_id=resolved_user_id,
|
|
task_id=(task_id or None),
|
|
status=status,
|
|
phase=phase,
|
|
cycle=0,
|
|
dispatch_chain=_dumps(dispatch_chain),
|
|
active_agent_id=None,
|
|
consensus_percentage=0,
|
|
pending_clarification=None,
|
|
thread_ids=_dumps(thread_ids),
|
|
coordinator_name=coordinator_name,
|
|
orchestration_mode=orchestration_mode,
|
|
chain=_dumps(chain),
|
|
orchestration_plan=_dumps(orchestration_plan),
|
|
error=None,
|
|
created_at=now,
|
|
updated_at=now,
|
|
)
|
|
async with self._sf() as session:
|
|
session.add(row)
|
|
await session.commit()
|
|
await session.refresh(row)
|
|
return self._row_to_dict(row)
|
|
|
|
# ── update progress ─────────────────────────────────────────────────────
|
|
|
|
async def update_progress(
|
|
self,
|
|
job_id: str,
|
|
*,
|
|
user_id: str | None | _AutoSentinel = AUTO,
|
|
status=_UNSET,
|
|
phase=_UNSET,
|
|
cycle=_UNSET,
|
|
dispatch_chain=_UNSET,
|
|
active_agent_id=_UNSET,
|
|
consensus_percentage=_UNSET,
|
|
pending_clarification=_UNSET,
|
|
thread_ids=_UNSET,
|
|
coordinator_name=_UNSET,
|
|
dialogues=_UNSET,
|
|
step3=_UNSET,
|
|
error=_UNSET,
|
|
) -> dict[str, Any] | None:
|
|
resolved_user_id = resolve_user_id(user_id, method_name="RoundtableJobRepository.update_progress")
|
|
async with self._sf() as session:
|
|
row = await session.get(RoundtableJobRow, job_id)
|
|
if row is None:
|
|
return None
|
|
if resolved_user_id is not None and row.user_id != resolved_user_id:
|
|
return None
|
|
if status is not _UNSET:
|
|
row.status = status
|
|
if phase is not _UNSET:
|
|
row.phase = phase
|
|
if cycle is not _UNSET:
|
|
row.cycle = int(cycle)
|
|
if dispatch_chain is not _UNSET:
|
|
row.dispatch_chain = _dumps(dispatch_chain)
|
|
if active_agent_id is not _UNSET:
|
|
row.active_agent_id = active_agent_id
|
|
if consensus_percentage is not _UNSET:
|
|
row.consensus_percentage = int(consensus_percentage)
|
|
if pending_clarification is not _UNSET:
|
|
row.pending_clarification = pending_clarification
|
|
if thread_ids is not _UNSET:
|
|
row.thread_ids = _dumps(thread_ids)
|
|
if coordinator_name is not _UNSET:
|
|
row.coordinator_name = coordinator_name
|
|
if dialogues is not _UNSET:
|
|
row.dialogues = _dumps(dialogues)
|
|
if step3 is not _UNSET:
|
|
row.step3 = _dumps(step3)
|
|
if error is not _UNSET:
|
|
row.error = error
|
|
row.updated_at = datetime.now(UTC)
|
|
await session.commit()
|
|
await session.refresh(row)
|
|
return self._row_to_dict(row)
|
|
|
|
# ── read ────────────────────────────────────────────────────────────────
|
|
|
|
async def get(
|
|
self,
|
|
job_id: str,
|
|
*,
|
|
user_id: str | None | _AutoSentinel = AUTO,
|
|
task_id: str | None = None,
|
|
) -> dict[str, Any] | None:
|
|
# task 作业按 task_id 共享、**不按 user 分权**：给定 task_id 时只校验作业属于该
|
|
# task（忽略 user_id）。否则走原「按 user 分权」逻辑。
|
|
if task_id is not None:
|
|
async with self._sf() as session:
|
|
row = await session.get(RoundtableJobRow, job_id)
|
|
if row is None or row.task_id != task_id:
|
|
return None
|
|
return self._row_to_dict(row)
|
|
resolved_user_id = resolve_user_id(user_id, method_name="RoundtableJobRepository.get")
|
|
async with self._sf() as session:
|
|
row = await session.get(RoundtableJobRow, job_id)
|
|
if row is None:
|
|
return None
|
|
if resolved_user_id is not None and row.user_id != resolved_user_id:
|
|
return None
|
|
return self._row_to_dict(row)
|
|
|
|
async def get_by_draft(
|
|
self,
|
|
draft_id: str,
|
|
*,
|
|
user_id: str | None | _AutoSentinel = AUTO,
|
|
task_id: str | None = None,
|
|
) -> dict[str, Any] | None:
|
|
"""Return the most-recently-updated job for a draft (or None).
|
|
|
|
``task_id`` set → task 作业查询：按 ``draft_id`` + ``task_id`` 过滤，**不按 user
|
|
分权**（同一 task 的作业跨用户共享）。否则按 user 分权。
|
|
"""
|
|
stmt = select(RoundtableJobRow).where(RoundtableJobRow.draft_id == draft_id)
|
|
if task_id is not None:
|
|
stmt = stmt.where(RoundtableJobRow.task_id == task_id)
|
|
else:
|
|
resolved_user_id = resolve_user_id(user_id, method_name="RoundtableJobRepository.get_by_draft")
|
|
if resolved_user_id is not None:
|
|
stmt = stmt.where(RoundtableJobRow.user_id == resolved_user_id)
|
|
stmt = stmt.order_by(RoundtableJobRow.updated_at.desc()).limit(1)
|
|
async with self._sf() as session:
|
|
result = await session.execute(stmt)
|
|
row = result.scalars().first()
|
|
return self._row_to_dict(row) if row is not None else None
|
|
|
|
async def list_by_user(
|
|
self,
|
|
*,
|
|
user_id: str | None | _AutoSentinel = AUTO,
|
|
limit: int = 50,
|
|
) -> list[dict[str, Any]]:
|
|
resolved_user_id = resolve_user_id(user_id, method_name="RoundtableJobRepository.list_by_user")
|
|
stmt = select(RoundtableJobRow)
|
|
if resolved_user_id is not None:
|
|
stmt = stmt.where(RoundtableJobRow.user_id == resolved_user_id)
|
|
stmt = stmt.order_by(RoundtableJobRow.updated_at.desc()).limit(limit)
|
|
async with self._sf() as session:
|
|
result = await session.execute(stmt)
|
|
return [self._row_to_dict(r) for r in result.scalars()]
|
|
|
|
async def status_map_by_user(
|
|
self,
|
|
user_id: str,
|
|
*,
|
|
limit: int = 200,
|
|
) -> dict[str, dict[str, str]]:
|
|
"""``{draft_id: {"jobId": ..., "status": ...}}`` for the latest job per draft.
|
|
|
|
Drives the history dropdown's per-draft status badge (Phase 6). Walks jobs
|
|
newest-first and keeps the first (latest) one seen for each draft_id.
|
|
"""
|
|
stmt = (
|
|
select(RoundtableJobRow.id, RoundtableJobRow.draft_id, RoundtableJobRow.status)
|
|
.where(RoundtableJobRow.user_id == user_id)
|
|
.where(RoundtableJobRow.draft_id.is_not(None))
|
|
.order_by(RoundtableJobRow.updated_at.desc())
|
|
.limit(limit)
|
|
)
|
|
out: dict[str, dict[str, str]] = {}
|
|
async with self._sf() as session:
|
|
result = await session.execute(stmt)
|
|
for job_id, draft_id, status in result.all():
|
|
if draft_id is None or draft_id in out:
|
|
continue
|
|
out[draft_id] = {"jobId": job_id, "status": status}
|
|
return out
|
|
|
|
async def status_map_by_drafts(
|
|
self,
|
|
draft_ids: list[str],
|
|
*,
|
|
limit: int = 400,
|
|
) -> dict[str, dict[str, str]]:
|
|
"""``{draft_id: {"jobId": ..., "status": ...}}`` for the latest job per draft.
|
|
|
|
Like :meth:`status_map_by_user` but filtered by an explicit draft-id list
|
|
instead of by owner — used by the taskId-mode history dropdown, where a
|
|
task's drafts may span multiple users (task-bound drafts are shared).
|
|
"""
|
|
ids = [d for d in draft_ids if d]
|
|
if not ids:
|
|
return {}
|
|
stmt = (
|
|
select(RoundtableJobRow.id, RoundtableJobRow.draft_id, RoundtableJobRow.status)
|
|
.where(RoundtableJobRow.draft_id.in_(ids))
|
|
.order_by(RoundtableJobRow.updated_at.desc())
|
|
.limit(limit)
|
|
)
|
|
out: dict[str, dict[str, str]] = {}
|
|
async with self._sf() as session:
|
|
result = await session.execute(stmt)
|
|
for job_id, draft_id, status in result.all():
|
|
if draft_id is None or draft_id in out:
|
|
continue
|
|
out[draft_id] = {"jobId": job_id, "status": status}
|
|
return out
|
|
|
|
# ── delete / cleanup ─────────────────────────────────────────────────────
|
|
|
|
async def delete(
|
|
self,
|
|
job_id: str,
|
|
*,
|
|
user_id: str | None | _AutoSentinel = AUTO,
|
|
) -> bool:
|
|
resolved_user_id = resolve_user_id(user_id, method_name="RoundtableJobRepository.delete")
|
|
async with self._sf() as session:
|
|
row = await session.get(RoundtableJobRow, job_id)
|
|
if row is None:
|
|
return False
|
|
if resolved_user_id is not None and row.user_id != resolved_user_id:
|
|
return False
|
|
await session.delete(row)
|
|
await session.commit()
|
|
return True
|
|
|
|
async def list_older_than(
|
|
self,
|
|
cutoff: datetime,
|
|
*,
|
|
only_finished: bool = False,
|
|
limit: int = 500,
|
|
) -> list[str]:
|
|
"""列出 updated_at 早于 cutoff 的作业 id（最多 limit 个），供清理任务用。
|
|
|
|
only_finished=True 时只列终态（done/error/cancelled），避免清掉还在跑的作业。
|
|
"""
|
|
stmt = select(RoundtableJobRow.id).where(RoundtableJobRow.updated_at < cutoff)
|
|
if only_finished:
|
|
stmt = stmt.where(RoundtableJobRow.status.in_(TERMINAL_STATUSES))
|
|
stmt = stmt.order_by(RoundtableJobRow.updated_at.asc()).limit(limit)
|
|
async with self._sf() as session:
|
|
result = await session.execute(stmt)
|
|
return [row[0] for row in result.all()]
|
|
|
|
async def delete_by_ids(self, job_ids: list[str]) -> int:
|
|
if not job_ids:
|
|
return 0
|
|
stmt = delete(RoundtableJobRow).where(RoundtableJobRow.id.in_(job_ids))
|
|
async with self._sf() as session:
|
|
result = await session.execute(stmt)
|
|
await session.commit()
|
|
return int(result.rowcount or 0)
|