Fix sampling validation test expectations

Author: Jianke LIN

tests/interaction/lowlevel/test_sampling.py

@@ -396,9 +396,7 @@ async def sampling_callback(
 
     assert result == snapshot(
         CallToolResult(
-            content=[
-                TextContent(text="ValueError: The last message must contain only tool_result content if any is present")
-            ]
+            content=[TextContent(text="ValueError: A message must contain only tool_result content if any is present")]
         )
     )
 

tests/server/test_session.py

@@ -200,11 +200,9 @@ async def test_send_request_skips_the_surface_gate_when_method_absent_at_version
 @pytest.mark.anyio
 async def test_create_message_tool_result_validation():
     """Test tool_use/tool_result validation in create_message."""
-    dispatcher = StubDispatcher(
-        result={"role": "assistant", "content": [{"type": "text", "text": "ok"}], "model": "m"}
-    )
+    outbound = StubOutbound(result={"role": "assistant", "content": [{"type": "text", "text": "ok"}], "model": "m"})
     session = _make_session(
-        dispatcher, capabilities=ClientCapabilities(sampling=SamplingCapability(tools=SamplingToolsCapability()))
+        outbound, capabilities=ClientCapabilities(sampling=SamplingCapability(tools=SamplingToolsCapability()))
     )
     tool = types.Tool(name="test_tool", input_schema={"type": "object"})
     text = types.TextContent(type="text", text="hello")
@@ -213,7 +211,7 @@ async def test_create_message_tool_result_validation():
 
     # Case 1: tool_result mixed with other content
     with pytest.raises(ValueError, match="only tool_result content"):
-        await session.create_message(
+        await session.create_message(  # pyright: ignore[reportDeprecated]
             messages=[
                 types.SamplingMessage(role="user", content=text),
                 types.SamplingMessage(role="assistant", content=tool_use),
@@ -225,15 +223,15 @@ async def test_create_message_tool_result_validation():
 
     # Case 2: tool_result without previous message
     with pytest.raises(ValueError, match="requires a previous message"):
-        await session.create_message(
+        await session.create_message(  # pyright: ignore[reportDeprecated]
             messages=[types.SamplingMessage(role="user", content=tool_result)],
             max_tokens=100,
             tools=[tool],
         )
 
     # Case 3: tool_result without previous tool_use
     with pytest.raises(ValueError, match="do not match any tool_use"):
-        await session.create_message(
+        await session.create_message(  # pyright: ignore[reportDeprecated]
             messages=[
                 types.SamplingMessage(role="user", content=text),
                 types.SamplingMessage(role="user", content=tool_result),
@@ -244,7 +242,7 @@ async def test_create_message_tool_result_validation():
 
     # Case 4: mismatched tool IDs
     with pytest.raises(ValueError, match="ids of tool_result blocks and tool_use blocks"):
-        await session.create_message(
+        await session.create_message(  # pyright: ignore[reportDeprecated]
             messages=[
                 types.SamplingMessage(role="user", content=text),
                 types.SamplingMessage(role="assistant", content=tool_use),
@@ -259,7 +257,7 @@ async def test_create_message_tool_result_validation():
 
     # Case 4b: earlier mismatched tool result with a later plain message
     with pytest.raises(ValueError, match="ids of tool_result blocks and tool_use blocks"):
-        await session.create_message(
+        await session.create_message(  # pyright: ignore[reportDeprecated]
             messages=[
                 types.SamplingMessage(role="assistant", content=tool_use),
                 types.SamplingMessage(
@@ -273,14 +271,14 @@ async def test_create_message_tool_result_validation():
         )
 
     # Case 5: text-only message with tools (no tool_results) - passes validation
-    await session.create_message(
+    await session.create_message(  # pyright: ignore[reportDeprecated]
         messages=[types.SamplingMessage(role="user", content=text)],
         max_tokens=100,
         tools=[tool],
     )
 
     # Case 6: valid matching tool_result/tool_use IDs - passes validation
-    await session.create_message(
+    await session.create_message(  # pyright: ignore[reportDeprecated]
         messages=[
             types.SamplingMessage(role="user", content=text),
             types.SamplingMessage(role="assistant", content=tool_use),
@@ -293,7 +291,7 @@ async def test_create_message_tool_result_validation():
     # Case 7: validation runs even without `tools` parameter
     # (tool loop continuation may omit tools while containing tool_result)
     with pytest.raises(ValueError, match="do not match any tool_use"):
-        await session.create_message(
+        await session.create_message(  # pyright: ignore[reportDeprecated]
             messages=[
                 types.SamplingMessage(role="user", content=text),
                 types.SamplingMessage(role="user", content=tool_result),
@@ -303,10 +301,12 @@ async def test_create_message_tool_result_validation():
 
     # Case 8: empty messages list - skips validation entirely
     no_tools_session = _make_session(
-        StubDispatcher(result={"role": "assistant", "content": {"type": "text", "text": "ok"}, "model": "m"}),
+        StubOutbound(result={"role": "assistant", "content": {"type": "text", "text": "ok"}, "model": "m"}),
         capabilities=ClientCapabilities(sampling=SamplingCapability(tools=SamplingToolsCapability())),
     )
-    await no_tools_session.create_message(messages=[], max_tokens=100)
+    await no_tools_session.create_message(  # pyright: ignore[reportDeprecated]
+        messages=[], max_tokens=100
+    )
 
 
 @pytest.mark.anyio