uprev pyodide (#13)

Co-authored-by: David Montague <35119617+dmontagu@users.noreply.github.com>

Author: samuelcolvin

build/prepare_env.py

@@ -49,12 +49,12 @@ async def prepare_env(dependencies: list[str] | None) -> Success | Error:
     return Success(dependencies=dependencies)
 
 
-def dump_json(value: Any) -> str | None:
+def dump_json(value: Any, always_return_json: bool) -> str | None:
     from pydantic_core import to_json
 
     if value is None:
         return None
-    if isinstance(value, str):
+    if isinstance(value, str) and not always_return_json:
         return value
     else:
         return to_json(value, indent=2, fallback=_json_fallback).decode()

mcp_run_python/deno/deno.jsonc

@@ -18,8 +18,7 @@
     "@modelcontextprotocol/sdk": "npm:@modelcontextprotocol/sdk@^1.17.5",
     "@std/cli": "jsr:@std/cli@^1.0.15",
     "@std/path": "jsr:@std/path@^1.0.8",
-    // do NOT upgrade above this version until there is a workaround for https://github.com/pyodide/pyodide/pull/5621
-    "pyodide": "npm:pyodide@0.27.6",
+    "pyodide": "npm:pyodide@0.28.2",
     "zod": "npm:zod@^3.24.4"
   },
   "fmt": {

mcp_run_python/deno/deno.lock

@@ -76,7 +76,7 @@ function createServer(deps: string[], returnMode: string): McpServer {
 
 The code may be async, and the value on the last line will be returned as the return value.
 
-The code will be executed with Python 3.12.
+The code will be executed with Python 3.13.
 `
 
   let setLogLevel: LoggingLevel = 'emergency'
@@ -109,6 +109,7 @@ The code will be executed with Python 3.12.
         },
         { name: 'main.py', content: python_code },
         global_variables,
+        returnMode !== 'xml',
       )
       await Promise.all(logPromises)
       return {

mcp_run_python/deno/src/main.ts

@@ -26,11 +26,8 @@ export class RunCode {
     log: (level: LoggingLevel, data: string) => void,
     file?: CodeFile,
     globals?: Record<string, any>,
+    alwaysReturnJson: boolean = false,
   ): Promise<RunSuccess | RunError> {
-    // remove once we can upgrade to pyodide 0.27.7 and console.log is no longer used.
-    const realConsoleLog = console.log
-    console.log = (...args: any[]) => log('debug', args.join(' '))
-
     let pyodide: PyodideInterface
     let sys: any
     let prepareStatus: PrepareSuccess | PrepareError | undefined
@@ -51,9 +48,8 @@ export class RunCode {
       prepareStatus = prep.prepareStatus
     }
 
-    let runResult: RunSuccess | RunError
     if (prepareStatus && prepareStatus.kind == 'error') {
-      runResult = {
+      return {
         status: 'install-error',
         output: this.takeOutput(sys),
         error: prepareStatus.message,
@@ -64,27 +60,25 @@ export class RunCode {
           globals: pyodide.toPy({ ...(globals || {}), __name__: '__main__' }),
           filename: file.name,
         })
-        runResult = {
+        return {
           status: 'success',
           output: this.takeOutput(sys),
-          returnValueJson: preparePyEnv.dump_json(rawValue),
+          returnValueJson: preparePyEnv.dump_json(rawValue, alwaysReturnJson),
         }
       } catch (err) {
-        runResult = {
+        return {
           status: 'run-error',
           output: this.takeOutput(sys),
           error: formatError(err),
         }
       }
     } else {
-      runResult = {
+      return {
         status: 'success',
         output: this.takeOutput(sys),
         returnValueJson: null,
       }
     }
-    console.log = realConsoleLog
-    return runResult
   }
 
   async prepEnv(
@@ -107,9 +101,9 @@ export class RunCode {
     pyodide.loadPackage = (pkgs, options) =>
       origLoadPackage(pkgs, {
         // stop pyodide printing to stdout/stderr
-        messageCallback: (msg: string) => log('debug', `loadPackage: ${msg}`),
+        messageCallback: (msg: string) => log('debug', msg),
         errorCallback: (msg: string) => {
-          log('error', `loadPackage: ${msg}`)
+          log('error', msg)
           this.output.push(`install error: ${msg}`)
         },
         ...options,
@@ -205,7 +199,7 @@ function formatError(err: any): string {
   errStr = errStr.replace(/^PythonError: +/, '')
   // remove frames from inside pyodide
   errStr = errStr.replace(
-    / {2}File "\/lib\/python\d+\.zip\/_pyodide\/.*\n {4}.*\n(?: {4,}\^+\n)?/g,
+    / {2}File "\/lib\/python\d+\.zip\/_pyodide\/.*\n {4}.*\n(?: {4}.*\n)*/g,
     '',
   )
   return errStr
@@ -221,5 +215,5 @@ interface PrepareError {
 }
 interface PreparePyEnv {
   prepare_env: (files: CodeFile[]) => Promise<PrepareSuccess | PrepareError>
-  dump_json: (value: any) => string | null
+  dump_json: (value: any, always_return_json: boolean) => string | null
 }

mcp_run_python/deno/src/runCode.ts

@@ -80,13 +80,58 @@ class Foobar:
             ),
             id='print-error',
         ),
+        pytest.param(
+            [],
+            """\
+def foo():
+    1 / 0
+
+def bar():
+    foo()
+
+def baz():
+    bar()
+
+baz()""",
+            {},
+            snapshot(
+                {
+                    'status': 'run-error',
+                    'output': [],
+                    'error': """\
+Traceback (most recent call last):
+  File "main.py", line 10, in <module>
+    baz()
+    ~~~^^
+  File "main.py", line 8, in baz
+    bar()
+    ~~~^^
+  File "main.py", line 5, in bar
+    foo()
+    ~~~^^
+  File "main.py", line 2, in foo
+    1 / 0
+    ~~^~~
+ZeroDivisionError: division by zero
+""",
+                }
+            ),
+            id='traceback',
+        ),
         pytest.param(
             ['numpy'],
             'import numpy\nnumpy.array([1, 2, 3])',
             {},
             snapshot({'status': 'success', 'output': [], 'return_value': [1, 2, 3]}),
             id='return-numpy-success',
         ),
+        pytest.param(
+            [],
+            'import sys\nsys.version_info',
+            {},
+            snapshot({'status': 'success', 'output': [], 'return_value': [3, 13, 2, 'final', 0]}),
+            id='python-version',
+        ),
     ],
 )
 async def test_sandbox(deps: list[str], code: str, locals: dict[str, Any], expected: Any):
@@ -145,7 +190,7 @@ def log_handler(level: str, message: str):
     assert next(((level, msg) for level, msg in logs if level == 'debug'), None) == snapshot(
         (
             'debug',
-            'loadPackage: Loading annotated-types, micropip, packaging, pydantic, pydantic_core, typing-extensions',
+            'Loading annotated-types, micropip, pydantic, pydantic_core, typing-extensions',
         ),
     )
     assert [(level, msg) for level, msg in logs if level == 'info'][-1] == snapshot(('info', 'hello 123'))