feat(roundtable): taskId 会商记录独立存储(不分权) + 第三步生成过程对话/步骤条入库

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>
This commit is contained in:
fengxiangdebaoziandClaude Opus 4.8 committed 2026-06-18 15:11:50 +08:00
1 parent 500a562bb6
commit a8da6c2632
29 files changed
+1191 -263

No files matched your search

+2 -1
View File
@@ -245,7 +245,8 @@ FastAPI application on port 8001 with health check at `GET /health`. Set `GATEWA
| **Runs** (`/api/runs`) | `POST /stream` - stateless run + SSE; `POST /wait` - stateless run + block; `GET /{rid}/messages` - paginated messages by run_id `{data, has_more}` (cursor: `after_seq`/`before_seq`); `GET /{rid}/feedback` - list feedback by run_id |
| **Thread Shares** (`/api/thread-shares`) | Per-conversation sharing with two modes (`thread_shares.mode`). **`import`**: `POST /` `{thread_id, mode}` - create (or reuse) a revocable share code; `GET /{code}/preview` + `POST /{code}/import` - copy that conversation into the caller's account (fresh `thread_id` via `app/gateway/thread_copy.py` + new `threads_meta` row + `user-data` copy; dedup on `metadata.shared_origin`). **`view`**: a public, read-only static page ? see Public Shares below. Both modes: `GET /` - list my codes; `DELETE /{code}` - revoke. |
| **Public Shares** (`/api/public/shares`) | **Unauthenticated** (the `/api/public/` prefix is whitelisted in `auth_middleware._PUBLIC_PATH_PREFIXES`). `GET /{code}` - read-only conversation snapshot (title + serialized messages + artifacts) for a `view`-mode share; messages are read straight from the latest checkpoint. `GET /{code}/files/{path}` - serves a file referenced by that conversation (images, Markdown, text, PDF, ?) so the shared page's links are openable; path resolution is confined to the owner's thread directory. Active content (`text/html`, `application/xhtml+xml`, `image/svg+xml`) is forced to download (`_public_share_disposition`); everything else is served inline. Missing/revoked/non-`view` codes all return 404. |
| **Roundtable Drafts** (`/api/roundtable-drafts`) | Per-user persistence for the roundtable-planning page (replaces the old browser `localStorage`). `GET /` - list drafts (lightweight meta); `POST /` - create; `GET/PUT/DELETE /{id}` - full read / partial update / delete. **External-task binding (`task_id`)**: drafts carry an optional `task_id` (deep-link / 无界 embed); task-bound drafts are **shared** (the store ignores `user_id` for them, so a task's drafts span users). `GET /by-task/{task_id}/latest` - newest draft for a task (回显最新一条); `GET /by-task/{task_id}` - **all** drafts for a task, newest-first (taskId-mode history dropdown: 一个 taskId 多条记录), enriched with the latest background-job status per draft via `RoundtableJobRepository.status_map_by_drafts`. A draft = one full session (Step 1 intent + Step 2 roundtable), step snapshots stored as JSON in `PortableLongText`. Recommendation history bound to a draft: `GET /{id}/recommendations` - list newest-first; `POST /{id}/recommendations` - append one run (objective/status/rationale/picks/candidates). Backed by `deerflow.persistence.roundtable_drafts` (tables `roundtable_drafts`, `roundtable_recommend_history`); store wired in `deps.py` as `app.state.roundtable_draft_store`. Tests: `tests/test_roundtable_drafts_by_task.py`. |
| **Roundtable Drafts** (`/api/roundtable-drafts`) | **Strictly per-user** persistence for the roundtable-planning page (replaces the old browser `localStorage`). `GET /` - list drafts (lightweight meta); `POST /` - create; `GET/PUT/DELETE /{id}` - full read / partial update / delete (all owner-scoped). A draft = one full session (Step 1 intent + Step 2 roundtable), step snapshots stored as JSON in `PortableLongText`. Recommendation history bound to a draft: `GET /{id}/recommendations` - list newest-first; `POST /{id}/recommendations` - append one run (objective/status/rationale/picks/candidates). taskId 深链会商记录 are **not** here — they live in the separate `/api/roundtable-task-drafts` store (see below) so personal history never mixes with task records. Backed by `deerflow.persistence.roundtable_drafts` (tables `roundtable_drafts`, `roundtable_recommend_history`); store wired in `deps.py` as `app.state.roundtable_draft_store`. Tests: `tests/test_roundtable_task_drafts.py`. |
| **Roundtable Task Drafts** (`/api/roundtable-task-drafts`) | **Task-scoped, unpartitioned** store for taskId-deeplink roundtable 聊天记录 (无界嵌入抽屉). Keyed **only by `task_id`** (one task → many records), **never partitioned by user** — any authenticated caller may read/write/delete a task's records (`created_by` is audit-only). Physically separate from `roundtable_drafts` so the two never mix. `GET /by-task/{task_id}` - all drafts for a task, newest-first (history dropdown), enriched with the latest background-job status per draft via `RoundtableJobRepository.status_map_by_drafts`; `GET /by-task/{task_id}/latest` - newest draft (回显最新一条); `POST /` - create (`task_id` required); `GET/PUT/DELETE /{id}` - full read / partial update / delete (all user-agnostic). Backed by `deerflow.persistence.roundtable_task_drafts` (table `roundtable_task_drafts`, auto-created by `create_all`; migration `20260618_01`); store wired in `deps.py` as `app.state.roundtable_task_draft_store`. Existing `task_id`-bearing `roundtable_drafts` rows are migrated over by `scripts/migrate_roundtable_task_drafts.py`. Tests: `tests/test_roundtable_task_drafts.py`, `tests/test_roundtable_drafts_by_task.py`. |
| **Roundtable Draft Shares** (`/api/roundtable-draft-shares`) | Per-draft sharing for the roundtable-planning page, mirroring Thread Shares but the shared resource is a `roundtable_drafts` row. Two modes (`roundtable_draft_shares.mode`). **`import`**: `POST /` `{draft_id, mode}` - create (or reuse) a revocable code; `GET /{code}/preview` + `POST /{code}/import` - copy that draft (step1/2/3) into the caller's account under a deterministic per-(code,recipient) id (`imp_<sha1>` ? re-import is a no-op). **`view`**: a public, read-only result page ? see Public Roundtable Shares. Both: `GET /` - list my codes; `DELETE /{code}` - revoke. Backed by `deerflow.persistence.roundtable_draft_shares` (table `roundtable_draft_shares`, migration `20260606_01`); store wired in `deps.py` as `app.state.roundtable_draft_share_store`. Tests: `tests/test_roundtable_draft_shares.py`. |
| **Public Roundtable Shares** (`/api/public/roundtable-shares`) | **Unauthenticated** (`/api/public/` whitelisted). `GET /{code}` - read-only snapshot for a `view`-mode draft share: returns the Step 3??????report HTML (`step3.html`, a self-contained document) + title/summary/`has_report`. The frontend renders it in a sandboxed `iframe` (no `allow-scripts`) at `#/roundtable-share/<code>`. Missing/revoked/non-`view` codes all return 404. |
| **Scheduled Tasks** (`/api/scheduled-tasks`) | Per-user cron-like agent tasks. `GET/POST /` - list/create owned tasks; `PATCH/DELETE /{id}` - update/delete (owner); `POST /{id}/{pause,resume,trigger}`; `GET /{id}/runs`, `GET /runs/{rid}`, run-file preview/edit/download; `GET /runs/{rid}/messages` - agent messages for the run's underlying agent run (used to inspect a stuck/running run; authorized via `_load_run`); `GET /runs/{rid}/html` - generated HTML document for an `html_page` run; `DELETE /runs/{rid}` - owner-scoped, with an admin fallback so admins can delete any user's run; publish/subscribe under `/{id}/{publish,unpublish,subscribe}` and `GET /published`. **Admin (cross-user):** `GET /admin/all` - every task; `PATCH/DELETE /admin/{id}` - edit/delete any task; `POST /admin/{id}/trigger`; `GET /admin/{id}/runs`. Admin routes require `system_role == "admin"`. |
@@ -63,6 +63,7 @@ from app.gateway.routers import (
roundtable_draft_shares,
roundtable_drafts,
roundtable_jobs,
roundtable_task_drafts,
runs,
scheduled_tasks,
sensitive_words,
@@ -1334,6 +1335,9 @@ This gateway provides custom endpoints for models, MCP configuration, skills, an
# Roundtable-planning drafts + recommendation history at /api/roundtable-drafts
app.include_router(roundtable_drafts.router)
# Task-scoped roundtable drafts (taskId 深链聊天记录,独立存、不分权) at /api/roundtable-task-drafts
app.include_router(roundtable_task_drafts.router)
# Step3 流程图结构化抽取 + 校验 (SSE) at /api/flow-extract
app.include_router(flow_extract.router)
@@ -223,6 +223,11 @@ async def langgraph_runtime(app: FastAPI) -> AsyncGenerator[None, None]:
app.state.roundtable_draft_store = make_roundtable_draft_store(sf)
# Task-scoped roundtable drafts (taskId 深链聊天记录,独立存、不按 user 分权)。
from deerflow.persistence.roundtable_task_drafts import make_roundtable_task_draft_store
app.state.roundtable_task_draft_store = make_roundtable_task_draft_store(sf)
from deerflow.persistence.roundtable_draft_shares import make_roundtable_draft_share_store
app.state.roundtable_draft_share_store = make_roundtable_draft_share_store(sf)
@@ -302,6 +307,8 @@ async def langgraph_runtime(app: FastAPI) -> AsyncGenerator[None, None]:
app.state.roundtable_job_store,
gateway_factory=gateway_factory,
draft_store=getattr(app.state, "roundtable_draft_store", None),
# task 作业把最终报告写回**独立的** task-draft 存储(不分权)。
task_draft_store=getattr(app.state, "roundtable_task_draft_store", None),
)
else:
app.state.roundtable_job_executor = None
@@ -168,6 +168,9 @@ class StartParams:
coordinator_name: str = "roundtable-coordinator"
# 关联草稿:作业完成后把 step3 报告写回该草稿,使「查看报告」可用。
draft_id: str | None = None
# 外部任务 id(taskId 深链会商)。非空 = task 作业:draft_id 指向独立的
# roundtable_task_drafts 表,研讨/报告写回 task-draft 存储(不分权)。
task_id: str | None = None
# 是否为「续跑」(resume 澄清)。首启=False → 真网关建全新线程(不复用前端线程,
# 避免与前端本地研讨的活跃 run 撞 409);续跑=True → 复用作业自己的线程。
is_resume: bool = False
@@ -192,13 +195,19 @@ GatewayFactory = Callable[[StartParams], object]
class RoundtableJobExecutor:
def __init__(self, store, *, gateway_factory: GatewayFactory, draft_store=None) -> None:
def __init__(self, store, *, gateway_factory: GatewayFactory, draft_store=None, task_draft_store=None) -> None:
self._store = store
self._gateway_factory = gateway_factory
# 草稿仓储(可选):作业完成后把 step3 写回草稿,供前端「查看报告」。
self._draft_store = draft_store
# task 草稿仓储(独立、不分权):task 作业(params.task_id 非空)写回这里而非个人草稿。
self._task_draft_store = task_draft_store
self._tasks: dict[str, asyncio.Task] = {}
def _draft_store_for(self, params: StartParams):
"""task 作业 → 独立 task-draft 存储;普通作业 → 个人草稿存储。"""
return self._task_draft_store if params.task_id else self._draft_store
def start_job(self, params: StartParams) -> bool:
"""启动一个后台编排任务。同一 job 已在跑则忽略(幂等)。返回是否新启动。"""
if params.job_id in self._tasks and not self._tasks[params.job_id].done():
@@ -238,7 +247,7 @@ class RoundtableJobExecutor:
self._store,
job_id=params.job_id,
agents=params.agents,
on_dialogue=_on_dialogue if (self._draft_store and params.draft_id) else None,
on_dialogue=_on_dialogue if (self._draft_store_for(params) and params.draft_id) else None,
)
result = await run_orchestration(
gateway=gateway,
@@ -294,7 +303,8 @@ class RoundtableJobExecutor:
读现有 step2 → 按 run_id=``job-<jobId>`` upsert(保留其它手动 run)→ 设为 activeRun
→ update_draft。前端加载草稿即可像手动跑一样 hydrate 出对话。
"""
if self._draft_store is None or not params.draft_id:
draft_store = self._draft_store_for(params)
if draft_store is None or not params.draft_id:
return
idx_by_agent = {a.agent_id: i for i, a in enumerate(params.agents)}
s2_dialogues = [_to_step2_dialogue(d, idx_by_agent) for d in dialogues]
@@ -303,7 +313,7 @@ class RoundtableJobExecutor:
)
run_id = f"job-{params.job_id}"
try:
draft = await self._draft_store.get_draft(params.draft_id, params.user_id)
draft = await draft_store.get_draft(params.draft_id, params.user_id)
except Exception: # noqa: BLE001
draft = None
step2 = dict((draft or {}).get("step2") or {})
@@ -352,7 +362,7 @@ class RoundtableJobExecutor:
if has_report:
update_kwargs["step3"] = effective_step3
try:
await self._draft_store.update_draft(params.draft_id, params.user_id, **update_kwargs)
await draft_store.update_draft(params.draft_id, params.user_id, **update_kwargs)
except Exception: # noqa: BLE001 — 写草稿失败不影响作业本身
logger.warning("write run to draft %s failed", params.draft_id, exc_info=True)
@@ -4,6 +4,10 @@ A draft is one full roundtable session (Step 1 intent + Step 2 multi-agent
roundtable). Bound to the requesting user (not the browser), so it follows the
account across devices/sessions — replacing the old ``localStorage`` storage.
This store is **strictly per-user**. taskId 深链聊天记录 (无界嵌入抽屉) live in a
separate, unpartitioned store — see ``/api/roundtable-task-drafts``
(``roundtable_task_drafts`` table) — so the two never mix.
Recommendation history is bound to a draft: the recommend dialog shows "last
recommendation for this session" on open, while still letting the user
re-analyze (which appends a new history row).
@@ -181,45 +185,6 @@ async def create_draft(request: Request, body: DraftCreateRequest) -> DraftRespo
return DraftResponse(**row)
@router.get("/by-task/{task_id}/latest", response_model=DraftResponse)
async def get_latest_draft_by_task(request: Request, task_id: str) -> DraftResponse:
"""按外部任务 id 取最新一条草稿(**不按 user 分权**);无则 404。
无界嵌入抽屉打开时调用:若该任务已有聊天记录,回显最新一条。
"""
store = _get_store(request)
row = await store.get_latest_draft_by_task(task_id)
if row is None:
raise HTTPException(status_code=404, detail="No draft for this task")
return DraftResponse(**row)
@router.get("/by-task/{task_id}", response_model=DraftListResponse)
async def list_drafts_by_task(request: Request, task_id: str) -> DraftListResponse:
"""按外部任务 id 列出该任务全部草稿(轻量 meta,newest first,**不按 user 分权**)。
taskId 深链模式下历史下拉用:一个 taskId 可有多条会商记录;同 `list_drafts`
一样用最近后台作业状态富化(job store 缺失/失败时静默退化为无状态)。
"""
store = _get_store(request)
rows = await store.list_drafts_by_task(task_id)
job_store = getattr(request.app.state, "roundtable_job_store", None)
if job_store is not None and rows:
try:
status_map = await job_store.status_map_by_drafts([r.get("id") for r in rows])
except AttributeError:
status_map = {}
except Exception: # noqa: BLE001 — 富化失败不能拖垮列表
logger.warning("roundtable draft by-task list: job status enrichment failed", exc_info=True)
status_map = {}
for r in rows:
info = status_map.get(r.get("id"))
if info:
r["status"] = info.get("status")
r["job_id"] = info.get("jobId")
return DraftListResponse(drafts=[DraftMetaResponse(**r) for r in rows])
@router.get("/{draft_id}", response_model=DraftResponse)
async def get_draft(request: Request, draft_id: str) -> DraftResponse:
store = _get_store(request)
@@ -55,6 +55,9 @@ class JobAgent(BaseModel):
class StartJobRequest(BaseModel):
draftId: str | None = Field(default=None, max_length=64)
# 外部任务 id(taskId 深链会商)。非空 = task 作业:按 task_id 共享、不按 user 分权,
# 其 draft_id 指向独立的 roundtable_task_drafts 表(最终报告写回那里)。
taskId: str | None = Field(default=None, max_length=128)
intent: str = ""
agents: list[JobAgent] = Field(default_factory=list)
model: str | None = None
@@ -191,8 +194,10 @@ async def start_job(request: Request, body: StartJobRequest) -> RoundtableJobRes
# 时直接返回它、不再新建。前端的「手动挂起按钮 / 离开页面自动挂起 / beforeunload 刷新
# 兜底」可能对同一研讨多次触发本端点 —— 客户端去重只能挡住同页内的重复,跨触发源 /
# 跨标签页的并发只能靠这里兜住,否则同一研讨会被双跑。
task_id = (body.taskId or "").strip() or None
if body.draftId:
existing = await store.get_by_draft(body.draftId, user_id=user_id)
# task 作业按 task_id 去重(跨用户共享);个人作业按 user 去重。
existing = await store.get_by_draft(body.draftId, user_id=user_id, task_id=task_id)
if existing is not None and (existing.get("status") or "") not in _TERMINAL:
return _to_response(existing)
@@ -202,6 +207,7 @@ async def start_job(request: Request, body: StartJobRequest) -> RoundtableJobRes
id=job_id,
draft_id=body.draftId,
user_id=user_id,
task_id=task_id,
orchestration_mode=body.orchestrationMode,
coordinator_name=body.coordinatorName,
thread_ids=body.threadIds,
@@ -223,6 +229,7 @@ async def start_job(request: Request, body: StartJobRequest) -> RoundtableJobRes
thread_ids=body.threadIds,
coordinator_name=body.coordinatorName,
draft_id=body.draftId,
task_id=task_id,
chain=body.chain,
orchestration_plan=body.orchestrationPlan,
seat_thinking_enabled=body.thinking_enabled,
@@ -234,26 +241,30 @@ async def start_job(request: Request, body: StartJobRequest) -> RoundtableJobRes
@router.get("", response_model=RoundtableJobResponse | None)
async def get_job_by_draft(request: Request, draft_id: str) -> RoundtableJobResponse | None:
async def get_job_by_draft(request: Request, draft_id: str, task_id: str | None = None) -> RoundtableJobResponse | None:
# task_id 非空 = task 作业查询(按 task 共享、不分权);否则按 user 分权。
store = _get_store(request)
tid = (task_id or "").strip() or None
user_id = _current_user_id(request)
row = await store.get_by_draft(draft_id, user_id=user_id)
row = await store.get_by_draft(draft_id, user_id=user_id, task_id=tid)
return _to_response(row) if row is not None else None
@router.get("/{job_id}", response_model=RoundtableJobResponse)
async def get_job(request: Request, job_id: str) -> RoundtableJobResponse:
async def get_job(request: Request, job_id: str, task_id: str | None = None) -> RoundtableJobResponse:
store = _get_store(request)
tid = (task_id or "").strip() or None
user_id = _current_user_id(request)
row = await store.get(job_id, user_id=user_id)
row = await store.get(job_id, user_id=user_id, task_id=tid)
if row is None:
raise HTTPException(status_code=404, detail="Job not found")
return _to_response(row)
@router.get("/{job_id}/stream")
async def stream_job(request: Request, job_id: str) -> StreamingResponse:
async def stream_job(request: Request, job_id: str, task_id: str | None = None) -> StreamingResponse:
store = _get_store(request)
tid = (task_id or "").strip() or None
user_id = _current_user_id(request)
def _frame(payload: dict[str, Any]) -> str:
@@ -263,7 +274,7 @@ async def stream_job(request: Request, job_id: str) -> StreamingResponse:
for _ in range(_MAX_STREAM_TICKS):
if await request.is_disconnected():
return
row = await store.get(job_id, user_id=user_id)
row = await store.get(job_id, user_id=user_id, task_id=tid)
if row is None:
yield _frame({"event": "error", "detail": "Job not found"})
return
@@ -280,12 +291,15 @@ async def stream_job(request: Request, job_id: str) -> StreamingResponse:
@router.post("/{job_id}/resume", response_model=RoundtableJobResponse)
async def resume_job(request: Request, job_id: str, body: ResumeJobRequest) -> RoundtableJobResponse:
async def resume_job(
request: Request, job_id: str, body: ResumeJobRequest, task_id: str | None = None
) -> RoundtableJobResponse:
store = _get_store(request)
executor = _get_executor(request)
tid = (task_id or "").strip() or None
user_id = _current_user_id(request)
row = await store.get(job_id, user_id=user_id)
row = await store.get(job_id, user_id=user_id, task_id=tid)
if row is None:
raise HTTPException(status_code=404, detail="Job not found")
if (row.get("status") or "") != "awaiting_input":
@@ -295,14 +309,18 @@ async def resume_job(request: Request, job_id: str, body: ResumeJobRequest) -> R
if not answer:
raise HTTPException(status_code=400, detail="answer is required")
# task 作业不分权:放开写入归属校验(user_id=None);并以**原作业所有者**身份续跑,
# 保证编排上下文 / 写回 task-draft 用一致的 user 上下文。
write_user_id = None if tid else user_id
run_user_id = row.get("user_id") or user_id
updated = await store.update_progress(
job_id, user_id=user_id, status="running", pending_clarification=None
job_id, user_id=write_user_id, status="running", pending_clarification=None
)
executor.start_job(
StartParams(
job_id=job_id,
user_id=user_id,
user_id=run_user_id,
agents=_seat_refs_from_nodes(row.get("dispatch_chain")),
seed_message=_RESUME_PREFIX + answer,
model=None,
@@ -311,6 +329,7 @@ async def resume_job(request: Request, job_id: str, body: ResumeJobRequest) -> R
thread_ids=row.get("thread_ids"),
coordinator_name=row.get("coordinator_name") or "roundtable-coordinator",
draft_id=row.get("draft_id"),
task_id=tid or row.get("task_id"),
is_resume=True,
chain=row.get("chain"),
orchestration_plan=row.get("orchestration_plan"),
@@ -359,15 +378,17 @@ async def admin_cleanup(request: Request, body: CleanupRequest) -> CleanupRespon
@router.post("/{job_id}/cancel", response_model=RoundtableJobResponse)
async def cancel_job(request: Request, job_id: str) -> RoundtableJobResponse:
async def cancel_job(request: Request, job_id: str, task_id: str | None = None) -> RoundtableJobResponse:
store = _get_store(request)
executor = _get_executor(request)
tid = (task_id or "").strip() or None
user_id = _current_user_id(request)
row = await store.get(job_id, user_id=user_id)
row = await store.get(job_id, user_id=user_id, task_id=tid)
if row is None:
raise HTTPException(status_code=404, detail="Job not found")
executor.cancel(job_id)
updated = await store.update_progress(job_id, user_id=user_id, status="cancelled")
# task 作业不分权:放开写入归属校验。
updated = await store.update_progress(job_id, user_id=(None if tid else user_id), status="cancelled")
return _to_response(updated or row)
@@ -0,0 +1,187 @@
"""CRUD API for **task-scoped** roundtable-planning drafts (聊天记录).
This is the dedicated store for roundtable sessions opened via a taskId deep-link
(无界嵌入抽屉). It is physically and semantically separate from the per-user
``/api/roundtable-drafts`` store:
* records are keyed **only by ``task_id``** (one task → many records);
* there is **no user 分权** — any authenticated caller may read/write/delete a
task's records (the deep-link audience is shared); ``created_by`` is recorded
for audit only.
Routes (prefix ``/api/roundtable-task-drafts``):
GET "/by-task/{task_id}" list all drafts for a task (lightweight)
GET "/by-task/{task_id}/latest" newest draft for a task (full)
POST "" create (``task_id`` required)
GET "/{draft_id}" full draft (incl. step1/step2/step3)
PUT "/{draft_id}" partial update
DELETE "/{draft_id}" delete
"""
from __future__ import annotations
import logging
from datetime import datetime
from typing import Any
from uuid import uuid4
from fastapi import APIRouter, HTTPException, Request
from pydantic import BaseModel, Field
from deerflow.runtime.user_context import get_effective_user_id
logger = logging.getLogger(__name__)
router = APIRouter(prefix="/api/roundtable-task-drafts", tags=["roundtable-task-drafts"])
# ── schemas ────────────────────────────────────────────────────────────────
class TaskDraftMetaResponse(BaseModel):
id: str
task_id: str
title: str = ""
furthest_step: int = 1
created_at: datetime | str | None = None
updated_at: datetime | str | None = None
# Latest background-job status for this draft (history-dropdown loading badge).
status: str | None = None
job_id: str | None = None
class TaskDraftListResponse(BaseModel):
drafts: list[TaskDraftMetaResponse]
class TaskDraftResponse(TaskDraftMetaResponse):
step1: dict[str, Any] | None = None
step2: dict[str, Any] | None = None
step3: dict[str, Any] | None = None
class TaskDraftCreateRequest(BaseModel):
id: str | None = Field(default=None, max_length=64)
task_id: str = Field(max_length=128)
title: str = Field(default="", max_length=512)
furthest_step: int = Field(default=1, ge=1, le=3)
step1: dict[str, Any] | None = None
step2: dict[str, Any] | None = None
step3: dict[str, Any] | None = None
class TaskDraftUpdateRequest(BaseModel):
title: str | None = Field(default=None, max_length=512)
furthest_step: int | None = Field(default=None, ge=1, le=3)
step1: dict[str, Any] | None = None
step2: dict[str, Any] | None = None
step3: dict[str, Any] | None = None
# ── helpers ──────────────────────────────────────────────────────────────
def _current_user_id(request: Request) -> str:
user = getattr(request.state, "user", None)
if user is not None:
return str(user.id)
return get_effective_user_id()
def _get_store(request: Request):
store = getattr(request.app.state, "roundtable_task_draft_store", None)
if store is None:
raise HTTPException(status_code=503, detail="Roundtable task draft store not available")
return store
async def _enrich_status(request: Request, rows: list[dict[str, Any]]) -> None:
"""Attach the latest background-job status/jobId per draft (best-effort).
Uses the job store's draft-id keyed lookup (no user filter) — a task's drafts
span users. Failure or a missing job store silently degrades to no status.
"""
job_store = getattr(request.app.state, "roundtable_job_store", None)
if job_store is None or not rows:
return
try:
status_map = await job_store.status_map_by_drafts([r.get("id") for r in rows])
except AttributeError:
status_map = {}
except Exception: # noqa: BLE001 — 富化失败不能拖垮列表
logger.warning("roundtable task draft list: job status enrichment failed", exc_info=True)
status_map = {}
for r in rows:
info = status_map.get(r.get("id"))
if info:
r["status"] = info.get("status")
r["job_id"] = info.get("jobId")
# ── routes ───────────────────────────────────────────────────────────────
@router.get("/by-task/{task_id}", response_model=TaskDraftListResponse)
async def list_drafts_by_task(request: Request, task_id: str) -> TaskDraftListResponse:
"""All drafts for a task, newest-first (一个 taskId 多条记录,不分权)。"""
store = _get_store(request)
rows = await store.list_drafts_by_task(task_id)
await _enrich_status(request, rows)
return TaskDraftListResponse(drafts=[TaskDraftMetaResponse(**r) for r in rows])
@router.get("/by-task/{task_id}/latest", response_model=TaskDraftResponse)
async def get_latest_draft_by_task(request: Request, task_id: str) -> TaskDraftResponse:
"""Newest draft for a task; 404 if none. 回显最新一条聊天记录用。"""
store = _get_store(request)
row = await store.get_latest_draft_by_task(task_id)
if row is None:
raise HTTPException(status_code=404, detail="No draft for this task")
return TaskDraftResponse(**row)
@router.post("", response_model=TaskDraftResponse, status_code=201)
async def create_draft(request: Request, body: TaskDraftCreateRequest) -> TaskDraftResponse:
store = _get_store(request)
task_id = (body.task_id or "").strip()
if not task_id:
raise HTTPException(status_code=400, detail="task_id is required")
row = await store.create_draft(
{
"id": (body.id or uuid4().hex),
"task_id": task_id,
"title": body.title.strip(),
"furthest_step": body.furthest_step,
"step1": body.step1,
"step2": body.step2,
"step3": body.step3,
},
created_by=_current_user_id(request),
)
return TaskDraftResponse(**row)
@router.get("/{draft_id}", response_model=TaskDraftResponse)
async def get_draft(request: Request, draft_id: str) -> TaskDraftResponse:
store = _get_store(request)
row = await store.get_draft(draft_id)
if row is None:
raise HTTPException(status_code=404, detail="Draft not found")
return TaskDraftResponse(**row)
@router.put("/{draft_id}", response_model=TaskDraftResponse)
async def update_draft(request: Request, draft_id: str, body: TaskDraftUpdateRequest) -> TaskDraftResponse:
store = _get_store(request)
fields = body.model_dump(exclude_unset=True)
row = await store.update_draft(draft_id, **fields)
if row is None:
raise HTTPException(status_code=404, detail="Draft not found")
return TaskDraftResponse(**row)
@router.delete("/{draft_id}", status_code=204)
async def delete_draft(request: Request, draft_id: str) -> None:
store = _get_store(request)
deleted = await store.delete_draft(draft_id)
if not deleted:
raise HTTPException(status_code=404, detail="Draft not found")
@@ -0,0 +1,79 @@
"""Separate, unpartitioned storage for taskId-deeplink roundtable 聊天记录.
Two changes:
1. New table ``roundtable_task_drafts`` — the dedicated store for roundtable
sessions opened via a taskId deep-link (无界嵌入抽屉). Keyed **only by
``task_id``** (one task → many records), never partitioned by user
(``created_by`` is audit-only). Physically separate from ``roundtable_drafts``
so personal history and task records never mix. (On a brand-new DB the table
is created by ``create_all``; this revision patches existing DBs.)
2. ``roundtable_jobs.task_id`` column — marks a background job as task-scoped so
its progress/dialogues are shared by task (read 不分权) and its final report is
written back to the ``roundtable_task_drafts`` store.
The matching data move (existing ``roundtable_drafts`` rows with a ``task_id`` →
``roundtable_task_drafts``) is a one-off, run via
``scripts/migrate_roundtable_task_drafts.py`` (alembic auto-upgrade is disabled at
runtime — see ``persistence/engine.py``).
Revision ID: 20260618_01
Revises: 20260617_01
Create Date: 2026-06-18
"""
from __future__ import annotations
import sqlalchemy as sa
from alembic import op
from sqlalchemy import inspect
revision = "20260618_01"
down_revision = "20260617_01"
branch_labels = None
depends_on = None
def _has_table(table_name: str) -> bool:
inspector = inspect(op.get_bind())
return table_name in inspector.get_table_names()
def _has_column(table_name: str, column_name: str) -> bool:
if not _has_table(table_name):
return False
inspector = inspect(op.get_bind())
return any(col["name"] == column_name for col in inspector.get_columns(table_name))
def upgrade() -> None:
if not _has_table("roundtable_task_drafts"):
op.create_table(
"roundtable_task_drafts",
sa.Column("id", sa.String(64), primary_key=True),
sa.Column("task_id", sa.String(128), nullable=False),
sa.Column("created_by", sa.String(64), nullable=True),
sa.Column("title", sa.String(512), nullable=False, server_default=""),
sa.Column("furthest_step", sa.Integer, nullable=False, server_default="1"),
sa.Column("step1", sa.Text().with_variant(sa.dialects.mysql.LONGTEXT(), "mysql"), nullable=True),
sa.Column("step2", sa.Text().with_variant(sa.dialects.mysql.LONGTEXT(), "mysql"), nullable=True),
sa.Column("step3", sa.Text().with_variant(sa.dialects.mysql.LONGTEXT(), "mysql"), nullable=True),
sa.Column("created_at", sa.DateTime(), nullable=False),
sa.Column("updated_at", sa.DateTime(), nullable=False),
)
op.create_index("ix_roundtable_task_drafts_task_id", "roundtable_task_drafts", ["task_id"])
if _has_table("roundtable_jobs") and not _has_column("roundtable_jobs", "task_id"):
op.add_column("roundtable_jobs", sa.Column("task_id", sa.String(128), nullable=True))
op.create_index("ix_roundtable_jobs_task_id", "roundtable_jobs", ["task_id"])
def downgrade() -> None:
if _has_column("roundtable_jobs", "task_id"):
op.drop_index("ix_roundtable_jobs_task_id", table_name="roundtable_jobs")
op.drop_column("roundtable_jobs", "task_id")
if _has_table("roundtable_task_drafts"):
op.drop_index("ix_roundtable_task_drafts_task_id", table_name="roundtable_task_drafts")
op.drop_table("roundtable_task_drafts")
@@ -54,6 +54,7 @@ from deerflow.persistence.roundtable_drafts.model import (
RoundtableRecommendHistoryRow,
)
from deerflow.persistence.roundtable_jobs.model import RoundtableJobRow
from deerflow.persistence.roundtable_task_drafts.model import RoundtableTaskDraftRow
from deerflow.persistence.run.model import RunRow
from deerflow.persistence.sensitive_words.model import SensitiveWordRow
from deerflow.persistence.scheduled_tasks.model import (
@@ -106,6 +107,7 @@ __all__ = [
"RoundtableDraftShareRow",
"RoundtableJobRow",
"RoundtableRecommendHistoryRow",
"RoundtableTaskDraftRow",
"RunEventRow",
"RunRow",
"ScheduledTaskDeliveryProfileRow",
@@ -82,39 +82,12 @@ class RoundtableDraftRepository:
async def get_draft(self, draft_id: str, user_id: str) -> dict[str, Any] | None:
async with self._sf() as session:
row = await session.get(RoundtableDraftRow, draft_id)
# task 绑定的草稿共享:放开 user 归属校验(不分权);非 task 草稿仍按 user 隔离。
if row is None or (row.user_id != user_id and not row.task_id):
# 个人草稿严格按 user 隔离。taskId 深链聊天记录已迁出到独立的
# ``roundtable_task_drafts`` 表(不分权),不再走这里。
if row is None or row.user_id != user_id:
return None
return self._draft_to_dict(row)
async def get_latest_draft_by_task(self, task_id: str) -> dict[str, Any] | None:
"""按外部任务 id 取最新一条草稿(**忽略 user_id**,不分权)。无则 None。"""
stmt = (
select(RoundtableDraftRow)
.where(RoundtableDraftRow.task_id == task_id)
.order_by(RoundtableDraftRow.updated_at.desc())
.limit(1)
)
async with self._sf() as session:
result = await session.execute(stmt)
row = result.scalars().first()
return self._draft_to_dict(row) if row is not None else None
async def list_drafts_by_task(self, task_id: str, *, limit: int = 100) -> list[dict[str, Any]]:
"""按外部任务 id 列出全部草稿(轻量 meta,newest first,**忽略 user_id** 不分权)。
taskId 深链模式下历史下拉用:一个 taskId 可有多条会商记录。
"""
stmt = (
select(RoundtableDraftRow)
.where(RoundtableDraftRow.task_id == task_id)
.order_by(RoundtableDraftRow.updated_at.desc())
.limit(limit)
)
async with self._sf() as session:
result = await session.execute(stmt)
return [self._draft_to_meta(row) for row in result.scalars()]
async def create_draft(self, user_id: str, data: dict[str, Any]) -> dict[str, Any]:
now = datetime.now(UTC)
row = RoundtableDraftRow(
@@ -149,8 +122,8 @@ class RoundtableDraftRepository:
) -> dict[str, Any] | None:
async with self._sf() as session:
row = await session.get(RoundtableDraftRow, draft_id)
# task 绑定的草稿共享:放开 user 归属校验(不分权)。
if row is None or (row.user_id != user_id and not row.task_id):
# 个人草稿严格按 user 隔离(task 聊天记录已迁出到独立存储)。
if row is None or row.user_id != user_id:
return None
if task_id is not _UNSET and task_id is not None:
row.task_id = str(task_id)
@@ -172,8 +145,8 @@ class RoundtableDraftRepository:
async def delete_draft(self, draft_id: str, user_id: str) -> bool:
async with self._sf() as session:
row = await session.get(RoundtableDraftRow, draft_id)
# task 绑定的草稿共享:放开 user 归属校验(不分权)。
if row is None or (row.user_id != user_id and not row.task_id):
# 个人草稿严格按 user 隔离(task 聊天记录已迁出到独立存储)。
if row is None or row.user_id != user_id:
return False
await session.delete(row)
await session.commit()
@@ -33,6 +33,10 @@ class RoundtableJobRow(Base):
# The draft/session this job runs for. Indexed for "active job of draft" lookups.
draft_id: Mapped[str | None] = mapped_column(String(64), nullable=True, index=True)
user_id: Mapped[str | None] = mapped_column(String(64), nullable=True, index=True)
# 外部任务 id(taskId 深链会商)。非空 = 这是一条 task 作业:读取按 task_id 共享、
# **不按 user 分权**(任何人打开同一 task 都能看在跑的研讨);其 draft_id 指向独立的
# ``roundtable_task_drafts`` 表。为空 = 普通个人作业(按 user 分权)。
task_id: Mapped[str | None] = mapped_column(String(128), nullable=True, index=True)
# Job status machine (§2.1): queued / running / awaiting_input / done / error / cancelled.
status: Mapped[str] = mapped_column(String(32), nullable=False, default="queued", index=True)
# Fine-grained phase (§2.2): initializing / leader_thinking / dispatching /
@@ -67,6 +67,7 @@ class RoundtableJobRepository:
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,
@@ -82,6 +83,7 @@ class RoundtableJobRepository:
id=id,
draft_id=draft_id,
user_id=resolved_user_id,
task_id=(task_id or None),
status=status,
phase=phase,
cycle=0,
@@ -167,7 +169,16 @@ class RoundtableJobRepository:
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)
@@ -182,12 +193,20 @@ class RoundtableJobRepository:
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)."""
resolved_user_id = resolve_user_id(user_id, method_name="RoundtableJobRepository.get_by_draft")
"""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 resolved_user_id is not None:
stmt = stmt.where(RoundtableJobRow.user_id == resolved_user_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)
@@ -0,0 +1,18 @@
"""Task-scoped roundtable-draft persistence (separate, unpartitioned store)."""
from __future__ import annotations
from deerflow.persistence.roundtable_task_drafts.model import RoundtableTaskDraftRow
from deerflow.persistence.roundtable_task_drafts.sql import RoundtableTaskDraftRepository
__all__ = [
"RoundtableTaskDraftRepository",
"RoundtableTaskDraftRow",
"make_roundtable_task_draft_store",
]
def make_roundtable_task_draft_store(session_factory):
if session_factory is None:
return None
return RoundtableTaskDraftRepository(session_factory)
@@ -0,0 +1,52 @@
"""ORM model for **task-scoped** roundtable-planning drafts.
This is the dedicated, separate store for roundtable 聊天记录 opened through a
taskId deep-link (无界嵌入抽屉). Unlike :mod:`roundtable_drafts` (per-login-user
isolation), task drafts are keyed **purely by ``task_id``** and are **never
partitioned by user** — one ``task_id`` may have many records, all shared across
whoever opens that task. ``created_by`` is audit-only (never used for filtering).
Kept physically separate from ``roundtable_drafts`` so the two never mix: a
user's personal history (``GET /api/roundtable-drafts``) holds only their own
drafts, and task records live entirely here.
``step1`` / ``step2`` / ``step3`` are JSON serialized into ``PortableLongText``
(MySQL ``LONGTEXT``) — the Step 2 transcript / Step 3 report HTML easily exceed
MySQL's 64 KB ``TEXT`` cap — mirroring ``roundtable_drafts``.
"""
from __future__ import annotations
from datetime import UTC, datetime
from sqlalchemy import Integer, String
from sqlalchemy.orm import Mapped, mapped_column
from deerflow.persistence.base import Base
from deerflow.persistence.types import BeijingDateTime, PortableLongText
class RoundtableTaskDraftRow(Base):
__tablename__ = "roundtable_task_drafts"
id: Mapped[str] = mapped_column(String(64), primary_key=True)
# 外部任务 id(无界嵌入抽屉传入)。这是唯一的归属维度:所有读/写/删只按它过滤,
# 一个 task_id 可有多条记录、跨用户共享。必填、建索引。
task_id: Mapped[str] = mapped_column(String(128), nullable=False, index=True)
# 仅审计:建档时的登录用户。绝不参与任何过滤/鉴权(task 记录不分权)。
created_by: Mapped[str | None] = mapped_column(String(64), nullable=True)
# Auto-derived task summary (objective → first user message → timestamp).
title: Mapped[str] = mapped_column(String(512), nullable=False, default="")
# Furthest step reached when this snapshot was taken (1 | 2 | 3).
furthest_step: Mapped[int] = mapped_column(Integer, nullable=False, default=1)
# JSON blobs matching the frontend Step1Snapshot / Step2Snapshot / Step3 shapes.
step1: Mapped[str | None] = mapped_column(PortableLongText, nullable=True) # JSON object
step2: Mapped[str | None] = mapped_column(PortableLongText, nullable=True) # JSON object
step3: Mapped[str | None] = mapped_column(PortableLongText, nullable=True) # JSON object
created_at: Mapped[datetime] = mapped_column(BeijingDateTime(), nullable=False, default=lambda: datetime.now(UTC))
updated_at: Mapped[datetime] = mapped_column(
BeijingDateTime(),
nullable=False,
default=lambda: datetime.now(UTC),
onupdate=lambda: datetime.now(UTC),
)
@@ -0,0 +1,166 @@
"""SQLAlchemy-backed **task-scoped** roundtable-draft store.
Mirrors :mod:`roundtable_drafts` but every read/write/delete is keyed **only by
``task_id`` / row id — never by ``user_id``** (task records are shared, not
partitioned by user). ``created_by`` is stored for audit but never filtered on.
``get_draft`` / ``update_draft`` keep a ``user_id`` positional purely for
signature-compatibility with :class:`RoundtableDraftRepository` (so the job
executor can call either store uniformly); the value is ignored here.
JSON columns (``step1`` / ``step2`` / ``step3``) are stored as serialized strings
in ``PortableLongText`` and round-tripped with ``json.dumps`` / ``json.loads``.
"""
from __future__ import annotations
import json
from datetime import UTC, datetime
from typing import Any
from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
from deerflow.persistence.roundtable_task_drafts.model import RoundtableTaskDraftRow
_UNSET = object()
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 RoundtableTaskDraftRepository:
def __init__(self, session_factory: async_sessionmaker[AsyncSession]) -> None:
self._sf = session_factory
@staticmethod
def _to_meta(row: RoundtableTaskDraftRow) -> dict[str, Any]:
"""Lightweight projection for the history dropdown (no big blobs)."""
return {
"id": row.id,
"task_id": row.task_id,
"title": row.title,
"furthest_step": row.furthest_step,
"created_at": row.created_at.isoformat() if isinstance(row.created_at, datetime) else row.created_at,
"updated_at": row.updated_at.isoformat() if isinstance(row.updated_at, datetime) else row.updated_at,
}
@classmethod
def _to_dict(cls, row: RoundtableTaskDraftRow) -> dict[str, Any]:
d = cls._to_meta(row)
d["step1"] = _loads(row.step1)
d["step2"] = _loads(row.step2)
d["step3"] = _loads(row.step3)
return d
# ── reads (all keyed by task_id / id only) ───────────────────────────────
async def list_drafts_by_task(self, task_id: str, *, limit: int = 100) -> list[dict[str, Any]]:
"""All drafts for a task (lightweight meta, newest first). 不按 user 分权。"""
stmt = (
select(RoundtableTaskDraftRow)
.where(RoundtableTaskDraftRow.task_id == task_id)
.order_by(RoundtableTaskDraftRow.updated_at.desc())
.limit(limit)
)
async with self._sf() as session:
result = await session.execute(stmt)
return [self._to_meta(row) for row in result.scalars()]
async def get_latest_draft_by_task(self, task_id: str) -> dict[str, Any] | None:
"""Newest draft for a task (full), or None."""
stmt = (
select(RoundtableTaskDraftRow)
.where(RoundtableTaskDraftRow.task_id == task_id)
.order_by(RoundtableTaskDraftRow.updated_at.desc())
.limit(1)
)
async with self._sf() as session:
result = await session.execute(stmt)
row = result.scalars().first()
return self._to_dict(row) if row is not None else None
async def get_draft(self, draft_id: str, user_id: str | None = None) -> dict[str, Any] | None:
"""Full draft by id. ``user_id`` is ignored (signature-compat only)."""
async with self._sf() as session:
row = await session.get(RoundtableTaskDraftRow, draft_id)
return self._to_dict(row) if row is not None else None
# ── writes ───────────────────────────────────────────────────────────────
async def create_draft(self, data: dict[str, Any], *, created_by: str | None = None) -> dict[str, Any]:
task_id = (data.get("task_id") or "").strip()
if not task_id:
raise ValueError("task_id is required for a task draft")
now = datetime.now(UTC)
row = RoundtableTaskDraftRow(
id=data["id"],
task_id=task_id,
created_by=(created_by or None),
title=(data.get("title") or "").strip(),
furthest_step=int(data.get("furthest_step") or 1),
step1=_dumps(data.get("step1")),
step2=_dumps(data.get("step2")),
step3=_dumps(data.get("step3")),
created_at=now,
updated_at=now,
)
async with self._sf() as session:
session.add(row)
await session.commit()
await session.refresh(row)
return self._to_dict(row)
async def update_draft(
self,
draft_id: str,
user_id: str | None = None,
*,
title=_UNSET,
furthest_step=_UNSET,
step1=_UNSET,
step2=_UNSET,
step3=_UNSET,
) -> dict[str, Any] | None:
"""Partial update by id. ``user_id`` is ignored (signature-compat only)."""
async with self._sf() as session:
row = await session.get(RoundtableTaskDraftRow, draft_id)
if row is None:
return None
if title is not _UNSET and title is not None:
row.title = str(title).strip()
if furthest_step is not _UNSET and furthest_step is not None:
row.furthest_step = int(furthest_step)
if step1 is not _UNSET:
row.step1 = _dumps(step1)
if step2 is not _UNSET:
row.step2 = _dumps(step2)
if step3 is not _UNSET:
row.step3 = _dumps(step3)
row.updated_at = datetime.now(UTC)
await session.commit()
await session.refresh(row)
return self._to_dict(row)
async def delete_draft(self, draft_id: str) -> bool:
async with self._sf() as session:
row = await session.get(RoundtableTaskDraftRow, draft_id)
if row is None:
return False
await session.delete(row)
await session.commit()
return True
@@ -0,0 +1,127 @@
"""一次性迁移:把已有的 taskId 会商记录从个人草稿表搬进独立的 task 存储。
背景
====
早期 taskId 深链会商记录混存在按用户分权的 ``roundtable_drafts`` 表里(带一个
``task_id`` 列 + 放开归属校验)。现在 taskId 聊天记录有了独立、不分权的存储
``roundtable_task_drafts``(只按 ``task_id`` 区分,跨用户共享)。本脚本把历史数据搬过去:
1. ``roundtable_drafts`` 中 ``task_id`` 非空的每一行 → 在 ``roundtable_task_drafts``
建同 id 的记录(``created_by`` = 原 ``user_id``,审计用);
2. 这些草稿对应的 ``roundtable_jobs`` 行(``draft_id`` 匹配且 ``task_id`` 为空)补上
``task_id``,使其转为「task 作业」(按 task 共享);
3. 从 ``roundtable_drafts`` 删除已迁走的行,使个人历史不再混入 task 记录。
幂等:目标表已存在同 id 记录则跳过;可重复运行。alembic 自动升级在运行时是关闭的
(见 ``persistence/engine.py``),所以这步数据搬迁用本脚本手动执行。
用法(在 backend 目录)
======================
::
# 预览(不写盘)
PYTHONPATH=. uv run python scripts/migrate_roundtable_task_drafts.py --dry-run
# 执行
PYTHONPATH=. uv run python scripts/migrate_roundtable_task_drafts.py
"""
from __future__ import annotations
import argparse
import asyncio
import logging
import sys
logging.basicConfig(level=logging.INFO, format="%(message)s")
logger = logging.getLogger("migrate_roundtable_task_drafts")
async def _run(dry_run: bool) -> int:
from sqlalchemy import select, update
from deerflow.config import get_app_config
from deerflow.persistence.engine import close_engine, get_session_factory, init_engine_from_config
from deerflow.persistence.roundtable_drafts.model import RoundtableDraftRow
from deerflow.persistence.roundtable_jobs.model import RoundtableJobRow
from deerflow.persistence.roundtable_task_drafts.model import RoundtableTaskDraftRow
config = get_app_config()
await init_engine_from_config(config.database)
sf = get_session_factory()
moved = 0
skipped = 0
jobs_tagged = 0
try:
async with sf() as session:
rows = (
await session.execute(
select(RoundtableDraftRow).where(RoundtableDraftRow.task_id.is_not(None))
)
).scalars().all()
logger.info("发现 %d 条带 task_id 的个人草稿待迁移。", len(rows))
for row in rows:
# 幂等:目标已存在同 id → 跳过(仍尝试给作业补 task_id + 删源行)。
exists = await session.get(RoundtableTaskDraftRow, row.id)
if exists is None:
if not dry_run:
session.add(
RoundtableTaskDraftRow(
id=row.id,
task_id=row.task_id,
created_by=row.user_id,
title=row.title or "",
furthest_step=row.furthest_step or 1,
step1=row.step1,
step2=row.step2,
step3=row.step3,
created_at=row.created_at,
updated_at=row.updated_at,
)
)
moved += 1
logger.info(" 迁移 draft %s (task_id=%s)", row.id, row.task_id)
else:
skipped += 1
logger.info(" 跳过 draft %s (目标已存在)", row.id)
# 关联后台作业补 task_id(未标记的才动)。
if not dry_run:
res = await session.execute(
update(RoundtableJobRow)
.where(RoundtableJobRow.draft_id == row.id)
.where(RoundtableJobRow.task_id.is_(None))
.values(task_id=row.task_id)
)
jobs_tagged += int(res.rowcount or 0)
# 删除源行(task 记录不再留在个人表)。
if not dry_run:
await session.delete(row)
if not dry_run:
await session.commit()
logger.info(
"完成%s:迁移 %d 条,跳过 %d 条,关联作业打标 %d 条。",
"(dry-run,未写盘)" if dry_run else "",
moved,
skipped,
jobs_tagged,
)
return 0
finally:
await close_engine()
def main() -> int:
parser = argparse.ArgumentParser(description="迁移 taskId 会商记录到独立 task 存储")
parser.add_argument("--dry-run", action="store_true", help="只预览,不写盘")
args = parser.parse_args()
return asyncio.run(_run(args.dry_run))
if __name__ == "__main__":
sys.exit(main())
@@ -105,6 +105,13 @@ CALL _add_column_if_missing('scheduled_task_subscriptions', 'position_id', 'VARC
-- (knowledge_folders / knowledge_extract_templates 为【新表】,由 create_all 自动建,无需在此补列。)
CALL _add_column_if_missing('knowledge_notes', 'folder', 'VARCHAR(512) NULL DEFAULT NULL');
-- ---- taskId 深链会商独立存储,对应 migration 20260618_01 ----------------------
-- roundtable_task_drafts 是【新表】(taskId 聊天记录,只按 task_id 不分权),由 create_all
-- 自动建,无需补列。以下给【已存在的】roundtable_jobs 补 task_id 列:
-- task_id: 非空 = task 作业(按 task 共享、不按 user 分权,报告写回 roundtable_task_drafts)。
-- ORM: RoundtableJobRow.task_id = String(128), nullable, indexed。
CALL _add_column_if_missing('roundtable_jobs', 'task_id', 'VARCHAR(128) NULL DEFAULT NULL');
-- ---- 清理临时存储过程 --------------------------------------------------------
DROP PROCEDURE IF EXISTS _add_column_if_missing;
@@ -136,11 +143,26 @@ PREPARE stmt FROM @idx_ddl;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
-- ---- roundtable_jobs.task_id 索引(幂等) -------------------------------------
SET @idx_exists = (
SELECT COUNT(*) FROM information_schema.statistics
WHERE table_schema = DATABASE()
AND table_name = 'roundtable_jobs'
AND index_name = 'ix_roundtable_jobs_task_id'
);
SET @idx_ddl = IF(@idx_exists = 0,
'CREATE INDEX `ix_roundtable_jobs_task_id` ON `roundtable_jobs` (`task_id`)',
'SELECT ''SKIPPED ix_roundtable_jobs_task_id (already exists)'' AS result');
PREPARE stmt FROM @idx_ddl;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
-- ---- 执行后自检:确认本批次涉及的列都已存在 ---------------------------------
SELECT table_name, column_name
FROM information_schema.columns
WHERE table_schema = DATABASE()
AND ((table_name = 'skills' AND column_name IN ('name_zh', 'detail', 'square_id', 'always_on'))
OR (table_name = 'agents' AND column_name IN ('square_id'))
OR (table_name = 'roundtable_drafts' AND column_name = 'task_id'))
OR (table_name = 'roundtable_drafts' AND column_name = 'task_id')
OR (table_name = 'roundtable_jobs' AND column_name = 'task_id'))
ORDER BY table_name, column_name;