Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 52 additions & 15 deletions backend/agents/document.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@

Coordinates classification, summary, concept extraction, and (when
applicable) syllabus extraction, then merges results into the user's
course graph by calling `apply_concepts_to_graph` directly.
course graph via `_step_apply_graph`, a durable step that calls
`apply_concepts_to_graph`.

There is no orchestrator agent here: the graph merge is a deterministic
function call with concept names already produced by the workers, so
Expand All@@ -13,7 +14,8 @@
asyncio.gather.
- Classification runs first because it gates whether syllabus
extraction runs at all.
- The graph update is a direct async function call after workers complete.
- The graph update runs as a durable step (`_step_apply_graph`) after
workers complete, so a DBOS resume does not re-run the merge.

Failure contract (ADR 0024 — this pipeline is the ONLY upload pipeline;
ADR 0001's legacy fallback was retired in #151b):
Expand All@@ -28,12 +30,19 @@
from bare exceptions in logs.

Internal API: the `_step_*` functions defined below are wrapped with
@durable_step and are meant to be called ONLY from `_run_workers`,
which is itself reached only via `process_document` (the
@durable_workflow). Calling a `_step_*` outside the workflow is
undefined behavior under DBOS — depending on version, it may no-op
silently, raise, or warn. Don't import them from routes or other
modules.
@durable_step and are meant to be called ONLY from within the
@durable_workflow-decorated `process_document` — either directly
(`_step_apply_graph`) or via `_run_workers` (the other four). For the
pinned dbos==2.28.0, calling a `_step_*` outside a workflow context is
NOT undefined: `dbos/_core.py::decorate_step`'s wrapper checks
`ctx.is_workflow()` and, when there's no ambient workflow context, falls
straight through to `return func(*args, **kwargs)` — the plain function
runs for real, synchronously, with no DBOS registry lookup and no error
(verified at `dbos/_core.py:2126-2152`). That's well-defined but still
wrong to rely on here: the call would execute but get NONE of DBOS's
checkpoint/resume behavior, silently losing durability for that call.
Don't import them from routes or other modules; call only from
`_run_workers`/`process_document`.
"""

from __future__ import annotations
Expand DownExpand Up@@ -119,6 +128,34 @@ async def _step_syllabus(text: str, deps: SaplingDeps) -> SyllabusAssignments:
return result.output


@durable_step
async def _step_apply_graph(
user_id: str, course_id: str | None, concept_names: list[str],
) -> int:
"""Merge extracted concepts into the graph as a durable step, so a
DBOS resume does not re-run the merge (it's the pipeline's one
real-Supabase side effect besides persistence, which happens outside
process_document entirely — see routes/documents.py).

Calls `apply_concepts_to_graph` by its bare (module-global) name
rather than binding it to a local/default-arg at decoration time —
that matters because a plain global reference inside a function body
is looked up fresh from the function's `__globals__` (this module's
namespace) on EVERY call, not captured once when the function is
defined. That is what lets tests/test_dbos_resume.py's
`document_module.apply_concepts_to_graph = AsyncMock(...)`
monkeypatch take effect here: it reassigns the SAME name in this
module's namespace that this call resolves at call time. (A default
argument like `apply_fn=apply_concepts_to_graph` would instead freeze
in the ORIGINAL function object at decoration time and silently not
observe the monkeypatch.) routes/documents.py's streaming route
imports and calls the same `apply_concepts_to_graph` independently,
inline and non-durable per ADR 0011's streaming-route asymmetry —
a separate binding this monkeypatch doesn't touch, and doesn't need to.
"""
return await apply_concepts_to_graph(user_id, course_id, concept_names)


async def _run_workers(text: str, deps: SaplingDeps) -> _WorkerResults:
"""Run classification first, then fan out the other workers in parallel.

Expand DownExpand Up@@ -152,22 +189,22 @@ async def _run_workers(text: str, deps: SaplingDeps) -> _WorkerResults:

@durable_workflow
async def process_document(text: str, deps: SaplingDeps) -> DocumentProcessingResult:
"""Run workers in parallel, then merge concepts into the graph directly.
"""Run workers in parallel, then merge concepts into the graph via the
durable `_step_apply_graph`.

DocumentProcessingResult is composed deterministically here from worker
outputs. The graph merge is a plain async function call — no orchestrator
agent — because it has no decisions to make beyond passing the
already-extracted concept names through.
outputs. The graph merge has no orchestrator agent — no decisions to
make beyond passing the already-extracted concept names through — but
IS wrapped as a checkpointed step (`_step_apply_graph`) so a DBOS
resume of this workflow doesn't repeat the merge.

Wrapped in `@durable_workflow` from services.durable: a no-op when
DBOS_ENABLED is unset (the default), a real DBOS workflow when the
operator opts in. See ADR 0011 for the activation procedure.
"""
workers = await _run_workers(text, deps)
concept_names = [c.name for c in workers.concepts.concepts]
merged = await apply_concepts_to_graph(
deps.user_id, deps.course_id, concept_names,
)
merged = await _step_apply_graph(deps.user_id, deps.course_id, concept_names)
return DocumentProcessingResult(
classification=workers.classification,
summary=workers.summary,
Expand Down
6 changes: 6 additions & 0 deletions backend/main.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
from services.logfire_scrubber import EXTRA_PATTERNS, scrub_value
from services.request_context import RequestIDMiddleware, current_request_id
from services.storage_service import ALLOWED_CONTENT_TYPES, ensure_bucket_exists
from services.durable import init_dbos, shutdown_dbos

try:
from recost.frameworks.fastapi import RecostMiddleware
Expand DownExpand Up@@ -85,10 +86,15 @@ async def _lifespan(_app: FastAPI):
# usage + event rows flush off the request path.
from services import events_service
events_service.start_worker()
# ADR 0011 / #154: construct + launch DBOS when DBOS_ENABLED=true; no-op
# passthrough otherwise. Fails loudly (raises) if the operator opted in
# and launch fails — see services/durable.py::init_dbos.
init_dbos()
yield
# Stop the drain thread and flush anything still queued so the last batch
# of usage rows isn't lost on shutdown.
events_service.shutdown()
shutdown_dbos()


def _drop_request_arguments(_request, _attributes):
Expand Down
11 changes: 11 additions & 0 deletions backend/requirements-durable.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
# Opt-in durable-execution extra (ADR 0011 / #154).
#
# Installs the `dbos` package so backend/services/durable.py's @workflow /
# @step decorators go real when an operator sets DBOS_ENABLED=true (with
# DBOS_DATABASE_URL pointing at a Postgres instance). Never in
# requirements.txt or requirements.lock: durability is opt-in and the
# default (prod-default and hermetic-test) path must keep working with
# `dbos` NOT installed — see backend/tests/test_durable_shim.py.
#
# Install with: pip install -r requirements-durable.txt
dbos>=2.28,<3
8 changes: 7 additions & 1 deletion backend/routes/documents.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
from services.achievement_service import check_achievements
from services.agent_events import SSE_CACHE_CONTROL, SaplingEvent, sapling_event_to_sse
from services.request_context import current_request_id
from services.durable import workflow_id
from agents import WORKER_LIMITS
from agents._providers import model_mode
from agents.classifier import classifier_agent
Expand DownExpand Up@@ -606,8 +607,13 @@ async def upload_document_sync(
# both branches surface a retry-friendly 502: guardrail trips (budget /
# degenerate output) log at WARNING, anything else is a bug and logs the
# full exception.
# Scope the DBOS workflow id to user_id + request_id, not request_id
# alone: X-Request-ID is client-supplied, so an unscoped id would let
# one user's replay attach to another user's in-flight/completed
# workflow (state poisoning). No-op (nullcontext) when DBOS is off.
try:
result: DocumentProcessingResult = await process_document(extracted_text, deps)
with workflow_id(f"doc:{user_id}:{request_id}"):
result: DocumentProcessingResult = await process_document(extracted_text, deps)
except (UsageLimitExceeded, UnexpectedModelBehavior) as e:
logger.warning(
"Agent guardrails tripped for '%s'; returning 502",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 52 additions & 15 deletions backend/agents/document.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@

Coordinates classification, summary, concept extraction, and (when
applicable) syllabus extraction, then merges results into the user's
course graph by calling `apply_concepts_to_graph` directly.
course graph via `_step_apply_graph`, a durable step that calls
`apply_concepts_to_graph`.

There is no orchestrator agent here: the graph merge is a deterministic
function call with concept names already produced by the workers, so
Expand All@@ -13,7 +14,8 @@
asyncio.gather.
- Classification runs first because it gates whether syllabus
extraction runs at all.
- The graph update is a direct async function call after workers complete.
- The graph update runs as a durable step (`_step_apply_graph`) after
workers complete, so a DBOS resume does not re-run the merge.

Failure contract (ADR 0024 — this pipeline is the ONLY upload pipeline;
ADR 0001's legacy fallback was retired in #151b):
Expand All@@ -28,12 +30,19 @@
from bare exceptions in logs.

Internal API: the `_step_*` functions defined below are wrapped with
@durable_step and are meant to be called ONLY from `_run_workers`,
which is itself reached only via `process_document` (the
@durable_workflow). Calling a `_step_*` outside the workflow is
undefined behavior under DBOS — depending on version, it may no-op
silently, raise, or warn. Don't import them from routes or other
modules.
@durable_step and are meant to be called ONLY from within the
@durable_workflow-decorated `process_document` — either directly
(`_step_apply_graph`) or via `_run_workers` (the other four). For the
pinned dbos==2.28.0, calling a `_step_*` outside a workflow context is
NOT undefined: `dbos/_core.py::decorate_step`'s wrapper checks
`ctx.is_workflow()` and, when there's no ambient workflow context, falls
straight through to `return func(*args, **kwargs)` — the plain function
runs for real, synchronously, with no DBOS registry lookup and no error
(verified at `dbos/_core.py:2126-2152`). That's well-defined but still
wrong to rely on here: the call would execute but get NONE of DBOS's
checkpoint/resume behavior, silently losing durability for that call.
Don't import them from routes or other modules; call only from
`_run_workers`/`process_document`.
"""

from __future__ import annotations
Expand DownExpand Up@@ -119,6 +128,34 @@ async def _step_syllabus(text: str, deps: SaplingDeps) -> SyllabusAssignments:
return result.output


@durable_step
async def _step_apply_graph(
user_id: str, course_id: str | None, concept_names: list[str],
) -> int:
"""Merge extracted concepts into the graph as a durable step, so a
DBOS resume does not re-run the merge (it's the pipeline's one
real-Supabase side effect besides persistence, which happens outside
process_document entirely — see routes/documents.py).

Calls `apply_concepts_to_graph` by its bare (module-global) name
rather than binding it to a local/default-arg at decoration time —
that matters because a plain global reference inside a function body
is looked up fresh from the function's `__globals__` (this module's
namespace) on EVERY call, not captured once when the function is
defined. That is what lets tests/test_dbos_resume.py's
`document_module.apply_concepts_to_graph = AsyncMock(...)`
monkeypatch take effect here: it reassigns the SAME name in this
module's namespace that this call resolves at call time. (A default
argument like `apply_fn=apply_concepts_to_graph` would instead freeze
in the ORIGINAL function object at decoration time and silently not
observe the monkeypatch.) routes/documents.py's streaming route
imports and calls the same `apply_concepts_to_graph` independently,
inline and non-durable per ADR 0011's streaming-route asymmetry —
a separate binding this monkeypatch doesn't touch, and doesn't need to.
"""
return await apply_concepts_to_graph(user_id, course_id, concept_names)


async def _run_workers(text: str, deps: SaplingDeps) -> _WorkerResults:
"""Run classification first, then fan out the other workers in parallel.

Expand DownExpand Up@@ -152,22 +189,22 @@ async def _run_workers(text: str, deps: SaplingDeps) -> _WorkerResults:

@durable_workflow
async def process_document(text: str, deps: SaplingDeps) -> DocumentProcessingResult:
"""Run workers in parallel, then merge concepts into the graph directly.
"""Run workers in parallel, then merge concepts into the graph via the
durable `_step_apply_graph`.

DocumentProcessingResult is composed deterministically here from worker
outputs. The graph merge is a plain async function call — no orchestrator
agent — because it has no decisions to make beyond passing the
already-extracted concept names through.
outputs. The graph merge has no orchestrator agent — no decisions to
make beyond passing the already-extracted concept names through — but
IS wrapped as a checkpointed step (`_step_apply_graph`) so a DBOS
resume of this workflow doesn't repeat the merge.

Wrapped in `@durable_workflow` from services.durable: a no-op when
DBOS_ENABLED is unset (the default), a real DBOS workflow when the
operator opts in. See ADR 0011 for the activation procedure.
"""
workers = await _run_workers(text, deps)
concept_names = [c.name for c in workers.concepts.concepts]
merged = await apply_concepts_to_graph(
deps.user_id, deps.course_id, concept_names,
)
merged = await _step_apply_graph(deps.user_id, deps.course_id, concept_names)
return DocumentProcessingResult(
classification=workers.classification,
summary=workers.summary,
Expand Down
6 changes: 6 additions & 0 deletions backend/main.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
from services.logfire_scrubber import EXTRA_PATTERNS, scrub_value
from services.request_context import RequestIDMiddleware, current_request_id
from services.storage_service import ALLOWED_CONTENT_TYPES, ensure_bucket_exists
from services.durable import init_dbos, shutdown_dbos

try:
from recost.frameworks.fastapi import RecostMiddleware
Expand DownExpand Up@@ -85,10 +86,15 @@ async def _lifespan(_app: FastAPI):
# usage + event rows flush off the request path.
from services import events_service
events_service.start_worker()
# ADR 0011 / #154: construct + launch DBOS when DBOS_ENABLED=true; no-op
# passthrough otherwise. Fails loudly (raises) if the operator opted in
# and launch fails — see services/durable.py::init_dbos.
init_dbos()
yield
# Stop the drain thread and flush anything still queued so the last batch
# of usage rows isn't lost on shutdown.
events_service.shutdown()
shutdown_dbos()


def _drop_request_arguments(_request, _attributes):
Expand Down
11 changes: 11 additions & 0 deletions backend/requirements-durable.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
# Opt-in durable-execution extra (ADR 0011 / #154).
#
# Installs the `dbos` package so backend/services/durable.py's @workflow /
# @step decorators go real when an operator sets DBOS_ENABLED=true (with
# DBOS_DATABASE_URL pointing at a Postgres instance). Never in
# requirements.txt or requirements.lock: durability is opt-in and the
# default (prod-default and hermetic-test) path must keep working with
# `dbos` NOT installed — see backend/tests/test_durable_shim.py.
#
# Install with: pip install -r requirements-durable.txt
dbos>=2.28,<3
8 changes: 7 additions & 1 deletion backend/routes/documents.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
from services.achievement_service import check_achievements
from services.agent_events import SSE_CACHE_CONTROL, SaplingEvent, sapling_event_to_sse
from services.request_context import current_request_id
from services.durable import workflow_id
from agents import WORKER_LIMITS
from agents._providers import model_mode
from agents.classifier import classifier_agent
Expand DownExpand Up@@ -606,8 +607,13 @@ async def upload_document_sync(
# both branches surface a retry-friendly 502: guardrail trips (budget /
# degenerate output) log at WARNING, anything else is a bug and logs the
# full exception.
# Scope the DBOS workflow id to user_id + request_id, not request_id
# alone: X-Request-ID is client-supplied, so an unscoped id would let
# one user's replay attach to another user's in-flight/completed
# workflow (state poisoning). No-op (nullcontext) when DBOS is off.
try:
result: DocumentProcessingResult = await process_document(extracted_text, deps)
with workflow_id(f"doc:{user_id}:{request_id}"):
result: DocumentProcessingResult = await process_document(extracted_text, deps)
except (UsageLimitExceeded, UnexpectedModelBehavior) as e:
logger.warning(
"Agent guardrails tripped for '%s'; returning 502",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 52 additions & 15 deletions backend/agents/document.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@

Coordinates classification, summary, concept extraction, and (when
applicable) syllabus extraction, then merges results into the user's
course graph by calling `apply_concepts_to_graph` directly.
course graph via `_step_apply_graph`, a durable step that calls
`apply_concepts_to_graph`.

There is no orchestrator agent here: the graph merge is a deterministic
function call with concept names already produced by the workers, so
Expand All@@ -13,7 +14,8 @@
asyncio.gather.
- Classification runs first because it gates whether syllabus
extraction runs at all.
- The graph update is a direct async function call after workers complete.
- The graph update runs as a durable step (`_step_apply_graph`) after
workers complete, so a DBOS resume does not re-run the merge.

Failure contract (ADR 0024 — this pipeline is the ONLY upload pipeline;
ADR 0001's legacy fallback was retired in #151b):
Expand All@@ -28,12 +30,19 @@
from bare exceptions in logs.

Internal API: the `_step_*` functions defined below are wrapped with
@durable_step and are meant to be called ONLY from `_run_workers`,
which is itself reached only via `process_document` (the
@durable_workflow). Calling a `_step_*` outside the workflow is
undefined behavior under DBOS — depending on version, it may no-op
silently, raise, or warn. Don't import them from routes or other
modules.
@durable_step and are meant to be called ONLY from within the
@durable_workflow-decorated `process_document` — either directly
(`_step_apply_graph`) or via `_run_workers` (the other four). For the
pinned dbos==2.28.0, calling a `_step_*` outside a workflow context is
NOT undefined: `dbos/_core.py::decorate_step`'s wrapper checks
`ctx.is_workflow()` and, when there's no ambient workflow context, falls
straight through to `return func(*args, **kwargs)` — the plain function
runs for real, synchronously, with no DBOS registry lookup and no error
(verified at `dbos/_core.py:2126-2152`). That's well-defined but still
wrong to rely on here: the call would execute but get NONE of DBOS's
checkpoint/resume behavior, silently losing durability for that call.
Don't import them from routes or other modules; call only from
`_run_workers`/`process_document`.
"""

from __future__ import annotations
Expand DownExpand Up@@ -119,6 +128,34 @@ async def _step_syllabus(text: str, deps: SaplingDeps) -> SyllabusAssignments:
return result.output


@durable_step
async def _step_apply_graph(
user_id: str, course_id: str | None, concept_names: list[str],
) -> int:
"""Merge extracted concepts into the graph as a durable step, so a
DBOS resume does not re-run the merge (it's the pipeline's one
real-Supabase side effect besides persistence, which happens outside
process_document entirely — see routes/documents.py).

Calls `apply_concepts_to_graph` by its bare (module-global) name
rather than binding it to a local/default-arg at decoration time —
that matters because a plain global reference inside a function body
is looked up fresh from the function's `__globals__` (this module's
namespace) on EVERY call, not captured once when the function is
defined. That is what lets tests/test_dbos_resume.py's
`document_module.apply_concepts_to_graph = AsyncMock(...)`
monkeypatch take effect here: it reassigns the SAME name in this
module's namespace that this call resolves at call time. (A default
argument like `apply_fn=apply_concepts_to_graph` would instead freeze
in the ORIGINAL function object at decoration time and silently not
observe the monkeypatch.) routes/documents.py's streaming route
imports and calls the same `apply_concepts_to_graph` independently,
inline and non-durable per ADR 0011's streaming-route asymmetry —
a separate binding this monkeypatch doesn't touch, and doesn't need to.
"""
return await apply_concepts_to_graph(user_id, course_id, concept_names)


async def _run_workers(text: str, deps: SaplingDeps) -> _WorkerResults:
"""Run classification first, then fan out the other workers in parallel.

Expand DownExpand Up@@ -152,22 +189,22 @@ async def _run_workers(text: str, deps: SaplingDeps) -> _WorkerResults:

@durable_workflow
async def process_document(text: str, deps: SaplingDeps) -> DocumentProcessingResult:
"""Run workers in parallel, then merge concepts into the graph directly.
"""Run workers in parallel, then merge concepts into the graph via the
durable `_step_apply_graph`.

DocumentProcessingResult is composed deterministically here from worker
outputs. The graph merge is a plain async function call — no orchestrator
agent — because it has no decisions to make beyond passing the
already-extracted concept names through.
outputs. The graph merge has no orchestrator agent — no decisions to
make beyond passing the already-extracted concept names through — but
IS wrapped as a checkpointed step (`_step_apply_graph`) so a DBOS
resume of this workflow doesn't repeat the merge.

Wrapped in `@durable_workflow` from services.durable: a no-op when
DBOS_ENABLED is unset (the default), a real DBOS workflow when the
operator opts in. See ADR 0011 for the activation procedure.
"""
workers = await _run_workers(text, deps)
concept_names = [c.name for c in workers.concepts.concepts]
merged = await apply_concepts_to_graph(
deps.user_id, deps.course_id, concept_names,
)
merged = await _step_apply_graph(deps.user_id, deps.course_id, concept_names)
return DocumentProcessingResult(
classification=workers.classification,
summary=workers.summary,
Expand Down
6 changes: 6 additions & 0 deletions backend/main.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
from services.logfire_scrubber import EXTRA_PATTERNS, scrub_value
from services.request_context import RequestIDMiddleware, current_request_id
from services.storage_service import ALLOWED_CONTENT_TYPES, ensure_bucket_exists
from services.durable import init_dbos, shutdown_dbos

try:
from recost.frameworks.fastapi import RecostMiddleware
Expand DownExpand Up@@ -85,10 +86,15 @@ async def _lifespan(_app: FastAPI):
# usage + event rows flush off the request path.
from services import events_service
events_service.start_worker()
# ADR 0011 / #154: construct + launch DBOS when DBOS_ENABLED=true; no-op
# passthrough otherwise. Fails loudly (raises) if the operator opted in
# and launch fails — see services/durable.py::init_dbos.
init_dbos()
yield
# Stop the drain thread and flush anything still queued so the last batch
# of usage rows isn't lost on shutdown.
events_service.shutdown()
shutdown_dbos()


def _drop_request_arguments(_request, _attributes):
Expand Down
11 changes: 11 additions & 0 deletions backend/requirements-durable.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
# Opt-in durable-execution extra (ADR 0011 / #154).
#
# Installs the `dbos` package so backend/services/durable.py's @workflow /
# @step decorators go real when an operator sets DBOS_ENABLED=true (with
# DBOS_DATABASE_URL pointing at a Postgres instance). Never in
# requirements.txt or requirements.lock: durability is opt-in and the
# default (prod-default and hermetic-test) path must keep working with
# `dbos` NOT installed — see backend/tests/test_durable_shim.py.
#
# Install with: pip install -r requirements-durable.txt
dbos>=2.28,<3
8 changes: 7 additions & 1 deletion backend/routes/documents.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
from services.achievement_service import check_achievements
from services.agent_events import SSE_CACHE_CONTROL, SaplingEvent, sapling_event_to_sse
from services.request_context import current_request_id
from services.durable import workflow_id
from agents import WORKER_LIMITS
from agents._providers import model_mode
from agents.classifier import classifier_agent
Expand DownExpand Up@@ -606,8 +607,13 @@ async def upload_document_sync(
# both branches surface a retry-friendly 502: guardrail trips (budget /
# degenerate output) log at WARNING, anything else is a bug and logs the
# full exception.
# Scope the DBOS workflow id to user_id + request_id, not request_id
# alone: X-Request-ID is client-supplied, so an unscoped id would let
# one user's replay attach to another user's in-flight/completed
# workflow (state poisoning). No-op (nullcontext) when DBOS is off.
try:
result: DocumentProcessingResult = await process_document(extracted_text, deps)
with workflow_id(f"doc:{user_id}:{request_id}"):
result: DocumentProcessingResult = await process_document(extracted_text, deps)
except (UsageLimitExceeded, UnexpectedModelBehavior) as e:
logger.warning(
"Agent guardrails tripped for '%s'; returning 502",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 52 additions & 15 deletions backend/agents/document.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@

Coordinates classification, summary, concept extraction, and (when
applicable) syllabus extraction, then merges results into the user's
course graph by calling `apply_concepts_to_graph` directly.
course graph via `_step_apply_graph`, a durable step that calls
`apply_concepts_to_graph`.

There is no orchestrator agent here: the graph merge is a deterministic
function call with concept names already produced by the workers, so
Expand All@@ -13,7 +14,8 @@
asyncio.gather.
- Classification runs first because it gates whether syllabus
extraction runs at all.
- The graph update is a direct async function call after workers complete.
- The graph update runs as a durable step (`_step_apply_graph`) after
workers complete, so a DBOS resume does not re-run the merge.

Failure contract (ADR 0024 — this pipeline is the ONLY upload pipeline;
ADR 0001's legacy fallback was retired in #151b):
Expand All@@ -28,12 +30,19 @@
from bare exceptions in logs.

Internal API: the `_step_*` functions defined below are wrapped with
@durable_step and are meant to be called ONLY from `_run_workers`,
which is itself reached only via `process_document` (the
@durable_workflow). Calling a `_step_*` outside the workflow is
undefined behavior under DBOS — depending on version, it may no-op
silently, raise, or warn. Don't import them from routes or other
modules.
@durable_step and are meant to be called ONLY from within the
@durable_workflow-decorated `process_document` — either directly
(`_step_apply_graph`) or via `_run_workers` (the other four). For the
pinned dbos==2.28.0, calling a `_step_*` outside a workflow context is
NOT undefined: `dbos/_core.py::decorate_step`'s wrapper checks
`ctx.is_workflow()` and, when there's no ambient workflow context, falls
straight through to `return func(*args, **kwargs)` — the plain function
runs for real, synchronously, with no DBOS registry lookup and no error
(verified at `dbos/_core.py:2126-2152`). That's well-defined but still
wrong to rely on here: the call would execute but get NONE of DBOS's
checkpoint/resume behavior, silently losing durability for that call.
Don't import them from routes or other modules; call only from
`_run_workers`/`process_document`.
"""

from __future__ import annotations
Expand DownExpand Up@@ -119,6 +128,34 @@ async def _step_syllabus(text: str, deps: SaplingDeps) -> SyllabusAssignments:
return result.output


@durable_step
async def _step_apply_graph(
user_id: str, course_id: str | None, concept_names: list[str],
) -> int:
"""Merge extracted concepts into the graph as a durable step, so a
DBOS resume does not re-run the merge (it's the pipeline's one
real-Supabase side effect besides persistence, which happens outside
process_document entirely — see routes/documents.py).

Calls `apply_concepts_to_graph` by its bare (module-global) name
rather than binding it to a local/default-arg at decoration time —
that matters because a plain global reference inside a function body
is looked up fresh from the function's `__globals__` (this module's
namespace) on EVERY call, not captured once when the function is
defined. That is what lets tests/test_dbos_resume.py's
`document_module.apply_concepts_to_graph = AsyncMock(...)`
monkeypatch take effect here: it reassigns the SAME name in this
module's namespace that this call resolves at call time. (A default
argument like `apply_fn=apply_concepts_to_graph` would instead freeze
in the ORIGINAL function object at decoration time and silently not
observe the monkeypatch.) routes/documents.py's streaming route
imports and calls the same `apply_concepts_to_graph` independently,
inline and non-durable per ADR 0011's streaming-route asymmetry —
a separate binding this monkeypatch doesn't touch, and doesn't need to.
"""
return await apply_concepts_to_graph(user_id, course_id, concept_names)


async def _run_workers(text: str, deps: SaplingDeps) -> _WorkerResults:
"""Run classification first, then fan out the other workers in parallel.

Expand DownExpand Up@@ -152,22 +189,22 @@ async def _run_workers(text: str, deps: SaplingDeps) -> _WorkerResults:

@durable_workflow
async def process_document(text: str, deps: SaplingDeps) -> DocumentProcessingResult:
"""Run workers in parallel, then merge concepts into the graph directly.
"""Run workers in parallel, then merge concepts into the graph via the
durable `_step_apply_graph`.

DocumentProcessingResult is composed deterministically here from worker
outputs. The graph merge is a plain async function call — no orchestrator
agent — because it has no decisions to make beyond passing the
already-extracted concept names through.
outputs. The graph merge has no orchestrator agent — no decisions to
make beyond passing the already-extracted concept names through — but
IS wrapped as a checkpointed step (`_step_apply_graph`) so a DBOS
resume of this workflow doesn't repeat the merge.

Wrapped in `@durable_workflow` from services.durable: a no-op when
DBOS_ENABLED is unset (the default), a real DBOS workflow when the
operator opts in. See ADR 0011 for the activation procedure.
"""
workers = await _run_workers(text, deps)
concept_names = [c.name for c in workers.concepts.concepts]
merged = await apply_concepts_to_graph(
deps.user_id, deps.course_id, concept_names,
)
merged = await _step_apply_graph(deps.user_id, deps.course_id, concept_names)
return DocumentProcessingResult(
classification=workers.classification,
summary=workers.summary,
Expand Down
6 changes: 6 additions & 0 deletions backend/main.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
from services.logfire_scrubber import EXTRA_PATTERNS, scrub_value
from services.request_context import RequestIDMiddleware, current_request_id
from services.storage_service import ALLOWED_CONTENT_TYPES, ensure_bucket_exists
from services.durable import init_dbos, shutdown_dbos

try:
from recost.frameworks.fastapi import RecostMiddleware
Expand DownExpand Up@@ -85,10 +86,15 @@ async def _lifespan(_app: FastAPI):
# usage + event rows flush off the request path.
from services import events_service
events_service.start_worker()
# ADR 0011 / #154: construct + launch DBOS when DBOS_ENABLED=true; no-op
# passthrough otherwise. Fails loudly (raises) if the operator opted in
# and launch fails — see services/durable.py::init_dbos.
init_dbos()
yield
# Stop the drain thread and flush anything still queued so the last batch
# of usage rows isn't lost on shutdown.
events_service.shutdown()
shutdown_dbos()


def _drop_request_arguments(_request, _attributes):
Expand Down
11 changes: 11 additions & 0 deletions backend/requirements-durable.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
# Opt-in durable-execution extra (ADR 0011 / #154).
#
# Installs the `dbos` package so backend/services/durable.py's @workflow /
# @step decorators go real when an operator sets DBOS_ENABLED=true (with
# DBOS_DATABASE_URL pointing at a Postgres instance). Never in
# requirements.txt or requirements.lock: durability is opt-in and the
# default (prod-default and hermetic-test) path must keep working with
# `dbos` NOT installed — see backend/tests/test_durable_shim.py.
#
# Install with: pip install -r requirements-durable.txt
dbos>=2.28,<3
8 changes: 7 additions & 1 deletion backend/routes/documents.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
from services.achievement_service import check_achievements
from services.agent_events import SSE_CACHE_CONTROL, SaplingEvent, sapling_event_to_sse
from services.request_context import current_request_id
from services.durable import workflow_id
from agents import WORKER_LIMITS
from agents._providers import model_mode
from agents.classifier import classifier_agent
Expand DownExpand Up@@ -606,8 +607,13 @@ async def upload_document_sync(
# both branches surface a retry-friendly 502: guardrail trips (budget /
# degenerate output) log at WARNING, anything else is a bug and logs the
# full exception.
# Scope the DBOS workflow id to user_id + request_id, not request_id
# alone: X-Request-ID is client-supplied, so an unscoped id would let
# one user's replay attach to another user's in-flight/completed
# workflow (state poisoning). No-op (nullcontext) when DBOS is off.
try:
result: DocumentProcessingResult = await process_document(extracted_text, deps)
with workflow_id(f"doc:{user_id}:{request_id}"):
result: DocumentProcessingResult = await process_document(extracted_text, deps)
except (UsageLimitExceeded, UnexpectedModelBehavior) as e:
logger.warning(
"Agent guardrails tripped for '%s'; returning 502",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 52 additions & 15 deletions backend/agents/document.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@

Coordinates classification, summary, concept extraction, and (when
applicable) syllabus extraction, then merges results into the user's
course graph by calling `apply_concepts_to_graph` directly.
course graph via `_step_apply_graph`, a durable step that calls
`apply_concepts_to_graph`.

There is no orchestrator agent here: the graph merge is a deterministic
function call with concept names already produced by the workers, so
Expand All@@ -13,7 +14,8 @@
asyncio.gather.
- Classification runs first because it gates whether syllabus
extraction runs at all.
- The graph update is a direct async function call after workers complete.
- The graph update runs as a durable step (`_step_apply_graph`) after
workers complete, so a DBOS resume does not re-run the merge.

Failure contract (ADR 0024 — this pipeline is the ONLY upload pipeline;
ADR 0001's legacy fallback was retired in #151b):
Expand All@@ -28,12 +30,19 @@
from bare exceptions in logs.

Internal API: the `_step_*` functions defined below are wrapped with
@durable_step and are meant to be called ONLY from `_run_workers`,
which is itself reached only via `process_document` (the
@durable_workflow). Calling a `_step_*` outside the workflow is
undefined behavior under DBOS — depending on version, it may no-op
silently, raise, or warn. Don't import them from routes or other
modules.
@durable_step and are meant to be called ONLY from within the
@durable_workflow-decorated `process_document` — either directly
(`_step_apply_graph`) or via `_run_workers` (the other four). For the
pinned dbos==2.28.0, calling a `_step_*` outside a workflow context is
NOT undefined: `dbos/_core.py::decorate_step`'s wrapper checks
`ctx.is_workflow()` and, when there's no ambient workflow context, falls
straight through to `return func(*args, **kwargs)` — the plain function
runs for real, synchronously, with no DBOS registry lookup and no error
(verified at `dbos/_core.py:2126-2152`). That's well-defined but still
wrong to rely on here: the call would execute but get NONE of DBOS's
checkpoint/resume behavior, silently losing durability for that call.
Don't import them from routes or other modules; call only from
`_run_workers`/`process_document`.
"""

from __future__ import annotations
Expand DownExpand Up@@ -119,6 +128,34 @@ async def _step_syllabus(text: str, deps: SaplingDeps) -> SyllabusAssignments:
return result.output


@durable_step
async def _step_apply_graph(
user_id: str, course_id: str | None, concept_names: list[str],
) -> int:
"""Merge extracted concepts into the graph as a durable step, so a
DBOS resume does not re-run the merge (it's the pipeline's one
real-Supabase side effect besides persistence, which happens outside
process_document entirely — see routes/documents.py).

Calls `apply_concepts_to_graph` by its bare (module-global) name
rather than binding it to a local/default-arg at decoration time —
that matters because a plain global reference inside a function body
is looked up fresh from the function's `__globals__` (this module's
namespace) on EVERY call, not captured once when the function is
defined. That is what lets tests/test_dbos_resume.py's
`document_module.apply_concepts_to_graph = AsyncMock(...)`
monkeypatch take effect here: it reassigns the SAME name in this
module's namespace that this call resolves at call time. (A default
argument like `apply_fn=apply_concepts_to_graph` would instead freeze
in the ORIGINAL function object at decoration time and silently not
observe the monkeypatch.) routes/documents.py's streaming route
imports and calls the same `apply_concepts_to_graph` independently,
inline and non-durable per ADR 0011's streaming-route asymmetry —
a separate binding this monkeypatch doesn't touch, and doesn't need to.
"""
return await apply_concepts_to_graph(user_id, course_id, concept_names)


async def _run_workers(text: str, deps: SaplingDeps) -> _WorkerResults:
"""Run classification first, then fan out the other workers in parallel.

Expand DownExpand Up@@ -152,22 +189,22 @@ async def _run_workers(text: str, deps: SaplingDeps) -> _WorkerResults:

@durable_workflow
async def process_document(text: str, deps: SaplingDeps) -> DocumentProcessingResult:
"""Run workers in parallel, then merge concepts into the graph directly.
"""Run workers in parallel, then merge concepts into the graph via the
durable `_step_apply_graph`.

DocumentProcessingResult is composed deterministically here from worker
outputs. The graph merge is a plain async function call — no orchestrator
agent — because it has no decisions to make beyond passing the
already-extracted concept names through.
outputs. The graph merge has no orchestrator agent — no decisions to
make beyond passing the already-extracted concept names through — but
IS wrapped as a checkpointed step (`_step_apply_graph`) so a DBOS
resume of this workflow doesn't repeat the merge.

Wrapped in `@durable_workflow` from services.durable: a no-op when
DBOS_ENABLED is unset (the default), a real DBOS workflow when the
operator opts in. See ADR 0011 for the activation procedure.
"""
workers = await _run_workers(text, deps)
concept_names = [c.name for c in workers.concepts.concepts]
merged = await apply_concepts_to_graph(
deps.user_id, deps.course_id, concept_names,
)
merged = await _step_apply_graph(deps.user_id, deps.course_id, concept_names)
return DocumentProcessingResult(
classification=workers.classification,
summary=workers.summary,
Expand Down
6 changes: 6 additions & 0 deletions backend/main.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
from services.logfire_scrubber import EXTRA_PATTERNS, scrub_value
from services.request_context import RequestIDMiddleware, current_request_id
from services.storage_service import ALLOWED_CONTENT_TYPES, ensure_bucket_exists
from services.durable import init_dbos, shutdown_dbos

try:
from recost.frameworks.fastapi import RecostMiddleware
Expand DownExpand Up@@ -85,10 +86,15 @@ async def _lifespan(_app: FastAPI):
# usage + event rows flush off the request path.
from services import events_service
events_service.start_worker()
# ADR 0011 / #154: construct + launch DBOS when DBOS_ENABLED=true; no-op
# passthrough otherwise. Fails loudly (raises) if the operator opted in
# and launch fails — see services/durable.py::init_dbos.
init_dbos()
yield
# Stop the drain thread and flush anything still queued so the last batch
# of usage rows isn't lost on shutdown.
events_service.shutdown()
shutdown_dbos()


def _drop_request_arguments(_request, _attributes):
Expand Down
11 changes: 11 additions & 0 deletions backend/requirements-durable.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
# Opt-in durable-execution extra (ADR 0011 / #154).
#
# Installs the `dbos` package so backend/services/durable.py's @workflow /
# @step decorators go real when an operator sets DBOS_ENABLED=true (with
# DBOS_DATABASE_URL pointing at a Postgres instance). Never in
# requirements.txt or requirements.lock: durability is opt-in and the
# default (prod-default and hermetic-test) path must keep working with
# `dbos` NOT installed — see backend/tests/test_durable_shim.py.
#
# Install with: pip install -r requirements-durable.txt
dbos>=2.28,<3
8 changes: 7 additions & 1 deletion backend/routes/documents.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
from services.achievement_service import check_achievements
from services.agent_events import SSE_CACHE_CONTROL, SaplingEvent, sapling_event_to_sse
from services.request_context import current_request_id
from services.durable import workflow_id
from agents import WORKER_LIMITS
from agents._providers import model_mode
from agents.classifier import classifier_agent
Expand DownExpand Up@@ -606,8 +607,13 @@ async def upload_document_sync(
# both branches surface a retry-friendly 502: guardrail trips (budget /
# degenerate output) log at WARNING, anything else is a bug and logs the
# full exception.
# Scope the DBOS workflow id to user_id + request_id, not request_id
# alone: X-Request-ID is client-supplied, so an unscoped id would let
# one user's replay attach to another user's in-flight/completed
# workflow (state poisoning). No-op (nullcontext) when DBOS is off.
try:
result: DocumentProcessingResult = await process_document(extracted_text, deps)
with workflow_id(f"doc:{user_id}:{request_id}"):
result: DocumentProcessingResult = await process_document(extracted_text, deps)
except (UsageLimitExceeded, UnexpectedModelBehavior) as e:
logger.warning(
"Agent guardrails tripped for '%s'; returning 502",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 52 additions & 15 deletions backend/agents/document.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@

Coordinates classification, summary, concept extraction, and (when
applicable) syllabus extraction, then merges results into the user's
course graph by calling `apply_concepts_to_graph` directly.
course graph via `_step_apply_graph`, a durable step that calls
`apply_concepts_to_graph`.

There is no orchestrator agent here: the graph merge is a deterministic
function call with concept names already produced by the workers, so
Expand All@@ -13,7 +14,8 @@
asyncio.gather.
- Classification runs first because it gates whether syllabus
extraction runs at all.
- The graph update is a direct async function call after workers complete.
- The graph update runs as a durable step (`_step_apply_graph`) after
workers complete, so a DBOS resume does not re-run the merge.

Failure contract (ADR 0024 — this pipeline is the ONLY upload pipeline;
ADR 0001's legacy fallback was retired in #151b):
Expand All@@ -28,12 +30,19 @@
from bare exceptions in logs.

Internal API: the `_step_*` functions defined below are wrapped with
@durable_step and are meant to be called ONLY from `_run_workers`,
which is itself reached only via `process_document` (the
@durable_workflow). Calling a `_step_*` outside the workflow is
undefined behavior under DBOS — depending on version, it may no-op
silently, raise, or warn. Don't import them from routes or other
modules.
@durable_step and are meant to be called ONLY from within the
@durable_workflow-decorated `process_document` — either directly
(`_step_apply_graph`) or via `_run_workers` (the other four). For the
pinned dbos==2.28.0, calling a `_step_*` outside a workflow context is
NOT undefined: `dbos/_core.py::decorate_step`'s wrapper checks
`ctx.is_workflow()` and, when there's no ambient workflow context, falls
straight through to `return func(*args, **kwargs)` — the plain function
runs for real, synchronously, with no DBOS registry lookup and no error
(verified at `dbos/_core.py:2126-2152`). That's well-defined but still
wrong to rely on here: the call would execute but get NONE of DBOS's
checkpoint/resume behavior, silently losing durability for that call.
Don't import them from routes or other modules; call only from
`_run_workers`/`process_document`.
"""

from __future__ import annotations
Expand DownExpand Up@@ -119,6 +128,34 @@ async def _step_syllabus(text: str, deps: SaplingDeps) -> SyllabusAssignments:
return result.output


@durable_step
async def _step_apply_graph(
user_id: str, course_id: str | None, concept_names: list[str],
) -> int:
"""Merge extracted concepts into the graph as a durable step, so a
DBOS resume does not re-run the merge (it's the pipeline's one
real-Supabase side effect besides persistence, which happens outside
process_document entirely — see routes/documents.py).

Calls `apply_concepts_to_graph` by its bare (module-global) name
rather than binding it to a local/default-arg at decoration time —
that matters because a plain global reference inside a function body
is looked up fresh from the function's `__globals__` (this module's
namespace) on EVERY call, not captured once when the function is
defined. That is what lets tests/test_dbos_resume.py's
`document_module.apply_concepts_to_graph = AsyncMock(...)`
monkeypatch take effect here: it reassigns the SAME name in this
module's namespace that this call resolves at call time. (A default
argument like `apply_fn=apply_concepts_to_graph` would instead freeze
in the ORIGINAL function object at decoration time and silently not
observe the monkeypatch.) routes/documents.py's streaming route
imports and calls the same `apply_concepts_to_graph` independently,
inline and non-durable per ADR 0011's streaming-route asymmetry —
a separate binding this monkeypatch doesn't touch, and doesn't need to.
"""
return await apply_concepts_to_graph(user_id, course_id, concept_names)


async def _run_workers(text: str, deps: SaplingDeps) -> _WorkerResults:
"""Run classification first, then fan out the other workers in parallel.

Expand DownExpand Up@@ -152,22 +189,22 @@ async def _run_workers(text: str, deps: SaplingDeps) -> _WorkerResults:

@durable_workflow
async def process_document(text: str, deps: SaplingDeps) -> DocumentProcessingResult:
"""Run workers in parallel, then merge concepts into the graph directly.
"""Run workers in parallel, then merge concepts into the graph via the
durable `_step_apply_graph`.

DocumentProcessingResult is composed deterministically here from worker
outputs. The graph merge is a plain async function call — no orchestrator
agent — because it has no decisions to make beyond passing the
already-extracted concept names through.
outputs. The graph merge has no orchestrator agent — no decisions to
make beyond passing the already-extracted concept names through — but
IS wrapped as a checkpointed step (`_step_apply_graph`) so a DBOS
resume of this workflow doesn't repeat the merge.

Wrapped in `@durable_workflow` from services.durable: a no-op when
DBOS_ENABLED is unset (the default), a real DBOS workflow when the
operator opts in. See ADR 0011 for the activation procedure.
"""
workers = await _run_workers(text, deps)
concept_names = [c.name for c in workers.concepts.concepts]
merged = await apply_concepts_to_graph(
deps.user_id, deps.course_id, concept_names,
)
merged = await _step_apply_graph(deps.user_id, deps.course_id, concept_names)
return DocumentProcessingResult(
classification=workers.classification,
summary=workers.summary,
Expand Down
6 changes: 6 additions & 0 deletions backend/main.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
from services.logfire_scrubber import EXTRA_PATTERNS, scrub_value
from services.request_context import RequestIDMiddleware, current_request_id
from services.storage_service import ALLOWED_CONTENT_TYPES, ensure_bucket_exists
from services.durable import init_dbos, shutdown_dbos

try:
from recost.frameworks.fastapi import RecostMiddleware
Expand DownExpand Up@@ -85,10 +86,15 @@ async def _lifespan(_app: FastAPI):
# usage + event rows flush off the request path.
from services import events_service
events_service.start_worker()
# ADR 0011 / #154: construct + launch DBOS when DBOS_ENABLED=true; no-op
# passthrough otherwise. Fails loudly (raises) if the operator opted in
# and launch fails — see services/durable.py::init_dbos.
init_dbos()
yield
# Stop the drain thread and flush anything still queued so the last batch
# of usage rows isn't lost on shutdown.
events_service.shutdown()
shutdown_dbos()


def _drop_request_arguments(_request, _attributes):
Expand Down
11 changes: 11 additions & 0 deletions backend/requirements-durable.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
# Opt-in durable-execution extra (ADR 0011 / #154).
#
# Installs the `dbos` package so backend/services/durable.py's @workflow /
# @step decorators go real when an operator sets DBOS_ENABLED=true (with
# DBOS_DATABASE_URL pointing at a Postgres instance). Never in
# requirements.txt or requirements.lock: durability is opt-in and the
# default (prod-default and hermetic-test) path must keep working with
# `dbos` NOT installed — see backend/tests/test_durable_shim.py.
#
# Install with: pip install -r requirements-durable.txt
dbos>=2.28,<3
8 changes: 7 additions & 1 deletion backend/routes/documents.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
from services.achievement_service import check_achievements
from services.agent_events import SSE_CACHE_CONTROL, SaplingEvent, sapling_event_to_sse
from services.request_context import current_request_id
from services.durable import workflow_id
from agents import WORKER_LIMITS
from agents._providers import model_mode
from agents.classifier import classifier_agent
Expand DownExpand Up@@ -606,8 +607,13 @@ async def upload_document_sync(
# both branches surface a retry-friendly 502: guardrail trips (budget /
# degenerate output) log at WARNING, anything else is a bug and logs the
# full exception.
# Scope the DBOS workflow id to user_id + request_id, not request_id
# alone: X-Request-ID is client-supplied, so an unscoped id would let
# one user's replay attach to another user's in-flight/completed
# workflow (state poisoning). No-op (nullcontext) when DBOS is off.
try:
result: DocumentProcessingResult = await process_document(extracted_text, deps)
with workflow_id(f"doc:{user_id}:{request_id}"):
result: DocumentProcessingResult = await process_document(extracted_text, deps)
except (UsageLimitExceeded, UnexpectedModelBehavior) as e:
logger.warning(
"Agent guardrails tripped for '%s'; returning 502",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 52 additions & 15 deletions backend/agents/document.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@

Coordinates classification, summary, concept extraction, and (when
applicable) syllabus extraction, then merges results into the user's
course graph by calling `apply_concepts_to_graph` directly.
course graph via `_step_apply_graph`, a durable step that calls
`apply_concepts_to_graph`.

There is no orchestrator agent here: the graph merge is a deterministic
function call with concept names already produced by the workers, so
Expand All@@ -13,7 +14,8 @@
asyncio.gather.
- Classification runs first because it gates whether syllabus
extraction runs at all.
- The graph update is a direct async function call after workers complete.
- The graph update runs as a durable step (`_step_apply_graph`) after
workers complete, so a DBOS resume does not re-run the merge.

Failure contract (ADR 0024 — this pipeline is the ONLY upload pipeline;
ADR 0001's legacy fallback was retired in #151b):
Expand All@@ -28,12 +30,19 @@
from bare exceptions in logs.

Internal API: the `_step_*` functions defined below are wrapped with
@durable_step and are meant to be called ONLY from `_run_workers`,
which is itself reached only via `process_document` (the
@durable_workflow). Calling a `_step_*` outside the workflow is
undefined behavior under DBOS — depending on version, it may no-op
silently, raise, or warn. Don't import them from routes or other
modules.
@durable_step and are meant to be called ONLY from within the
@durable_workflow-decorated `process_document` — either directly
(`_step_apply_graph`) or via `_run_workers` (the other four). For the
pinned dbos==2.28.0, calling a `_step_*` outside a workflow context is
NOT undefined: `dbos/_core.py::decorate_step`'s wrapper checks
`ctx.is_workflow()` and, when there's no ambient workflow context, falls
straight through to `return func(*args, **kwargs)` — the plain function
runs for real, synchronously, with no DBOS registry lookup and no error
(verified at `dbos/_core.py:2126-2152`). That's well-defined but still
wrong to rely on here: the call would execute but get NONE of DBOS's
checkpoint/resume behavior, silently losing durability for that call.
Don't import them from routes or other modules; call only from
`_run_workers`/`process_document`.
"""

from __future__ import annotations
Expand DownExpand Up@@ -119,6 +128,34 @@ async def _step_syllabus(text: str, deps: SaplingDeps) -> SyllabusAssignments:
return result.output


@durable_step
async def _step_apply_graph(
user_id: str, course_id: str | None, concept_names: list[str],
) -> int:
"""Merge extracted concepts into the graph as a durable step, so a
DBOS resume does not re-run the merge (it's the pipeline's one
real-Supabase side effect besides persistence, which happens outside
process_document entirely — see routes/documents.py).

Calls `apply_concepts_to_graph` by its bare (module-global) name
rather than binding it to a local/default-arg at decoration time —
that matters because a plain global reference inside a function body
is looked up fresh from the function's `__globals__` (this module's
namespace) on EVERY call, not captured once when the function is
defined. That is what lets tests/test_dbos_resume.py's
`document_module.apply_concepts_to_graph = AsyncMock(...)`
monkeypatch take effect here: it reassigns the SAME name in this
module's namespace that this call resolves at call time. (A default
argument like `apply_fn=apply_concepts_to_graph` would instead freeze
in the ORIGINAL function object at decoration time and silently not
observe the monkeypatch.) routes/documents.py's streaming route
imports and calls the same `apply_concepts_to_graph` independently,
inline and non-durable per ADR 0011's streaming-route asymmetry —
a separate binding this monkeypatch doesn't touch, and doesn't need to.
"""
return await apply_concepts_to_graph(user_id, course_id, concept_names)


async def _run_workers(text: str, deps: SaplingDeps) -> _WorkerResults:
"""Run classification first, then fan out the other workers in parallel.

Expand DownExpand Up@@ -152,22 +189,22 @@ async def _run_workers(text: str, deps: SaplingDeps) -> _WorkerResults:

@durable_workflow
async def process_document(text: str, deps: SaplingDeps) -> DocumentProcessingResult:
"""Run workers in parallel, then merge concepts into the graph directly.
"""Run workers in parallel, then merge concepts into the graph via the
durable `_step_apply_graph`.

DocumentProcessingResult is composed deterministically here from worker
outputs. The graph merge is a plain async function call — no orchestrator
agent — because it has no decisions to make beyond passing the
already-extracted concept names through.
outputs. The graph merge has no orchestrator agent — no decisions to
make beyond passing the already-extracted concept names through — but
IS wrapped as a checkpointed step (`_step_apply_graph`) so a DBOS
resume of this workflow doesn't repeat the merge.

Wrapped in `@durable_workflow` from services.durable: a no-op when
DBOS_ENABLED is unset (the default), a real DBOS workflow when the
operator opts in. See ADR 0011 for the activation procedure.
"""
workers = await _run_workers(text, deps)
concept_names = [c.name for c in workers.concepts.concepts]
merged = await apply_concepts_to_graph(
deps.user_id, deps.course_id, concept_names,
)
merged = await _step_apply_graph(deps.user_id, deps.course_id, concept_names)
return DocumentProcessingResult(
classification=workers.classification,
summary=workers.summary,
Expand Down
6 changes: 6 additions & 0 deletions backend/main.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
from services.logfire_scrubber import EXTRA_PATTERNS, scrub_value
from services.request_context import RequestIDMiddleware, current_request_id
from services.storage_service import ALLOWED_CONTENT_TYPES, ensure_bucket_exists
from services.durable import init_dbos, shutdown_dbos

try:
from recost.frameworks.fastapi import RecostMiddleware
Expand DownExpand Up@@ -85,10 +86,15 @@ async def _lifespan(_app: FastAPI):
# usage + event rows flush off the request path.
from services import events_service
events_service.start_worker()
# ADR 0011 / #154: construct + launch DBOS when DBOS_ENABLED=true; no-op
# passthrough otherwise. Fails loudly (raises) if the operator opted in
# and launch fails — see services/durable.py::init_dbos.
init_dbos()
yield
# Stop the drain thread and flush anything still queued so the last batch
# of usage rows isn't lost on shutdown.
events_service.shutdown()
shutdown_dbos()


def _drop_request_arguments(_request, _attributes):
Expand Down
11 changes: 11 additions & 0 deletions backend/requirements-durable.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
# Opt-in durable-execution extra (ADR 0011 / #154).
#
# Installs the `dbos` package so backend/services/durable.py's @workflow /
# @step decorators go real when an operator sets DBOS_ENABLED=true (with
# DBOS_DATABASE_URL pointing at a Postgres instance). Never in
# requirements.txt or requirements.lock: durability is opt-in and the
# default (prod-default and hermetic-test) path must keep working with
# `dbos` NOT installed — see backend/tests/test_durable_shim.py.
#
# Install with: pip install -r requirements-durable.txt
dbos>=2.28,<3
8 changes: 7 additions & 1 deletion backend/routes/documents.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
from services.achievement_service import check_achievements
from services.agent_events import SSE_CACHE_CONTROL, SaplingEvent, sapling_event_to_sse
from services.request_context import current_request_id
from services.durable import workflow_id
from agents import WORKER_LIMITS
from agents._providers import model_mode
from agents.classifier import classifier_agent
Expand DownExpand Up@@ -606,8 +607,13 @@ async def upload_document_sync(
# both branches surface a retry-friendly 502: guardrail trips (budget /
# degenerate output) log at WARNING, anything else is a bug and logs the
# full exception.
# Scope the DBOS workflow id to user_id + request_id, not request_id
# alone: X-Request-ID is client-supplied, so an unscoped id would let
# one user's replay attach to another user's in-flight/completed
# workflow (state poisoning). No-op (nullcontext) when DBOS is off.
try:
result: DocumentProcessingResult = await process_document(extracted_text, deps)
with workflow_id(f"doc:{user_id}:{request_id}"):
result: DocumentProcessingResult = await process_document(extracted_text, deps)
except (UsageLimitExceeded, UnexpectedModelBehavior) as e:
logger.warning(
"Agent guardrails tripped for '%s'; returning 502",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 52 additions & 15 deletions backend/agents/document.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@

Coordinates classification, summary, concept extraction, and (when
applicable) syllabus extraction, then merges results into the user's
course graph by calling `apply_concepts_to_graph` directly.
course graph via `_step_apply_graph`, a durable step that calls
`apply_concepts_to_graph`.

There is no orchestrator agent here: the graph merge is a deterministic
function call with concept names already produced by the workers, so
Expand All@@ -13,7 +14,8 @@
asyncio.gather.
- Classification runs first because it gates whether syllabus
extraction runs at all.
- The graph update is a direct async function call after workers complete.
- The graph update runs as a durable step (`_step_apply_graph`) after
workers complete, so a DBOS resume does not re-run the merge.

Failure contract (ADR 0024 — this pipeline is the ONLY upload pipeline;
ADR 0001's legacy fallback was retired in #151b):
Expand All@@ -28,12 +30,19 @@
from bare exceptions in logs.

Internal API: the `_step_*` functions defined below are wrapped with
@durable_step and are meant to be called ONLY from `_run_workers`,
which is itself reached only via `process_document` (the
@durable_workflow). Calling a `_step_*` outside the workflow is
undefined behavior under DBOS — depending on version, it may no-op
silently, raise, or warn. Don't import them from routes or other
modules.
@durable_step and are meant to be called ONLY from within the
@durable_workflow-decorated `process_document` — either directly
(`_step_apply_graph`) or via `_run_workers` (the other four). For the
pinned dbos==2.28.0, calling a `_step_*` outside a workflow context is
NOT undefined: `dbos/_core.py::decorate_step`'s wrapper checks
`ctx.is_workflow()` and, when there's no ambient workflow context, falls
straight through to `return func(*args, **kwargs)` — the plain function
runs for real, synchronously, with no DBOS registry lookup and no error
(verified at `dbos/_core.py:2126-2152`). That's well-defined but still
wrong to rely on here: the call would execute but get NONE of DBOS's
checkpoint/resume behavior, silently losing durability for that call.
Don't import them from routes or other modules; call only from
`_run_workers`/`process_document`.
"""

from __future__ import annotations
Expand DownExpand Up@@ -119,6 +128,34 @@ async def _step_syllabus(text: str, deps: SaplingDeps) -> SyllabusAssignments:
return result.output


@durable_step
async def _step_apply_graph(
user_id: str, course_id: str | None, concept_names: list[str],
) -> int:
"""Merge extracted concepts into the graph as a durable step, so a
DBOS resume does not re-run the merge (it's the pipeline's one
real-Supabase side effect besides persistence, which happens outside
process_document entirely — see routes/documents.py).

Calls `apply_concepts_to_graph` by its bare (module-global) name
rather than binding it to a local/default-arg at decoration time —
that matters because a plain global reference inside a function body
is looked up fresh from the function's `__globals__` (this module's
namespace) on EVERY call, not captured once when the function is
defined. That is what lets tests/test_dbos_resume.py's
`document_module.apply_concepts_to_graph = AsyncMock(...)`
monkeypatch take effect here: it reassigns the SAME name in this
module's namespace that this call resolves at call time. (A default
argument like `apply_fn=apply_concepts_to_graph` would instead freeze
in the ORIGINAL function object at decoration time and silently not
observe the monkeypatch.) routes/documents.py's streaming route
imports and calls the same `apply_concepts_to_graph` independently,
inline and non-durable per ADR 0011's streaming-route asymmetry —
a separate binding this monkeypatch doesn't touch, and doesn't need to.
"""
return await apply_concepts_to_graph(user_id, course_id, concept_names)


async def _run_workers(text: str, deps: SaplingDeps) -> _WorkerResults:
"""Run classification first, then fan out the other workers in parallel.

Expand DownExpand Up@@ -152,22 +189,22 @@ async def _run_workers(text: str, deps: SaplingDeps) -> _WorkerResults:

@durable_workflow
async def process_document(text: str, deps: SaplingDeps) -> DocumentProcessingResult:
"""Run workers in parallel, then merge concepts into the graph directly.
"""Run workers in parallel, then merge concepts into the graph via the
durable `_step_apply_graph`.

DocumentProcessingResult is composed deterministically here from worker
outputs. The graph merge is a plain async function call — no orchestrator
agent — because it has no decisions to make beyond passing the
already-extracted concept names through.
outputs. The graph merge has no orchestrator agent — no decisions to
make beyond passing the already-extracted concept names through — but
IS wrapped as a checkpointed step (`_step_apply_graph`) so a DBOS
resume of this workflow doesn't repeat the merge.

Wrapped in `@durable_workflow` from services.durable: a no-op when
DBOS_ENABLED is unset (the default), a real DBOS workflow when the
operator opts in. See ADR 0011 for the activation procedure.
"""
workers = await _run_workers(text, deps)
concept_names = [c.name for c in workers.concepts.concepts]
merged = await apply_concepts_to_graph(
deps.user_id, deps.course_id, concept_names,
)
merged = await _step_apply_graph(deps.user_id, deps.course_id, concept_names)
return DocumentProcessingResult(
classification=workers.classification,
summary=workers.summary,
Expand Down
6 changes: 6 additions & 0 deletions backend/main.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
from services.logfire_scrubber import EXTRA_PATTERNS, scrub_value
from services.request_context import RequestIDMiddleware, current_request_id
from services.storage_service import ALLOWED_CONTENT_TYPES, ensure_bucket_exists
from services.durable import init_dbos, shutdown_dbos

try:
from recost.frameworks.fastapi import RecostMiddleware
Expand DownExpand Up@@ -85,10 +86,15 @@ async def _lifespan(_app: FastAPI):
# usage + event rows flush off the request path.
from services import events_service
events_service.start_worker()
# ADR 0011 / #154: construct + launch DBOS when DBOS_ENABLED=true; no-op
# passthrough otherwise. Fails loudly (raises) if the operator opted in
# and launch fails — see services/durable.py::init_dbos.
init_dbos()
yield
# Stop the drain thread and flush anything still queued so the last batch
# of usage rows isn't lost on shutdown.
events_service.shutdown()
shutdown_dbos()


def _drop_request_arguments(_request, _attributes):
Expand Down
11 changes: 11 additions & 0 deletions backend/requirements-durable.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
# Opt-in durable-execution extra (ADR 0011 / #154).
#
# Installs the `dbos` package so backend/services/durable.py's @workflow /
# @step decorators go real when an operator sets DBOS_ENABLED=true (with
# DBOS_DATABASE_URL pointing at a Postgres instance). Never in
# requirements.txt or requirements.lock: durability is opt-in and the
# default (prod-default and hermetic-test) path must keep working with
# `dbos` NOT installed — see backend/tests/test_durable_shim.py.
#
# Install with: pip install -r requirements-durable.txt
dbos>=2.28,<3
8 changes: 7 additions & 1 deletion backend/routes/documents.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
from services.achievement_service import check_achievements
from services.agent_events import SSE_CACHE_CONTROL, SaplingEvent, sapling_event_to_sse
from services.request_context import current_request_id
from services.durable import workflow_id
from agents import WORKER_LIMITS
from agents._providers import model_mode
from agents.classifier import classifier_agent
Expand DownExpand Up@@ -606,8 +607,13 @@ async def upload_document_sync(
# both branches surface a retry-friendly 502: guardrail trips (budget /
# degenerate output) log at WARNING, anything else is a bug and logs the
# full exception.
# Scope the DBOS workflow id to user_id + request_id, not request_id
# alone: X-Request-ID is client-supplied, so an unscoped id would let
# one user's replay attach to another user's in-flight/completed
# workflow (state poisoning). No-op (nullcontext) when DBOS is off.
try:
result: DocumentProcessingResult = await process_document(extracted_text, deps)
with workflow_id(f"doc:{user_id}:{request_id}"):
result: DocumentProcessingResult = await process_document(extracted_text, deps)
except (UsageLimitExceeded, UnexpectedModelBehavior) as e:
logger.warning(
"Agent guardrails tripped for '%s'; returning 502",
Expand Down
Loading
Loading