Skip to content

Commit 713d107

Browse files
author
Armaan Sandhu
committed
Merge remote-tracking branch 'origin/main' into feat/propagate-callback-exceptions
# Conflicts: # src/mcp/shared/session.py
2 parents 934ddc2 + ed39e73 commit 713d107

100 files changed

Lines changed: 1178 additions & 13922 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
File renamed without changes.

‎AGENTS.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@
6565
tests. Don't silence warnings from your own code; fix the underlying cause.
6666
Scoped `ignore::` entries for upstream libraries are acceptable in
6767
`pyproject.toml` with a comment explaining why.
68+
- New features from the 2026-07-28 spec must have a matching test in the
69+
[conformance suite](https://github.com/modelcontextprotocol/conformance)
70+
that passes against this SDK (CI runs it via
71+
`.github/workflows/conformance.yml`). If no matching test exists, stop and
72+
tell the user so they can raise an issue on the conformance repo.
6873

6974
### Coverage
7075

‎README.v2.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,11 @@ In the inspector UI, connect to `http://localhost:8000/mcp`.
207207

208208
## What is MCP?
209209

210-
The [Model Context Protocol (MCP)](https://modelcontextprotocol.io) lets you build servers that expose data and functionality to LLM applications in a secure, standardized way. Think of it like a web API, but specifically designed for LLM interactions. MCP servers can:
210+
The [Model Context Protocol (MCP)](https://modelcontextprotocol.io) lets you build servers that expose data and functionality to LLM applications in a secure, standardized way. Think of it like a web API, but specifically designed for LLM interactions.
211+
212+
MCP follows a **client-server model**, where LLM applications act as clients and connect to MCP servers to access capabilities such as data retrieval and tool execution in a consistent format.
213+
214+
MCP servers can:
211215

212216
- Expose data through **Resources** (think of these sort of like GET endpoints; they are used to load information into the LLM's context)
213217
- Provide functionality through **Tools** (sort of like POST endpoints; they are used to execute code or otherwise produce a side effect)
@@ -2489,7 +2493,6 @@ MCP servers declare capabilities during initialization:
24892493
## Documentation
24902494

24912495
- [API Reference](https://modelcontextprotocol.github.io/python-sdk/api/)
2492-
- [Experimental Features (Tasks)](https://modelcontextprotocol.github.io/python-sdk/experimental/tasks/)
24932496
- [Model Context Protocol documentation](https://modelcontextprotocol.io)
24942497
- [Model Context Protocol specification](https://modelcontextprotocol.io/specification/latest)
24952498
- [Officially supported servers](https://github.com/modelcontextprotocol/servers)

‎docs/experimental/index.md‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)