Initial plan

requirements-optional.txt

@@ -43,4 +43,4 @@ PyMuPDF
 # magika (onnxruntime), already a core dep via fastembed. We avoid the
 # [all]/Azure/audio extras (cloud + heavy). Pinned to a release >30 days old per
 # the dependency-age discussion in issue #485.
-markitdown[docx,pptx,xlsx,xls]==0.1.7
+markitdown[docx,pptx,xlsx,xls]==0.1.6

requirements.txt

@@ -3,9 +3,9 @@ uvicorn
 python-multipart
 python-dotenv
 httpx
-httpcore>=1.0.9,<2.0
-pydantic>=2.13.5
-pydantic-settings>=2.15.0
+httpcore>=1.0,<2.0
+pydantic>=2.13.4
+pydantic-settings>=2.14.1
 SQLAlchemy
 pypdf
 beautifulsoup4
@@ -41,7 +41,7 @@ bcrypt
 # Built-in servers use the v1 low-level Server decorator API. MCP SDK v2 is a
 # breaking rewrite, so keep fresh installs on the maintained v1 line until the
 # servers are migrated together.
-mcp<3
+mcp<2
 pyotp
 qrcode[pil]
 croniter
@@ -51,8 +51,3 @@ pytest-asyncio
 # TestClient import when only classic httpx is present. Runtime code keeps
 # using `httpx` above; this is test-client only.
 httpx2
-# DATABASE_URL defaults to sqlite (core/database.py), but when pointed at an
-# external Postgres, SQLAlchemy's postgresql dialect imports psycopg2 inside
-# create_engine() and raises ModuleNotFoundError if missing. -binary avoids
-# needing libpq-dev/pg_config on the host/image to compile it.
-psycopg2-binary

src/model_discovery.py

@@ -38,10 +38,7 @@ def discover_tailscale_hosts() -> List[str]:
     global _hosts_cache, _hosts_cache_time
 
     now = time.time()
-    # Gate on the timestamp, not the list: a successful query that found no
-    # eligible peers is a real answer, and testing the list's truthiness made
-    # that case re-run `tailscale status` (up to a 5s timeout) on every call.
-    if _hosts_cache_time and (now - _hosts_cache_time) < _HOSTS_CACHE_TTL:
+    if _hosts_cache and (now - _hosts_cache_time) < _HOSTS_CACHE_TTL:
         return list(_hosts_cache)
 
     hosts = []

src/task_scheduler.py

@@ -84,30 +84,19 @@ async def _cached(key: Tuple, ttl: float, fetch: Callable[[], Awaitable[Any]]) -
             pending = fut
             owner = True
     if not owner:
-        # A cancelled waiter must not cancel the shared Future for the owner
-        # and every other waiter.
-        return await asyncio.shield(pending)
+        return await pending
     try:
         val = await fetch()
         async with _shared_cache_lock:
             _shared_cache[key] = (time.monotonic() + ttl, val)
+            _shared_cache_pending.pop(key, None)
         pending.set_result(val)
         return val
-    except asyncio.CancelledError:
-        # Cancellation is a BaseException on supported Python versions, so it
-        # bypasses the Exception handler below. Wake all current waiters while
-        # allowing a later caller to retry the fetch.
-        pending.cancel()
-        raise
     except Exception as e:
+        async with _shared_cache_lock:
+            _shared_cache_pending.pop(key, None)
         pending.set_exception(e)
         raise
-    finally:
-        # Keep this cleanup synchronous so a second cancellation cannot
-        # interrupt it and leave a permanently pending Future behind. All
-        # access runs on the scheduler's event-loop thread.
-        if _shared_cache_pending.get(key) is pending:
-            _shared_cache_pending.pop(key, None)
 
 
 def compute_next_run(schedule: str, scheduled_time: str,

tests/test_tailscale_discovery_cache.py

@@ -1,69 +0,0 @@
-"""A successful Tailscale query with no eligible hosts is still cached knowledge.
-
-`discover_tailscale_hosts` gated its cache on the host list being non-empty, so a
-valid "nothing to see here" answer looked identical to a cold cache and every
-caller paid for another `tailscale status --json` (up to a 5s timeout). Failures
-stay uncached so a peer coming online is still picked up promptly.
-"""
-
-import pytest
-
-from src import model_discovery
-
-
-class _Result:
-    def __init__(self, returncode, stdout):
-        self.returncode = returncode
-        self.stdout = stdout
-
-
-@pytest.fixture
-def tailscale(monkeypatch):
-    """Count `tailscale status` invocations and start from a cold cache."""
-    calls = []
-
-    def _record(result):
-        def _run(*_args, **_kwargs):
-            calls.append(1)
-            if isinstance(result, Exception):
-                raise result
-            return result
-        monkeypatch.setattr(model_discovery.subprocess, "run", _run)
-        return calls
-
-    monkeypatch.setattr(model_discovery, "_hosts_cache", [])
-    monkeypatch.setattr(model_discovery, "_hosts_cache_time", 0)
-    return _record
-
-
-def test_empty_but_successful_discovery_is_only_run_once(tailscale):
-    calls = tailscale(_Result(0, '{"Self":{},"Peer":{}}'))
-
-    assert model_discovery.discover_tailscale_hosts() == []
-    assert model_discovery.discover_tailscale_hosts() == []
-    assert len(calls) == 1
-
-
-def test_nonempty_discovery_is_still_cached(tailscale):
-    calls = tailscale(_Result(0, '{"Self":{"TailscaleIPs":["100.1.1.1"]},"Peer":{}}'))
-
-    assert model_discovery.discover_tailscale_hosts() == ["100.1.1.1"]
-    assert model_discovery.discover_tailscale_hosts() == ["100.1.1.1"]
-    assert len(calls) == 1
-
-
-@pytest.mark.parametrize(
-    "result",
-    [
-        _Result(1, ""),                       # tailscale installed but logged out
-        _Result(0, "not json"),               # unparseable output
-        FileNotFoundError("tailscale"),       # not installed
-    ],
-    ids=["nonzero_exit", "bad_json", "not_installed"],
-)
-def test_failures_stay_retryable(tailscale, result):
-    calls = tailscale(result)
-
-    assert model_discovery.discover_tailscale_hosts() == []
-    assert model_discovery.discover_tailscale_hosts() == []
-    assert len(calls) == 2

tests/test_task_scheduler_cache.py

@@ -1,86 +0,0 @@
-import asyncio
-
-import pytest
-
-from src import task_scheduler
-
-
-@pytest.fixture(autouse=True)
-def clear_shared_cache():
-    task_scheduler._shared_cache.clear()
-    task_scheduler._shared_cache_pending.clear()
-    yield
-    task_scheduler._shared_cache.clear()
-    task_scheduler._shared_cache_pending.clear()
-
-
-async def test_cached_owner_cancellation_wakes_waiters_and_allows_retry():
-    key = ("cancelled-owner",)
-    fetch_started = asyncio.Event()
-
-    async def blocked_fetch():
-        fetch_started.set()
-        await asyncio.Event().wait()
-
-    owner = asyncio.create_task(task_scheduler._cached(key, 60, blocked_fetch))
-    await fetch_started.wait()
-
-    async def unexpected_fetch():
-        pytest.fail("a waiter must share the owner's fetch")
-
-    waiter = asyncio.create_task(task_scheduler._cached(key, 60, unexpected_fetch))
-    await asyncio.sleep(0)
-
-    owner.cancel()
-    with pytest.raises(asyncio.CancelledError):
-        await owner
-    with pytest.raises(asyncio.CancelledError):
-        await asyncio.wait_for(waiter, timeout=1)
-
-    assert key not in task_scheduler._shared_cache_pending
-
-    async def retry_fetch():
-        return "fresh"
-
-    result = await asyncio.wait_for(
-        task_scheduler._cached(key, 60, retry_fetch),
-        timeout=1,
-    )
-    assert result == "fresh"
-
-
-async def test_cached_waiter_cancellation_does_not_cancel_shared_fetch():
-    key = ("cancelled-waiter",)
-    fetch_started = asyncio.Event()
-    release_fetch = asyncio.Event()
-
-    async def blocked_fetch():
-        fetch_started.set()
-        await release_fetch.wait()
-        return "shared"
-
-    owner = asyncio.create_task(task_scheduler._cached(key, 60, blocked_fetch))
-    await fetch_started.wait()
-
-    async def unexpected_fetch():
-        pytest.fail("a waiter must share the owner's fetch")
-
-    waiter = asyncio.create_task(task_scheduler._cached(key, 60, unexpected_fetch))
-    await asyncio.sleep(0)
-    waiter.cancel()
-
-    with pytest.raises(asyncio.CancelledError):
-        await waiter
-
-    pending = task_scheduler._shared_cache_pending[key]
-    assert not pending.cancelled()
-    assert not owner.done()
-
-    release_fetch.set()
-    assert await asyncio.wait_for(owner, timeout=1) == "shared"
-    assert key not in task_scheduler._shared_cache_pending
-
-    async def cache_miss():
-        pytest.fail("the successful owner result should be cached")
-
-    assert await task_scheduler._cached(key, 60, cache_miss) == "shared"