Repository navigation
Commit 7e92b3a
authored
feat!: port to MCP Python SDK v2 (2026-07-28 protocol revision) (#362)
Phases 1–5 of #360. Held in draft behind [python-sdk#3273](modelcontextprotocol/python-sdk#3273) until 2026-08-19; the shim described in "The release blocker, closed at our layer" ends the hold. **Merging cuts 3.0.0.**
## What this does
Ports the server from MCP Python SDK 1.29 to 2.0.0, which implements the [2026-07-28 revision](https://modelcontextprotocol.io/specification/2026-07-28/changelog). The 1.x line is maintenance-only now.
Most of the change is deletion. The features this project hand-rolled against 1.x internals are first-class in v2, so `subscriptions.py` drops ~350 lines: the URI-keyed registry of live `ServerSession` objects, the `WeakSet` bookkeeping that inferred disconnects from garbage collection, the concurrent fan-out with per-subscriber send timeouts and dead-session eviction, and the monkey-patch of `create_initialization_options` that advertised a capability the SDK hardcoded to `False`. Clients now opt in via `subscriptions/listen` and the SDK's `SubscriptionBus` owns delivery. What survives is the part the SDK cannot know: `MtimeWatcher`.
The rest is mechanical: `FastMCP` → `MCPServer`, `version`/`instructions` as constructor kwargs (instructions now ride `server/discover`), transport config moved to the app builders, health routes onto the public `custom_route` hook, wire models to snake_case, and `ResourceTemplate` built via `from_function` so v2's parsed RFC 6570 template and `ResourceSecurity` policy are populated.
## Behavior changes a user can see
**Notification kinds are now distinct.** A `.zim` file appearing or disappearing publishes `resources/list_changed`; a file replaced in place publishes `resources/updated` for its own URI. 1.x sent both as an `updated` for `zim://files`, because `resources/subscribe` gave clients no way to ask about list membership. **`zim://files` is therefore no longer a valid subscription target** — `list_changed` carries no URI.
**`resources/subscribe` is no longer served.** A 2025-era client gets `-32601` and cannot receive change notifications; the rest of the handshake era (tools, resources, prompts) still works. This is a choice rather than a constraint — see the spike in the comments: the SDK keeps the method, and registering a handler through the public `add_request_handler` restores both the capability advertisement and real notification delivery to a legacy client. What it costs is the per-session subscriber registry this PR deletes. Subscriptions were HTTP-only before this change too, so no stdio client ever had the capability.
**Results carry cache hints.** Registration-table endpoints get a one-hour TTL. Reads split by URI: `zim://{name}` and `zim://{name}/entry/{path}` are fixed by a sealed archive file and carry `OPENZIM_MCP_RESOURCE_CACHE_TTL_SECONDS` (new, default one hour), while `zim://files` is a live directory scan and stays bounded by the watcher's poll interval, so a cached listing is never staler than the server's own detection latency. The long TTL and subscriptions work together: a client on an open `subscriptions/listen` stream is told about a replacement immediately and re-reads. A client that is **not** subscribed — anything on stdio — can serve stale content until the TTL expires; set the knob to `0` to turn the override off. Scope is `private` throughout: payloads embed server-local paths.
## One deviation from the plan in #360
**The `sse` transport stays.** The spec deprecates HTTP+SSE and the SDK still serves it. Removing a working transport is a user-facing decision that deserves its own change and changelog entry, not a side effect of an SDK bump. Now tracked in #366.
(The plan also called for dropping the legacy CORS headers. They stay, because the endpoint serves both eras — but note `Mcp-Method`/`Mcp-Name` are **required and enforced today**, so those entries are load-bearing rather than forward-compatibility. See the correction below.)
## Two bugs this nearly shipped
**`SubscriptionBus.publish` is async.** The first version of `publish_change` called it without `await` — which delivers nothing, emits only a never-awaited warning, and would have passed every test as a silently dead subscriptions feature. mypy caught it.
**The live subscription test drove `subscribe_resource`.** It could only have failed against this build, and invisibly, since `addopts` excludes live tests from every normal run and from CI. It now opens a real `subscriptions/listen` stream.
## A correction to an earlier claim on this PR
An earlier revision of this description said mcp 2.0.0 "does not implement `Mcp-Method` / `Mcp-Name`". **That was wrong.** It came from a `rg` search that silently skipped the virtualenv because it is gitignored. They are implemented (`MCP_METHOD_HEADER` in `mcp/shared/inbound.py`) and enforced: a modern POST whose `Mcp-Method` disagrees with the body's method is rejected with `-32020`. The stale code comment is fixed in this branch.
## Verification
- **3733 passed, 213 skipped, 0 failed**, against the real ZIM fixture corpus (3675/217 at first review, before the base refresh brought the corpus job in). Skip count matches `main` exactly.
- **Live suite: 34 tests, 3 failures — the identical 3 that fail on `main`.** No live regressions.
- End-to-end over real HTTP: a real server process, stateless `server/discover`, an open `subscriptions/listen` stream, and both notification kinds arriving with correct URIs after real file changes on disk.
- Protocol conformance asserted over an in-memory client session in **both** eras: legacy `initialize` and modern `server/discover`.
- Cache hints verified on the wire, which is how their era-gating surfaced: the SDK stamps them only for modern clients, and legacy sessions correctly see none.
- black / isort / flake8 / mypy / bandit clean; docs rewritten and `test_docs_consistency` passing.
## Base refresh (2026-08-13)
`origin/main` moved to 2.7.0 (#363, #364) after this branch's base, so main is merged in as of `ebbca89`. #364's identity kwargs landed in the 1.x `fastmcp_kwargs` dict this PR deletes; they are re-homed onto the v2 constructor call, which takes `website_url` and `icons` directly — plus `title` and `description`, the two v2-only fields on the same identity surface. Its `completion/complete` module carried over verbatim, and its test file re-wired onto the v2 stream pair (the 1.x memory-session helper no longer exists) with snake_case wire-model attributes. mypy caught a third near-miss in the same family as the two below: `Completion(hasMore=)` — runtime-valid via alias, wrong for a codebase that standardized on snake_case. Merged-tree verification: 3695 passed / 0 failed / 213 skipped against the real corpus, all linters clean. With #363, this PR's CI now also runs the corpus-backed job — the ~54 corpus-dependent tests that skipped silently in earlier runs cover exactly the resource-read and search paths this PR rewrites.
## Third review pass (2026-08-15)
A review aimed at the paths tests don't reach — the branch was fully green at the time — found six defects and three pieces of drift. All fixed in `bb5e559`.
**Validation errors on `resources/read` reached clients as "Internal server error."** A `zim://{name}/entry/{path}` whose path `sanitize_input` rejects (empty after sanitisation, or over `INPUT_LIMIT_ENTRY_PATH`) raised `OpenZimMcpValidationError`, which is neither `MCPError` nor a `ResourceError`. Nothing downstream converted it, because `ResourceManager.get_resource` invokes `create_resource` *outside* the `try` that wraps `resource.read()` — so `modern_error_data` replaced it wholesale with a generic `-32603`. The caller lost the only actionable part of the message and read a malformed request as a retryable server fault. Now `INVALID_PARAMS` with the text intact, converted at the only layer that can. This is the same failure the sibling `ResourceNotFoundError` conversion three lines above was added to prevent; the second call site was missed.
**Replacement notifications never reached clients that subscribed with the spelling they had successfully read from.** `UriTemplate.match` percent-decodes before matching, so `zim://my archive` is a *working* `resources/read` — which means a client that built its URI from the `zim://files` listing rather than by RFC 6570 expansion gets a valid read and then subscribes with that same string. The watcher published only the encoded form, and SDK delivery is exact-string (`event_matches` does `event.uri in uris`), so that client sat on a URI nothing ever fires on: silence on every replacement, and with the new hour-long resource TTL, a stale overview for the life of the stream. Both spellings are now published when they differ; unreserved stems still publish exactly once. Note this is the flip side of the fix in `f547858` — that one made the *encoded* spelling deliver; this one covers the raw spelling that also reads.
**`publish_change` mapped every unrecognised change kind to `resources/updated`.** Only `CHANGE_LIST_CHANGED` was compared; `CHANGE_REPLACED` was defined but never matched, so a third watcher kind added later (a removal carrying `zim://files`, say) would have gone out as an `updated` for that URI — reintroducing exactly the list-membership/content conflation the 2026-07-28 split exists to end, at the one seam nothing asserted on. Both kinds are matched explicitly now; anything else is dropped with a warning.
**The per-stream subscription URI bound went missing, and the docstring claimed otherwise.** Deleting the 1.x registry took `MAX_URIS_TOTAL` / `MAX_URIS_PER_SESSION` with it, and this module's docstring said the SDK's `ListenHandler` was "the equivalent admission control." It is not: it caps concurrent streams (`max_subscriptions`) and per-stream backlog (`max_buffered_events`) and never inspects the requested URI set, which it then holds in a `frozenset` for the stream's lifetime. The real ceiling was 1024 streams × the transport's 4 MiB body cap — roughly three orders of magnitude looser than what it replaced, on a method the project's rate limiter does not cover (it wraps tool calls only). Restored as `install_bounded_listen_handler`, which swaps in a `ListenHandler` subclass that rejects an oversized set with `INVALID_PARAMS` before a slot is taken or an ack is sent — through the same private-registry seam already used to *withhold* the handler when subscriptions are off. The docstring now states what is and isn't bounded.
**Title-mode promotion leaked the zero-result recovery hints onto the hit it produced.** The empty-page promotion branch popped the stale `reason="0_hits"` but kept `_meta.suggestions`, which `_assemble_find_response` fills only for the no-results and fuzzy cases — its stated rule being that a confident hit carries none "so confident matches aren't muddled by alt-spelling noise." A promoted canonical is exactly such a hit, so the model was handed "did you mean X?" alongside the answer, inviting a second lookup for a query already resolved.
**An empty `M/<key>` metadata value rendered as a bare `## Content` heading.** The metadata presenter was a copy of `_render_entry_payload_text` that had dropped its `or "(No content)"` fallback (and diverged on the content-type default's casing), so an archive storing a key with an empty value produced output that read as a truncated response — the same silently-empty rendering the offset accounting was added to fix, in the surface that fix was written for. Both renderers now share one `_render_offset_and_body` builder, so the copy cannot drift again.
Three pieces of drift alongside them: `serve_streamable_http` re-registered `/healthz` and `/readyz` on every call (`custom_route` appends unconditionally, so a retry after a failed bind stacked unreachable duplicates holding live closures for the process lifetime — the pre-port `_custom_starlette_routes.extend` had the same shape); the per-URI TTL decision fully re-parsed every overview body — metadata, namespace summary, and up to a 2000-character main-page preview — on the event loop to answer one boolean, now short-circuited by a substring probe that still falls through to the exact check; and `OPENZIM_MCP_SUBSCRIPTIONS_ENABLED`'s description still documented the removed `resources/subscribe` handlers, three website pages still named `EnvelopeAwareFastMCP`, and `TIMEOUTS.SUBSCRIPTION_SEND_SECONDS` still documented an `asyncio.gather` fan-out over a session registry that no longer exists.
**Verification:** 16 new tests, each mutation-checked — every fix was reverted individually and its test confirmed to fail. **3733 passed / 0 failed / 213 skipped** against the real corpus (from 3717 before this pass; skip count unchanged). flake8 / isort / black / mypy / bandit clean, and the full pre-commit hook set passes.
**Left unfixed, deliberately:** `completion/complete` recursively globs every allowed directory on every request and is not covered by the rate limiter — `list_zim_files_data` walks the tree to build its cache-invalidation signature *before* consulting its own cache, so even a warm listing rescans, and a picker sees one full walk per keystroke. A short TTL memo fixes the cost but fails `test_completion_reflects_archives_added_after_startup`, which deliberately pins live reads so an operator dropping in an archive sees it immediately. Bounding the cost means accepting a staleness window, which is a product decision rather than a bug fix, so it is left for its own change. (Also left: `scanned_count` is patched onto the payload by the W-namespace caller rather than being a parameter of the shared `_new_scheme_browse_payload` builder — a recurrence risk, but today's behavior is correct.)
## Ninth pass (2026-08-19): the sweep before the cut
A four-dimension review — the new ping shim, docs drift, release mechanics, and a fresh-eyes tail over the full diff — with every finding adversarially verified, ran once the shim landed. The shim and the release mechanics came back clean. Four things did not:
**Pagination stalled forever when a page landed entirely inside a whitespace run.** `paged_slice_length` — the single source both the footer hint and `_meta.more_at_offset` derive from — returned 0 for an all-whitespace mid-article slice (`lead` is 0 past the top of the article and `rstrip` empties the rest), so both told the caller to re-request the offset it was already at: an infinite loop for any client following either, on any preformatted body with a whitespace run one page wide. Deferral now has a floor: such a page consumes its full slice and ships the run verbatim — deferring it to the next page defers it to the same page forever, and dropping it would fuse the words on either side, the exact defect the reassembly suite exists to prevent. That suite's own `nxt > offset` assert now covers the case.
**The suggestions cache kept its key while this release changed the payload.** The canonical-promotion fix (third pass) changed what `_generate_search_suggestions` produces, but `suggestions_data:v2b` survived — so an operator upgrading with `persistence_enabled` restored the 2.7.0 snapshot and kept serving the wrongly-promoted suggestions until TTL expiry, the embedded stat token blind to a change the archive didn't make. Bumped to `v2c` under the release's own rule (stated at the `entry:v3` and `browse_ns_data:v2e` bumps: a change to what a payload contains needs a new prefix), with a sweep-9 guard test pinning the retired spelling out of the source.
**The dependency range promised what the code cannot keep.** `mcp>=2.0,<3.0` admits any 2.x, but `sdk_compat.py` and the handler-registry installs are surgery on 2.0.0 internals; CI resolves the lockfile and stays green either way, while fresh installs (pip/uvx, Smithery, Docker) resolve the newest wheel the range admits — the lockfile-masks-range-defects failure mode. Held to `<2.1`; raising the ceiling is a deliberate bump PR that re-audits each seam, and the ping-shim canary says when the biggest one can go.
**Docs said things the branch made false.** The subscriptions page claimed delivery "no longer touches SDK internals" (the bounded listen handler — and now `sdk_compat.py` — are exactly that), told clients a raw non-ASCII stem "would never match" (the four-spelling publish exists precisely so it does), and presented the SDK's two stream caps as the only limits while the server's own pre-ack bound — 256 subscription URIs per stream, 2048 chars per URI, `INVALID_PARAMS` — went undocumented, including in the security page's defense-in-depth table, where the DoS-relevant numbers belong. And `FastMCP` — a name that does not exist in SDK v2 — survived in fourteen website references plus roughly twice that in code comments once a full grep ran; every one now names what ships, each behavior claim behind it re-verified against the installed 2.0.0 before renaming, with `sdk_compat.py`'s "FastMCP 4" (the third-party client framework) the one deliberate survivor.
**Verification for this pass:** each behavioral fix mutation-checked (test red with the fix reverted, green with it). Full suite **4058 passed / 0 failed / 213 skipped** against the real corpus — skip count unchanged, the growth from the third pass's 3733 being the tests sweeps four through eight added. Live suite over real HTTP: **27 passed / 0 failed** (16 corpus-conditional skips), now including the modern-keepalive ping; the 3 failures earlier passes recorded did not reproduce. flake8 / isort / black / mypy / bandit and the full pre-commit hook set clean.
## The release blocker, closed at our layer (2026-08-19)
**[python-sdk#3273](modelcontextprotocol/python-sdk#3273) held this PR in draft:** SDK 2.0.0's per-version method tables lack `("ping", "2026-07-28")`, so every keepalive from a modern-negotiated client — the clients this port exists to serve — died as `-32601` before the SDK's own ping handler was consulted. The gap is also wider than the issue states: `SERVER_RESULTS` lacks the row too, so patching only the request gate would have traded the clean error for an unhandled `KeyError` in the outbound sieve, mid-response. Both rows or neither.
Upstream still has no fix (2.0.0 remains the only release; no commit touches the tables), so this ships the escape hatch the hold was defined with: `sdk_compat.install_ping_keepalive_shim()`, run at server construction, copies the 2025-11-25 ping rows into both tables — ping's wire shape did not change in 2026; the gap is a missing entry, not a missing schema, and reusing the previous revision's models keeps the shim off the `mcp_types._v*` internals. The tables are `MappingProxyType` views that the SDK binds as call-time *defaults*, so neither rebinding the module attribute nor passing `surface=` from our layer can reach the runner's calls; the one seam every consumer shares is the dict under the proxy, and that surgery is confined to `sdk_compat.py` and its tests. The wire result is spec-correct without further help: the sieve passes the empty result through and the runner's own era backfill stamps `resultType: "complete"` and the `serverInfo` `_meta`.
**Retirement is enforced, not remembered.** A canary test captures the tables' pristine state at import — necessarily before any install can run — and fails the day the locked SDK defines the rows itself; deleting the shim is then a red build away, not a TODO. Wire tests assert the behavior in both eras in-memory, and the live suite now sends a keepalive over real HTTP against a spawned server process, where an in-memory test could not see an install that silently didn't happen. Mutation-checked both ways: with the install commented out, the in-memory test and the live HTTP test each fail with the exact upstream symptom (`-32601` from a real server).
(Secondary upstream issue [#3300](modelcontextprotocol/python-sdk#3300) — a transport leaked per politely-DELETEd legacy session — remains open, slow, dual-era-path-only, and not release-blocking.)
## What merging means
1. **Dropping `resources/subscribe` for 2025-era clients ships as designed.** The decision the hold deferred is made; the `BREAKING CHANGE:` footer below is its changelog framing.
2. **Merging cuts 3.0.0.** `feat!` on 2.7.0 is a major bump — with the keepalive gap closed, the timing of this merge is deliberately the timing of the major release.
## Phase 5 status (verified 2026-08-11)
- **`server.json` `$schema` needs no bump.** `2025-12-11` is still the only published registry revision — every 2026-dated URL 404s — and the registry schema does not encode MCP protocol revisions at all (zero occurrences of any protocol version string; it describes packaging and transport). The only unreleased draft change is a transport-URL template-variable relaxation, irrelevant to our stdio package entry. This checklist item rested on a false premise: server.json tracks the *registry's* schema evolution, not the protocol's.
- **`.mcpb` re-cut: clean, and the listing does not change.** Built on the v2 runtime, the bundle captures all 8 tools and its `manifest.json` is byte-identical to the one `main` produces. This also exercises the legacy `initialize` handshake through a real subprocess — `build_mcpb.py` speaks `protocolVersion: 2025-06-18` — so it is independent end-to-end evidence of dual-era support. Worth noting because the only test covering that path, `test_capture_tools_live_matches_advanced_surface`, is `@pytest.mark.live` and runs in neither a default run nor CI. (The bundle's sha256 differs from main's purely because v2 emits tool-object keys in a different order; same keys, same values, same byte length.)
- **CHANGELOG:** the repo squash-merges with `PR_BODY` as the commit message, so this description is the changelog source. The framing is the `BREAKING CHANGE:` footer below.
BREAKING CHANGE: requires MCP Python SDK v2 (`mcp>=2.0.0,<2.1` — held to 2.0.x while `sdk_compat.py` and the handler-registry seams depend on SDK internals; raising the ceiling is a deliberate bump that re-audits them) and adopts the 2026-07-28 protocol revision. The server answers both protocol eras from one endpoint, so 2025-era clients keep working for tools, resources, and prompts with no client change. Two things do break for them. this build no longer serves `resources/subscribe`, so a legacy client gets `-32601` and cannot receive change notifications from it. That is this server's choice, not an SDK limitation: the lowlevel `Server` still accepts a handler for the method and advertises the capability when one is registered. Restoring it would mean restoring the per-session subscriber registry that this change deletes. Subscriptions have always been HTTP-only here, so no stdio client is affected. And `zim://files` is no longer a valid subscription target, because a `.zim` file appearing or disappearing is now published as `resources/list_changed`, which carries no URI. Clients on the 2026-07-28 revision subscribe through `subscriptions/listen`: ask for `resourcesListChanged` to hear about archives appearing or disappearing, and list `zim://{name}` under `resourceSubscriptions` to hear about in-place replacements.1 parent ebbd78a commit 7e92b3a
123 files changed
Lines changed: 9823 additions & 1903 deletions
File tree
- openzim_mcp
- cli
- linkgraph
- tools
- zim
- tests
- linkgraph
- live
- website/src
- content/docs
- pages
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
28 | | - | |
29 | | - | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
30 | 31 | | |
31 | 32 | | |
32 | 33 | | |
33 | 34 | | |
| 35 | + | |
34 | 36 | | |
35 | 37 | | |
36 | 38 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
109 | | - | |
| 109 | + | |
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| |||
116 | 116 | | |
117 | 117 | | |
118 | 118 | | |
119 | | - | |
| 119 | + | |
120 | 120 | | |
121 | 121 | | |
122 | 122 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
| |||
795 | 796 | | |
796 | 797 | | |
797 | 798 | | |
798 | | - | |
799 | 799 | | |
800 | 800 | | |
801 | 801 | | |
802 | 802 | | |
| 803 | + | |
| 804 | + | |
| 805 | + | |
| 806 | + | |
| 807 | + | |
| 808 | + | |
| 809 | + | |
| 810 | + | |
| 811 | + | |
803 | 812 | | |
804 | 813 | | |
805 | 814 | | |
| |||
844 | 853 | | |
845 | 854 | | |
846 | 855 | | |
847 | | - | |
848 | | - | |
849 | | - | |
850 | | - | |
851 | | - | |
| 856 | + | |
| 857 | + | |
| 858 | + | |
| 859 | + | |
852 | 860 | | |
| 861 | + | |
| 862 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
19 | 20 | | |
20 | 21 | | |
21 | 22 | | |
| |||
39 | 40 | | |
40 | 41 | | |
41 | 42 | | |
42 | | - | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
43 | 62 | | |
44 | 63 | | |
45 | 64 | | |
| |||
109 | 128 | | |
110 | 129 | | |
111 | 130 | | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
112 | 136 | | |
113 | | - | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
114 | 145 | | |
115 | 146 | | |
116 | 147 | | |
| |||
185 | 216 | | |
186 | 217 | | |
187 | 218 | | |
188 | | - | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
189 | 239 | | |
190 | 240 | | |
191 | 241 | | |
| |||
195 | 245 | | |
196 | 246 | | |
197 | 247 | | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
198 | 258 | | |
199 | 259 | | |
200 | 260 | | |
201 | 261 | | |
202 | 262 | | |
203 | 263 | | |
204 | 264 | | |
| 265 | + | |
205 | 266 | | |
206 | 267 | | |
207 | 268 | | |
| |||
210 | 271 | | |
211 | 272 | | |
212 | 273 | | |
213 | | - | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
214 | 279 | | |
215 | | - | |
| 280 | + | |
| 281 | + | |
216 | 282 | | |
217 | 283 | | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
218 | 303 | | |
219 | 304 | | |
220 | 305 | | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
221 | 351 | | |
222 | 352 | | |
223 | 353 | | |
| |||
248 | 378 | | |
249 | 379 | | |
250 | 380 | | |
251 | | - | |
252 | | - | |
253 | | - | |
254 | | - | |
255 | | - | |
256 | | - | |
257 | | - | |
258 | | - | |
259 | | - | |
260 | | - | |
261 | | - | |
262 | | - | |
263 | | - | |
264 | | - | |
265 | | - | |
266 | | - | |
267 | | - | |
268 | | - | |
269 | | - | |
270 | | - | |
271 | | - | |
272 | | - | |
273 | | - | |
274 | | - | |
275 | | - | |
276 | | - | |
277 | | - | |
278 | | - | |
279 | | - | |
| 381 | + | |
280 | 382 | | |
281 | | - | |
282 | | - | |
283 | | - | |
284 | | - | |
285 | | - | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
286 | 394 | | |
287 | 395 | | |
288 | 396 | | |
| |||
411 | 519 | | |
412 | 520 | | |
413 | 521 | | |
414 | | - | |
| 522 | + | |
415 | 523 | | |
416 | 524 | | |
417 | 525 | | |
| |||
0 commit comments