Merge branch 'main' into main

Author: BlackDadd77

.git-blame-ignore-revs

@@ -1,2 +1,5 @@
 # Applied 120 line-length rule to all files: https://github.com/modelcontextprotocol/python-sdk/pull/856
 543961968c0634e93d919d509cce23a1d6a56c21
+
+# Added 100% code coverage baseline with pragma comments: https://github.com/modelcontextprotocol/python-sdk/pull/1553
+89e9c43acf7e23cf766357d776ec1ce63ac2c58e

.gitattribute

@@ -1,2 +1,2 @@
 # Generated
-uv.lock  linguist-generated=true
+uv.lock  linguist-generated=true

.github/workflows/shared.yml

@@ -38,9 +38,9 @@ jobs:
         python-version: ["3.10", "3.11", "3.12", "3.13"]
         dep-resolution:
           - name: lowest-direct
-            install-flags: "--resolution lowest-direct"
+            install-flags: "--upgrade --resolution lowest-direct"
           - name: highest
-            install-flags: "--frozen"
+            install-flags: "--upgrade --resolution highest"
         os: [ubuntu-latest, windows-latest]
 
     steps:
@@ -55,10 +55,11 @@ jobs:
       - name: Install the project
         run: uv sync ${{ matrix.dep-resolution.install-flags }} --all-extras --python ${{ matrix.python-version }}
 
-      - name: Run pytest
-        run: uv run ${{ matrix.dep-resolution.install-flags }} --no-sync pytest
-        env:
-          UV_RESOLUTION: ${{ matrix.dep-resolution.name == 'lowest-direct' && 'lowest-direct' || 'highest' }}
+      - name: Run pytest with coverage
+        run: |
+          uv run --frozen --no-sync coverage run -m pytest
+          uv run --frozen --no-sync coverage combine
+          uv run --frozen --no-sync coverage report
 
   readme-snippets:
     runs-on: ubuntu-latest

.pre-commit-config.yaml

@@ -1,6 +1,11 @@
 fail_fast: true
 
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
+    hooks:
+      - id: end-of-file-fixer
+
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v3.1.0
     hooks:

examples/clients/simple-chatbot/mcp_simple_chatbot/requirements.txt

@@ -1,4 +1,4 @@
 python-dotenv>=1.0.0
 requests>=2.31.0
 mcp>=1.0.0
-uvicorn>=0.32.1
+uvicorn>=0.32.1

examples/clients/simple-chatbot/mcp_simple_chatbot/servers_config.json

@@ -9,4 +9,4 @@
       "args": ["-y", "@modelcontextprotocol/server-puppeteer"]
     }
   }
-}
+}

examples/servers/everything-server/mcp_everything_server/server.py

@@ -166,6 +166,38 @@ async def test_elicitation(message: str, ctx: Context[ServerSession, None]) -> s
         return f"Elicitation not supported or error: {str(e)}"
 
 
+class SEP1034DefaultsSchema(BaseModel):
+    """Schema for testing SEP-1034 elicitation with default values for all primitive types"""
+
+    name: str = Field(default="John Doe", description="User name")
+    age: int = Field(default=30, description="User age")
+    score: float = Field(default=95.5, description="User score")
+    status: str = Field(
+        default="active",
+        description="User status",
+        json_schema_extra={"enum": ["active", "inactive", "pending"]},
+    )
+    verified: bool = Field(default=True, description="Verification status")
+
+
+@mcp.tool()
+async def test_elicitation_sep1034_defaults(ctx: Context[ServerSession, None]) -> str:
+    """Tests elicitation with default values for all primitive types (SEP-1034)"""
+    try:
+        # Request user input with defaults for all primitive types
+        result = await ctx.elicit(message="Please provide user information", schema=SEP1034DefaultsSchema)
+
+        # Type-safe discriminated union narrowing using action field
+        if result.action == "accept":
+            content = result.data.model_dump_json()
+        else:  # decline or cancel
+            content = "{}"
+
+        return f"Elicitation result: action={result.action}, content={content}"
+    except Exception as e:
+        return f"Elicitation not supported or error: {str(e)}"
+
+
 @mcp.tool()
 def test_error_handling() -> str:
     """Tests error response handling"""

examples/servers/simple-prompt/mcp_simple_prompt/__init__.py

@@ -1 +0,0 @@
-

examples/servers/simple-resource/mcp_simple_resource/__init__.py

@@ -1 +0,0 @@
-

examples/servers/simple-tool/mcp_simple_tool/__init__.py

@@ -1 +0,0 @@
-