deps: migrate to mcp 2.x (lift the <2 pin)
mcp 2.0.0 removed `mcp.server.fastmcp`; the `<2` ceiling in 23c7a3d
stopped the bleeding but left this server on the previous major.
Ports to the 2.x API, following the same shape seed-mcp shipped.
- requirements.txt: `mcp[fastmcp]>=1.0.0,<2` -> `mcp>=2,<3` (2.x has
no [fastmcp] extra)
- server.py: FastMCP -> mcp.server.mcpserver.MCPServer; `mcp.settings`
is gone, so host/port/stateless_http/transport_security are now
run() kwargs
- stateless_http is gated to streamable-http. Under 1.x it was a
constructor arg and so applied to sse too; sse is a dev-only path
here, and this matches seed-mcp.
- CI: both workflows now run `python -c "import docs_mcp.server"`
against the built image before pushing it. This is the durable
half — a green build can no longer ship a non-importing image.
- CLAUDE.md / README.md: correct the FastMCP references. PLAN.md is
left alone; it tracks the upstream template, not this repo.
Verification (mcp 1.27.1 -> 2.2.0):
- tools/list dumped in wire format is byte-for-byte identical,
md5 cea0326f59b55abbbf47c9679252d38f both sides. All 5 tools
(search_docs, get_page, list_versions, corpus_status,
crop_chem_api_lessons) unchanged, so routing is unaffected.
- streamable-http: `initialize` -> 200, no mcp-session-id header
(stateless_http confirmed active); tools/list and a real
tools/call over the wire both succeed.
- stdio: initialize + tools/list both fine.
- Image built; the new CI smoke command passes against it.
corpus_status reads the baked indexes (4,164 labels / 216,467
chunks) and a live `search_docs` returns hits with mode=hybrid-rrf
against Ollama on .0.125.
No eval numbers: this touches transport and packaging only. The
chunker, embedder, Chroma/BM25 stores, RRF and the reranker are all
untouched, and the live search above confirms retrieval still runs.
Note: `serverInfo.version` now reports "" instead of the SDK version
(2.x behaviour for an unversioned server). Cosmetic, but visible to
clients. httpx2 + opentelemetry-api come in as 2.x deps and coexist
with the existing httpx 0.28.1 pin, as expected.
Closes #4
Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_01FFBDnRWHispovmJVK9rXc9
This commit is contained in:
@@ -68,7 +68,7 @@ Cursor, etc.).
|
||||
│ ├── index.py # Builds Chroma + BM25
|
||||
│ └── bm25.py # SQLite FTS5 lexical index
|
||||
├── docs_mcp/ # Phase 3+ — MCP server
|
||||
│ ├── server.py # FastMCP + tool definitions
|
||||
│ ├── server.py # MCPServer + tool definitions
|
||||
│ └── usage.py # TimedCall telemetry
|
||||
├── eval/ # Phase 7 — golden-query harness
|
||||
│ ├── queries.jsonl.example
|
||||
@@ -124,7 +124,8 @@ need:
|
||||
- **Lexical store**: SQLite FTS5 (stdlib)
|
||||
- **Fusion**: Reciprocal Rank Fusion with k=60
|
||||
- **Transport**: streamable-HTTP in prod, stdio for local dev
|
||||
- **MCP framework**: FastMCP with `stateless_http=True`
|
||||
- **MCP framework**: `mcp.server.mcpserver.MCPServer` (mcp 2.x),
|
||||
run with `stateless_http=True`
|
||||
- **Container deploy**: Watchtower auto-pull on `:latest`, rollback
|
||||
via `:<sha12>` pin
|
||||
|
||||
@@ -133,7 +134,7 @@ need:
|
||||
The template uses `PRODUCT_NAME` env var (defaults to `"myproduct"`)
|
||||
throughout. Set it on first build. References show up in:
|
||||
|
||||
- `docs_mcp/server.py` — `FastMCP(f"{PRODUCT_NAME}-docs", ...)`
|
||||
- `docs_mcp/server.py` — `MCPServer(f"{PRODUCT_NAME}-docs")`
|
||||
- Collection name (`<product>_docs`)
|
||||
- BM25 db filename
|
||||
- Tool names that include the product name (e.g., the `_api_lessons`
|
||||
@@ -200,10 +201,16 @@ python -m scrape.changelog --history-out corpus/.digest/history.jsonl --history-
|
||||
ENTIRE batch if any doc exceeds `n_ctx_train=1024`. Truncate docs
|
||||
to ~2000 chars before sending to rerank. Full chunk text still
|
||||
goes back to the user; truncation is reranking-only.
|
||||
- **FastMCP `stateless_http=True`**: critical for production
|
||||
hosting behind Watchtower auto-updates. Without it, every
|
||||
container recreate produces a 404 storm from clients with
|
||||
stale session IDs.
|
||||
- **`stateless_http=True`**: critical for production hosting
|
||||
behind Watchtower auto-updates. Without it, every container
|
||||
recreate produces a 404 storm from clients with stale session
|
||||
IDs. Under mcp 2.x this is a `mcp.run()` kwarg, not a
|
||||
constructor arg — see `main()` in `docs_mcp/server.py`.
|
||||
- **mcp 2.x, not 1.x**: `mcp.server.fastmcp` was removed in 2.0.0.
|
||||
This server uses `mcp.server.mcpserver.MCPServer`; `mcp.settings`
|
||||
no longer exists (host/port/transport_security are `run()`
|
||||
kwargs). PLAN.md still describes the 1.x API — it tracks the
|
||||
upstream template, not this repo.
|
||||
- **Runner shell is `/bin/sh` (dash)**: no `${VAR::N}` substring
|
||||
expansion in workflow scripts. Use `cut`/`awk`/`printf`.
|
||||
- **Cloudflare 100 MB body cap**: if pushing through a Cloudflare-
|
||||
|
||||
Reference in New Issue
Block a user