From 4f36581a5cae4a46aaba3514cddc29de8867c473 Mon Sep 17 00:00:00 2001
From: TerminalMan <84923604+SecretiveShell@users.noreply.github.com>
Date: Sun, 29 Dec 2024 16:41:30 +0000
Subject: [PATCH 1/2] add text encoding params to STDIO client

---
 src/mcp/client/stdio.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/mcp/client/stdio.py b/src/mcp/client/stdio.py
index e79a816e..e894ae92 100644
--- a/src/mcp/client/stdio.py
+++ b/src/mcp/client/stdio.py
@@ -1,6 +1,7 @@
 import os
 import sys
 from contextlib import asynccontextmanager
+from typing import Literal
 
 import anyio
 import anyio.lowlevel
@@ -65,6 +66,20 @@ 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):
@@ -93,7 +108,7 @@ 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()
 
@@ -115,7 +130,7 @@ 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()
 

From 99727a97ae476a26fbac8fcf202a68e525100519 Mon Sep 17 00:00:00 2001
From: TerminalMan <84923604+SecretiveShell@users.noreply.github.com>
Date: Sun, 29 Dec 2024 17:08:09 +0000
Subject: [PATCH 2/2] ruff format

---
 src/mcp/client/stdio.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/mcp/client/stdio.py b/src/mcp/client/stdio.py
index e894ae92..2eaa3475 100644
--- a/src/mcp/client/stdio.py
+++ b/src/mcp/client/stdio.py
@@ -77,7 +77,8 @@ class StdioServerParameters(BaseModel):
     """
     The text encoding error handler.
 
-    See https://docs.python.org/3/library/codecs.html#codec-base-classes for explanations of possible values
+    See https://docs.python.org/3/library/codecs.html#codec-base-classes for
+    explanations of possible values
     """
 
 
@@ -108,7 +109,11 @@ async def stdout_reader():
         try:
             async with read_stream_writer:
                 buffer = ""
-                async for chunk in TextReceiveStream(process.stdout, encoding=server.encoding, errors=server.encoding_error_handler):
+                async for chunk in TextReceiveStream(
+                    process.stdout,
+                    encoding=server.encoding,
+                    errors=server.encoding_error_handler,
+                ):
                     lines = (buffer + chunk).split("\n")
                     buffer = lines.pop()
 
@@ -130,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(encoding=server.encoding, errors=server.encoding_error_handler))
+                    await process.stdin.send(
+                        (json + "\n").encode(
+                            encoding=server.encoding,
+                            errors=server.encoding_error_handler,
+                        )
+                    )
         except anyio.ClosedResourceError:
             await anyio.lowlevel.checkpoint()