Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add text encoding params to STDIO client #120

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions src/mcp/client/stdio.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os
import sys
from contextlib import asynccontextmanager
from typing import Literal

import anyio
import anyio.lowlevel
Expand Down Expand Up @@ -65,6 +66,21 @@ class StdioServerParameters(BaseModel):
If not specified, the result of get_default_environment() will be used.
"""

encoding: str = "utf-8"
"""
The text encoding used when sending/receiving messages to the server

defaults to utf-8
"""

encoding_error_handler: Literal["strict", "ignore", "replace"] = "strict"
"""
The text encoding error handler.

See https://docs.python.org/3/library/codecs.html#codec-base-classes for
explanations of possible values
"""


@asynccontextmanager
async def stdio_client(server: StdioServerParameters):
Expand Down Expand Up @@ -93,7 +109,11 @@ async def stdout_reader():
try:
async with read_stream_writer:
buffer = ""
async for chunk in TextReceiveStream(process.stdout):
async for chunk in TextReceiveStream(
process.stdout,
encoding=server.encoding,
errors=server.encoding_error_handler,
):
lines = (buffer + chunk).split("\n")
buffer = lines.pop()

Expand All @@ -115,7 +135,12 @@ async def stdin_writer():
async with write_stream_reader:
async for message in write_stream_reader:
json = message.model_dump_json(by_alias=True, exclude_none=True)
await process.stdin.send((json + "\n").encode())
await process.stdin.send(
(json + "\n").encode(
encoding=server.encoding,
errors=server.encoding_error_handler,
)
)
except anyio.ClosedResourceError:
await anyio.lowlevel.checkpoint()

Expand Down