mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-07-09 16:08:31 +00:00
* feat: add scheduled tasks MVP
* fix: harden scheduled task execution semantics
* feat(scheduled-tasks): preset-driven schedule form with timezone and live preview
Replace the raw cron input with a preset Select (hourly/daily/weekly/monthly/custom)
plus structured inputs (time picker, weekday toggles, day-of-month), datetime-local
for one-time tasks, a timezone selector defaulting to the browser timezone, and a
live human-readable preview. Reuses one ScheduledTaskScheduleInput for create and
edit; backend contract unchanged; zero new deps (pure Intl + DST-safe offset helpers).
* feat(scheduled-tasks): full-page i18n + recipe templates + E2E locale pin
Localize the rest of the scheduled-tasks page (filters, detail pane, actions,
edit form, run list, enum values) via t.scheduledTasks.* in en/zh. Add four
built-in recipe templates (GitHub Trending, news digest, issue triage, weekly
report) exposed as a chip row that pre-fills title + prompt + schedule. Pin
Playwright locale to en-US so E2E selectors stay stable against i18n. No backend
change, no new deps.
* fix(scheduled-tasks): idempotent 0003 migration, update head constants, future-date once test
Merge with main surfaced three CI failures:
- 0003_scheduled_tasks create_table collided with legacy test seeds that
build from full metadata; guard with inspector.has_table so the revision
no-ops when the table already exists (0004/0005 are already idempotent via
_helpers.py).
- persistence bootstrap concurrency/regression tests pinned HEAD to main's
0002_runs_token_usage; bump to the new head 0005_scheduled_task_thread_nullable.
- once-task router test used a fixed past run_at and tripped the
must-be-in-the-future validation; use a future date.
* address review: ok-check, 502 for trigger failure, mock fields, migration filename, doc fences
- fetchThreadScheduledTasks now checks response.ok like the other fetchers.
- trigger endpoint returns 502 (not 409) when dispatch fails outright, so
clients can distinguish a real conflict from a server-side failure.
- E2E mock normalizes scheduled-task objects with context_mode/last_thread_id
and nullable thread_id, matching the backend contract the UI renders against.
- Rename 0002_scheduled_tasks.py -> 0003_scheduled_tasks.py to match its
revision id (file was renamed in spirit already; filename now follows).
- CONFIGURATION.md: close the Tool Groups yaml fence and drop the stray fence
after the Scheduler notes so the sections render correctly.
* fix(scheduled-tasks): harden lease, poller, config, and frontend UX after review
* fix(scheduled-tasks): harden run lifecycle, overlap skip, non_interactive gating, and DST conversion after review
- defer a once task's terminal status to the run-completion hook; the task
stays running until the real outcome, and a startup sweep cancels once
tasks orphaned by a crash (launch-time 'completed' could stick forever)
- record interrupted runs as a distinct 'interrupted' run status with a
readable message; an interrupted once task ends 'cancelled', not 'failed'
- enforce overlap_policy=skip for fresh_thread_per_run via an active-run
pre-check (same-thread ConflictError can never fire across fresh threads)
- protect terminal run statuses from the late launch-path 'running' write
- honor context.non_interactive only for internally-authenticated callers;
arbitrary clients can no longer strip ask_clarification
- fix DST-stale timezone offset in zonedLocalToUtcIso by re-deriving the
offset at the resolved instant (once tasks fired an hour late around
spring-forward and the create->edit round-trip diverged)
- drop dead ScheduledTaskRunRepository.update_by_run_id; share one Gateway
API error helper between channels and scheduled-tasks frontends
* fix(scheduled-tasks): close review round-3 gaps in guards, concurrency, and API ergonomics
- scrub internal-only context keys (non_interactive) from the assembled run
config for non-internal callers: gating body.context alone left the same
key smuggle-able through the free-form body.config copied verbatim by
build_run_config
- guard update_after_launch with protect_terminal so the launch bookkeeping
write cannot clobber a once task already finalized by a fast-failing run's
completion hook (parent-row sibling of the run-row guard)
- reject a manual trigger while the task has an active run (409) instead of
launching a duplicate concurrent run on fresh_thread_per_run
- re-arm a terminal once task to enabled when PATCH pushes run_at into the
future; previously the endpoint returned 200 with a next_run_at that could
never be claimed
- make max_concurrent_runs a real global cap: each poll claims only into the
remaining budget of active (queued/running) scheduled runs
- paginate GET /scheduled-tasks/{id}/runs (limit<=200, offset) and push the
thread filter of /threads/{id}/scheduled-tasks into SQL
- stamp context.user_id on scheduler-launched runs, matching IM channels, so
user-scoped guardrail providers see the owning user
---------
Co-authored-by: Willem Jiang <willem.jiang@gmail.com>
150 lines
5.2 KiB
Python
150 lines
5.2 KiB
Python
"""Concurrency safety tests for ``bootstrap_schema``.
|
|
|
|
The contract: N concurrent callers against the same DB always converge to
|
|
``alembic_version == head`` without exceptions and without duplicate schema
|
|
mutations.
|
|
|
|
We model concurrency at the *async-task* level here (multiple coroutines
|
|
inside one process). SQLite is single-node by deployment, so within-process
|
|
serialisation -- which is what the per-engine ``_SQLITE_LOCKS`` entry
|
|
provides -- is the realistic boundary. Cross-process serialisation falls
|
|
through to SQLite's own write lock + ``PRAGMA busy_timeout`` plus the
|
|
idempotent revision helpers.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
import sqlalchemy as sa
|
|
from sqlalchemy.ext.asyncio import create_async_engine
|
|
|
|
import deerflow.persistence.models # noqa: F401
|
|
from deerflow.persistence import bootstrap as bootstrap_mod
|
|
from deerflow.persistence.bootstrap import bootstrap_schema
|
|
|
|
pytestmark = pytest.mark.asyncio
|
|
|
|
|
|
HEAD = "0003_scheduled_tasks"
|
|
|
|
|
|
def _url(tmp_path: Path) -> str:
|
|
return f"sqlite+aiosqlite:///{(tmp_path / 'concurrent.db').as_posix()}"
|
|
|
|
|
|
async def _alembic_version(engine) -> str | None:
|
|
async with engine.connect() as conn:
|
|
row = await conn.execute(sa.text("SELECT version_num FROM alembic_version"))
|
|
return row.scalar()
|
|
|
|
|
|
async def _runs_columns(engine) -> set[str]:
|
|
async with engine.connect() as conn:
|
|
return await conn.run_sync(lambda c: {col["name"] for col in sa.inspect(c).get_columns("runs")})
|
|
|
|
|
|
async def test_two_concurrent_bootstrap_callers_converge(tmp_path: Path) -> None:
|
|
engine = create_async_engine(_url(tmp_path))
|
|
try:
|
|
await asyncio.gather(
|
|
bootstrap_schema(engine, backend="sqlite"),
|
|
bootstrap_schema(engine, backend="sqlite"),
|
|
)
|
|
assert await _alembic_version(engine) == HEAD
|
|
assert "token_usage_by_model" in await _runs_columns(engine)
|
|
finally:
|
|
await engine.dispose()
|
|
|
|
|
|
async def test_five_concurrent_bootstrap_callers_converge(tmp_path: Path) -> None:
|
|
engine = create_async_engine(_url(tmp_path))
|
|
try:
|
|
await asyncio.gather(*(bootstrap_schema(engine, backend="sqlite") for _ in range(5)))
|
|
assert await _alembic_version(engine) == HEAD
|
|
finally:
|
|
await engine.dispose()
|
|
|
|
|
|
async def test_cancelled_caller_does_not_block_others(tmp_path: Path) -> None:
|
|
"""Cancelling one task mid-bootstrap must not strand the lock or the DB.
|
|
|
|
After the cancel, a subsequent ``bootstrap_schema`` call must still reach
|
|
head.
|
|
"""
|
|
engine = create_async_engine(_url(tmp_path))
|
|
try:
|
|
task = asyncio.create_task(bootstrap_schema(engine, backend="sqlite"))
|
|
# Give the event loop a turn so the task can start; then cancel.
|
|
await asyncio.sleep(0)
|
|
task.cancel()
|
|
# Cancelled task may have raced past the lock; swallow either outcome.
|
|
try:
|
|
await task
|
|
except (asyncio.CancelledError, Exception): # noqa: BLE001
|
|
pass
|
|
|
|
# Lock must be free for the next caller.
|
|
await bootstrap_schema(engine, backend="sqlite")
|
|
assert await _alembic_version(engine) == HEAD
|
|
finally:
|
|
await engine.dispose()
|
|
|
|
|
|
async def test_late_caller_after_head_is_noop(monkeypatch, tmp_path: Path) -> None:
|
|
"""When the first caller leaves the DB at head, the second observes
|
|
'versioned' and skips create_all / stamp -- it only runs upgrade head,
|
|
which is alembic-no-op.
|
|
|
|
We use a monkeypatched ``_upgrade`` counter to assert the second caller's
|
|
upgrade ran but did no real work (no new revision applied).
|
|
"""
|
|
engine = create_async_engine(_url(tmp_path))
|
|
try:
|
|
# First caller: empty branch.
|
|
await bootstrap_schema(engine, backend="sqlite")
|
|
first_version = await _alembic_version(engine)
|
|
assert first_version == HEAD
|
|
|
|
upgrade_calls: list[str] = []
|
|
original_upgrade = bootstrap_mod._upgrade
|
|
|
|
def counting_upgrade(cfg, rev: str) -> None:
|
|
upgrade_calls.append(rev)
|
|
original_upgrade(cfg, rev)
|
|
|
|
monkeypatch.setattr(bootstrap_mod, "_upgrade", counting_upgrade)
|
|
|
|
# Second caller: versioned branch -> calls _upgrade('head').
|
|
await bootstrap_schema(engine, backend="sqlite")
|
|
assert upgrade_calls == ["head"]
|
|
assert await _alembic_version(engine) == HEAD
|
|
finally:
|
|
await engine.dispose()
|
|
|
|
|
|
async def test_slow_upgrade_does_not_corrupt_concurrent_state(monkeypatch, tmp_path: Path) -> None:
|
|
"""Inject a delay into the upgrade path; concurrent callers must still
|
|
converge to head with no exceptions."""
|
|
engine = create_async_engine(_url(tmp_path))
|
|
try:
|
|
original_upgrade = bootstrap_mod._upgrade
|
|
|
|
def slow_upgrade(cfg, rev: str) -> None:
|
|
import time # noqa: PLC0415
|
|
|
|
time.sleep(0.2)
|
|
original_upgrade(cfg, rev)
|
|
|
|
monkeypatch.setattr(bootstrap_mod, "_upgrade", slow_upgrade)
|
|
|
|
await asyncio.gather(
|
|
bootstrap_schema(engine, backend="sqlite"),
|
|
bootstrap_schema(engine, backend="sqlite"),
|
|
bootstrap_schema(engine, backend="sqlite"),
|
|
)
|
|
assert await _alembic_version(engine) == HEAD
|
|
finally:
|
|
await engine.dispose()
|