A stall is often systemic (a Qdrant/embedding outage stalls every in-flight job), so reclaiming the whole batch at now() every */5min tick would thundering-herd a recovering dependency, bypassing TieredEscalationStrategy's per-job backoff. reclaim_stalled_ingest_jobs now offsets retry_at by a fixed delay (INGEST_RECLAIM_RETRY_DELAY_SECONDS, default 30s; 0 = legacy immediate). Also document the hot-vs-restart flag asymmetry: INGEST_ESCALATION_ENABLED is re-read per job; INGEST_TRANSIENT_MAX_ATTEMPTS is snapshotted at worker startup. Deck #323. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
284 lines
10 KiB
Python
284 lines
10 KiB
Python
"""Unit tests for the procrastinate ingest producer + task (Deck #183).
|
|
|
|
Uses procrastinate's in-memory connector so no live Postgres is required.
|
|
"""
|
|
|
|
from types import SimpleNamespace
|
|
from typing import cast
|
|
from unittest.mock import AsyncMock
|
|
|
|
import pytest
|
|
from procrastinate import App, JobContext, testing
|
|
|
|
import nextcloud_mcp_server.vector.queue.procrastinate as pq
|
|
from nextcloud_mcp_server.vector.scanner import DocumentTask
|
|
|
|
pytestmark = pytest.mark.unit
|
|
|
|
|
|
def _ctx(queue: str = pq.INGEST_QUEUE_FAST) -> JobContext:
|
|
"""Minimal JobContext stand-in: the task only reads ``context.job.queue``."""
|
|
return cast(JobContext, SimpleNamespace(job=SimpleNamespace(queue=queue)))
|
|
|
|
|
|
@pytest.fixture
|
|
def app():
|
|
"""An App bound to the in-memory connector with the ingest tasks."""
|
|
return pq.build_app(testing.InMemoryConnector())
|
|
|
|
|
|
def _task(doc_id="42", doc_type="note", operation="index"):
|
|
return DocumentTask(
|
|
user_id="alice",
|
|
doc_id=doc_id,
|
|
doc_type=doc_type,
|
|
operation=operation,
|
|
modified_at=100,
|
|
etag="etag-abc",
|
|
)
|
|
|
|
|
|
class TestProcrastinateTaskProducer:
|
|
async def test_send_defers_with_correct_job_shape(self, app):
|
|
async with app.open_async():
|
|
producer = pq.ProcrastinateTaskProducer(app)
|
|
await producer.send(_task())
|
|
|
|
jobs = list(app.connector.jobs.values())
|
|
assert len(jobs) == 1
|
|
job = jobs[0]
|
|
assert job["task_name"] == pq.INGEST_TASK_NAME
|
|
# New jobs are deferred onto the cheapest tier's queue.
|
|
assert job["queue_name"] == pq.INGEST_QUEUE_FAST
|
|
assert job["queueing_lock"] == "alice:note:42"
|
|
assert job["lock"] is None # no execution lock (crash-deadlock guard)
|
|
assert job["args"]["doc_id"] == "42"
|
|
assert job["args"]["etag"] == "etag-abc"
|
|
|
|
async def test_duplicate_send_is_deduped(self, app):
|
|
async with app.open_async():
|
|
producer = pq.ProcrastinateTaskProducer(app)
|
|
await producer.send(_task())
|
|
# Same doc again → AlreadyEnqueued, swallowed; still one job.
|
|
await producer.send(_task())
|
|
assert len(app.connector.jobs) == 1
|
|
|
|
async def test_distinct_docs_create_separate_jobs(self, app):
|
|
async with app.open_async():
|
|
producer = pq.ProcrastinateTaskProducer(app)
|
|
await producer.send(_task(doc_id="1"))
|
|
await producer.send(_task(doc_id="2"))
|
|
assert len(app.connector.jobs) == 2
|
|
|
|
def test_clone_returns_self(self, app):
|
|
producer = pq.ProcrastinateTaskProducer(app)
|
|
assert producer.clone() is producer
|
|
|
|
async def test_connect_opens_pool_and_drain_closes(self, app, monkeypatch):
|
|
# connect() resolves the process-wide app; point it at our in-memory one.
|
|
monkeypatch.setattr(pq, "get_procrastinate_app", lambda: app)
|
|
|
|
producer = await pq.ProcrastinateTaskProducer.connect()
|
|
# `await app.open_async()` must actually open the connector (regression
|
|
# guard for the await-vs-`async with` form on the long-lived pool).
|
|
assert app.connector.states == ["open_async"]
|
|
|
|
# An open pool means send() works end-to-end.
|
|
await producer.send(_task())
|
|
assert len(app.connector.jobs) == 1
|
|
|
|
await producer.drain()
|
|
assert "closed_async" in app.connector.states
|
|
|
|
|
|
class TestProcessDocumentTask:
|
|
async def test_runs_pipeline_and_closes_client(self, monkeypatch):
|
|
captured = {}
|
|
|
|
fake_client = AsyncMock()
|
|
|
|
async def fake_resolve(user_id):
|
|
captured["user_id"] = user_id
|
|
return fake_client
|
|
|
|
async def fake_process(task, nc_client, *, max_retries, tier):
|
|
captured["task"] = task
|
|
captured["nc_client"] = nc_client
|
|
captured["max_retries"] = max_retries
|
|
captured["tier"] = tier
|
|
|
|
monkeypatch.setattr(pq, "_resolve_client", fake_resolve)
|
|
monkeypatch.setattr(
|
|
"nextcloud_mcp_server.vector.processor.process_document", fake_process
|
|
)
|
|
|
|
# Calling the Task runs its wrapped function in-process. The job is on the
|
|
# ocr queue, so the queue-aware task must derive tier="ocr".
|
|
await pq.process_document_task(
|
|
_ctx(pq.INGEST_QUEUE_OCR),
|
|
user_id="alice",
|
|
doc_id="42",
|
|
doc_type="note",
|
|
operation="index",
|
|
modified_at=100,
|
|
etag="e1",
|
|
)
|
|
|
|
assert captured["user_id"] == "alice"
|
|
assert isinstance(captured["task"], DocumentTask)
|
|
assert captured["task"].doc_id == "42"
|
|
assert captured["task"].etag == "e1"
|
|
# Worker disables the in-process retry loop; durable retry is the queue's.
|
|
assert captured["max_retries"] == 1
|
|
# Tier is derived from the job's queue (escalation enabled by default).
|
|
assert captured["tier"] == "ocr"
|
|
fake_client.close.assert_awaited_once()
|
|
|
|
async def test_pipeline_error_propagates_and_closes_client(self, monkeypatch):
|
|
# A non-credential failure must propagate (so procrastinate's
|
|
# RetryStrategy picks it up) and still close the client via finally.
|
|
fake_client = AsyncMock()
|
|
|
|
async def fake_resolve(user_id):
|
|
return fake_client
|
|
|
|
async def fake_process(task, nc_client, *, max_retries, tier):
|
|
raise RuntimeError("transient qdrant failure")
|
|
|
|
monkeypatch.setattr(pq, "_resolve_client", fake_resolve)
|
|
monkeypatch.setattr(
|
|
"nextcloud_mcp_server.vector.processor.process_document", fake_process
|
|
)
|
|
|
|
with pytest.raises(RuntimeError, match="transient qdrant failure"):
|
|
await pq.process_document_task(
|
|
_ctx(),
|
|
user_id="alice",
|
|
doc_id="42",
|
|
doc_type="note",
|
|
operation="index",
|
|
modified_at=100,
|
|
)
|
|
fake_client.close.assert_awaited_once()
|
|
|
|
async def test_skips_on_missing_credentials(self, monkeypatch):
|
|
from nextcloud_mcp_server.vector.oauth_sync import NotProvisionedError
|
|
|
|
async def fake_resolve(user_id):
|
|
raise NotProvisionedError("no app password")
|
|
|
|
called = False
|
|
|
|
async def fake_process(*args, **kwargs):
|
|
nonlocal called
|
|
called = True
|
|
|
|
monkeypatch.setattr(pq, "_resolve_client", fake_resolve)
|
|
monkeypatch.setattr(
|
|
"nextcloud_mcp_server.vector.processor.process_document", fake_process
|
|
)
|
|
|
|
# Returns cleanly (job succeeds as a no-op); pipeline never runs.
|
|
await pq.process_document_task(
|
|
_ctx(),
|
|
user_id="ghost",
|
|
doc_id="9",
|
|
doc_type="note",
|
|
operation="index",
|
|
modified_at=0,
|
|
)
|
|
assert called is False
|
|
|
|
|
|
class TestReclaimStalledJobs:
|
|
async def test_reclaims_each_stalled_job(self):
|
|
from datetime import datetime, timezone
|
|
|
|
retried: list[int] = []
|
|
retry_ats: list[datetime] = []
|
|
|
|
class Job:
|
|
def __init__(self, id):
|
|
self.id = id
|
|
|
|
class FakeManager:
|
|
async def get_stalled_jobs(self, queue=None, seconds_since_heartbeat=0):
|
|
# Reclaim sweeps EVERY queue (Deck #323), so no queue filter.
|
|
assert queue is None
|
|
return [Job(1), Job(2), Job(None)] # None id is skipped
|
|
|
|
async def retry_job_by_id_async(self, job_id, retry_at):
|
|
assert isinstance(retry_at, datetime)
|
|
retried.append(job_id)
|
|
retry_ats.append(retry_at)
|
|
|
|
class FakeApp:
|
|
job_manager = FakeManager()
|
|
|
|
class Ctx:
|
|
app = FakeApp()
|
|
|
|
before = datetime.now(tz=timezone.utc)
|
|
await pq.reclaim_stalled_ingest_jobs(cast(JobContext, Ctx()), timestamp=0)
|
|
assert retried == [1, 2]
|
|
# Reclaimed jobs are staggered into the future (default 30s) rather than
|
|
# retried at now(), so a systemic outage doesn't thundering-herd.
|
|
assert all((ra - before).total_seconds() >= 25 for ra in retry_ats)
|
|
|
|
|
|
class TestGetIngestJobCounts:
|
|
async def test_aggregates_stats_rows(self):
|
|
class FakeManager:
|
|
async def list_queues_async(self, queue=None, **kwargs):
|
|
# Counts now aggregate across all managed queues (Deck #323), so
|
|
# the helper lists every queue and filters by name itself.
|
|
assert queue is None
|
|
# procrastinate flattens per-status stats into top-level keys.
|
|
return [
|
|
{
|
|
"name": "ingest-fast",
|
|
"jobs_count": 4,
|
|
"todo": 3,
|
|
"doing": 1,
|
|
"succeeded": 0,
|
|
"failed": 0,
|
|
"cancelled": 0,
|
|
"aborted": 0,
|
|
},
|
|
{
|
|
"name": "ingest-ocr",
|
|
"jobs_count": 2,
|
|
"todo": 0,
|
|
"doing": 0,
|
|
"succeeded": 0,
|
|
"failed": 2,
|
|
"cancelled": 0,
|
|
"aborted": 0,
|
|
},
|
|
{
|
|
# An unmanaged queue must NOT pollute ingest counts.
|
|
"name": "some-other-queue",
|
|
"jobs_count": 9,
|
|
"todo": 9,
|
|
"doing": 0,
|
|
"succeeded": 0,
|
|
"failed": 0,
|
|
"cancelled": 0,
|
|
"aborted": 0,
|
|
},
|
|
]
|
|
|
|
class FakeApp:
|
|
job_manager = FakeManager()
|
|
|
|
counts = await pq.get_ingest_job_counts(cast(App, FakeApp()))
|
|
assert counts["todo"] == 3 # only ingest-* queues, not some-other-queue
|
|
assert counts["doing"] == 1
|
|
assert counts["failed"] == 2
|
|
assert counts["succeeded"] == 0
|
|
|
|
by_queue = await pq.get_ingest_job_counts_by_queue(cast(App, FakeApp()))
|
|
assert set(by_queue) == {"ingest-fast", "ingest-ocr"}
|
|
assert by_queue["ingest-fast"]["todo"] == 3
|
|
assert by_queue["ingest-ocr"]["failed"] == 2
|