From dafe12e69929b48655098d5dcb106e6428d9eebc Mon Sep 17 00:00:00 2001 From: BrokenDuck Date: Sat, 30 Aug 2025 00:15:22 +0200 Subject: [PATCH 1/5] Update pyodide --- mcp-run-python/deno.json | 3 +-- mcp-run-python/deno.lock | 12 ++++++------ mcp-run-python/src/runCode.ts | 10 +++++----- mcp-run-python/test_mcp_servers.py | 7 +++++-- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/mcp-run-python/deno.json b/mcp-run-python/deno.json index 3943e1bae2..f7e7e33de3 100644 --- a/mcp-run-python/deno.json +++ b/mcp-run-python/deno.json @@ -16,8 +16,7 @@ "@modelcontextprotocol/sdk": "npm:@modelcontextprotocol/sdk@^1.15.1", "@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.2" }, "fmt": { diff --git a/mcp-run-python/deno.lock b/mcp-run-python/deno.lock index 0bd8680730..9ca305a531 100644 --- a/mcp-run-python/deno.lock +++ b/mcp-run-python/deno.lock @@ -9,7 +9,7 @@ "npm:@types/node@*": "22.12.0", "npm:@types/node@22.12.0": "22.12.0", "npm:eslint@*": "9.23.0", - "npm:pyodide@0.27.6": "0.27.6", + "npm:pyodide@0.28.2": "0.28.2", "npm:zod@^3.24.2": "3.24.2" }, "jsr": { @@ -719,8 +719,8 @@ "punycode@2.3.1": { "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==" }, - "pyodide@0.27.6": { - "integrity": "sha512-ahiSHHs6iFKl2f8aO1wALINAlMNDLAtb44xCI87GQyH2tLDk8F8VWip3u1ZNIyglGSCYAOSFzWKwS1f9gBFVdg==", + "pyodide@0.28.2": { + "integrity": "sha512-2BrZHrALvhYZfIuTGDHOvyiirHNLziHfBiBb1tpBFzLgAvDBb2ACxNPFFROCOzLnqapORmgArDYY8mJmMWH1Eg==", "dependencies": [ "ws" ] @@ -895,8 +895,8 @@ "wrappy@1.0.2": { "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, - "ws@8.18.2": { - "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==" + "ws@8.18.3": { + "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==" }, "yocto-queue@0.1.0": { "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" @@ -916,7 +916,7 @@ "jsr:@std/cli@^1.0.15", "jsr:@std/path@^1.0.8", "npm:@modelcontextprotocol/sdk@^1.15.1", - "npm:pyodide@0.27.6", + "npm:pyodide@0.28.2", "npm:zod@^3.24.2" ] } diff --git a/mcp-run-python/src/runCode.ts b/mcp-run-python/src/runCode.ts index 691c3c860e..4dff4fa0ba 100644 --- a/mcp-run-python/src/runCode.ts +++ b/mcp-run-python/src/runCode.ts @@ -13,10 +13,10 @@ export async function runCode( files: CodeFile[], log: (level: LoggingLevel, data: string) => void, ): Promise { - // remove once we can upgrade to pyodide 0.27.7 and console.log is no longer used. - const realConsoleLog = console.log - // deno-lint-ignore no-explicit-any - console.log = (...args: any[]) => log('debug', args.join(' ')) + // // remove once we can upgrade to pyodide 0.27.7 and console.log is no longer used. + // const realConsoleLog = console.log; + // // deno-lint-ignore no-explicit-any + // console.log = (...args: any[]) => log("debug", args.join(" ")); const output: string[] = [] const pyodide = await loadPyodide({ @@ -90,7 +90,7 @@ export async function runCode( } sys.stdout.flush() sys.stderr.flush() - console.log = realConsoleLog + // console.log = realConsoleLog; return runResult } diff --git a/mcp-run-python/test_mcp_servers.py b/mcp-run-python/test_mcp_servers.py index 3fd72927f1..3d3fb9599e 100644 --- a/mcp-run-python/test_mcp_servers.py +++ b/mcp-run-python/test_mcp_servers.py @@ -171,6 +171,8 @@ async def test_list_tools(mcp_session: ClientSession) -> None: run-error Traceback (most recent call last): + ...<9 lines>... + .run_async(globals, locals) File "main.py", line 1, in print(unknown) ^^^^^^^ @@ -225,7 +227,8 @@ async def logging_callback(params: types.LoggingMessageNotificationParams) -> No \ """ assert content.text == expected_output - assert len(logs) >= 18 + assert len(logs) >= 16 assert re.search( - r"debug: Didn't find package numpy\S+?\.whl locally, attempting to load from", '\n'.join(logs) + r"debug: loadPackage: Didn't find package numpy\S*\.whl locally, attempting to load from", + '\n'.join(logs), ) From 01584da99af8c29a72e87c3af01341324090d6e5 Mon Sep 17 00:00:00 2001 From: BrokenDuck Date: Sat, 30 Aug 2025 00:23:12 +0200 Subject: [PATCH 2/5] Run Make --- .../test_known_model_names.yaml | 48 +++---------------- 1 file changed, 7 insertions(+), 41 deletions(-) diff --git a/tests/models/cassettes/test_model_names/test_known_model_names.yaml b/tests/models/cassettes/test_model_names/test_known_model_names.yaml index 67e098800b..3ce8127621 100644 --- a/tests/models/cassettes/test_model_names/test_known_model_names.yaml +++ b/tests/models/cassettes/test_model_names/test_known_model_names.yaml @@ -99,7 +99,7 @@ interactions: alt-svc: - h3=":443"; ma=86400 content-length: - - '762' + - '99' content-type: - application/json referrer-policy: @@ -107,45 +107,11 @@ interactions: strict-transport-security: - max-age=3600; includeSubDomains parsed_body: - data: - - created: 0 - id: llama-4-maverick-17b-128e-instruct - object: model - owned_by: Cerebras - - created: 0 - id: qwen-3-32b - object: model - owned_by: Cerebras - - created: 0 - id: qwen-3-235b-a22b-instruct-2507 - object: model - owned_by: Cerebras - - created: 0 - id: llama-4-scout-17b-16e-instruct - object: model - owned_by: Cerebras - - created: 0 - id: gpt-oss-120b - object: model - owned_by: Cerebras - - created: 0 - id: qwen-3-coder-480b - object: model - owned_by: Cerebras - - created: 0 - id: llama-3.3-70b - object: model - owned_by: Cerebras - - created: 0 - id: llama3.1-8b - object: model - owned_by: Cerebras - - created: 0 - id: qwen-3-235b-a22b-thinking-2507 - object: model - owned_by: Cerebras - object: list + code: wrong_api_key + message: Wrong API Key + param: api_key + type: invalid_request_error status: - code: 200 - message: OK + code: 401 + message: Unauthorized version: 1 From b4ea0e5980e1d6b45bef641e8b7ff224cce6bf75 Mon Sep 17 00:00:00 2001 From: BrokenDuck Date: Sat, 30 Aug 2025 00:37:47 +0200 Subject: [PATCH 3/5] Run Make --- .../test_known_model_names.yaml | 42 ++----------------- 1 file changed, 4 insertions(+), 38 deletions(-) diff --git a/tests/models/cassettes/test_model_names/test_known_model_names.yaml b/tests/models/cassettes/test_model_names/test_known_model_names.yaml index ff38fa8e87..3ce8127621 100644 --- a/tests/models/cassettes/test_model_names/test_known_model_names.yaml +++ b/tests/models/cassettes/test_model_names/test_known_model_names.yaml @@ -107,44 +107,10 @@ interactions: strict-transport-security: - max-age=3600; includeSubDomains parsed_body: - data: - - created: 0 - id: qwen-3-32b - object: model - owned_by: Cerebras - - created: 0 - id: qwen-3-coder-480b - object: model - owned_by: Cerebras - - created: 0 - id: qwen-3-235b-a22b-thinking-2507 - object: model - owned_by: Cerebras - - created: 0 - id: qwen-3-235b-a22b-instruct-2507 - object: model - owned_by: Cerebras - - created: 0 - id: gpt-oss-120b - object: model - owned_by: Cerebras - - created: 0 - id: llama-3.3-70b - object: model - owned_by: Cerebras - - created: 0 - id: llama-4-scout-17b-16e-instruct - object: model - owned_by: Cerebras - - created: 0 - id: llama-4-maverick-17b-128e-instruct - object: model - owned_by: Cerebras - - created: 0 - id: llama3.1-8b - object: model - owned_by: Cerebras - object: list + code: wrong_api_key + message: Wrong API Key + param: api_key + type: invalid_request_error status: code: 401 message: Unauthorized From 77158f3bbcd9851cfbc0f66f58b20401bc759a11 Mon Sep 17 00:00:00 2001 From: BrokenDuck Date: Mon, 1 Sep 2025 20:30:21 +0200 Subject: [PATCH 4/5] Remove comments --- mcp-run-python/src/runCode.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mcp-run-python/src/runCode.ts b/mcp-run-python/src/runCode.ts index 4dff4fa0ba..bd7fd9ae13 100644 --- a/mcp-run-python/src/runCode.ts +++ b/mcp-run-python/src/runCode.ts @@ -13,11 +13,6 @@ export async function runCode( files: CodeFile[], log: (level: LoggingLevel, data: string) => void, ): Promise { - // // remove once we can upgrade to pyodide 0.27.7 and console.log is no longer used. - // const realConsoleLog = console.log; - // // deno-lint-ignore no-explicit-any - // console.log = (...args: any[]) => log("debug", args.join(" ")); - const output: string[] = [] const pyodide = await loadPyodide({ stdout: (msg) => { From db14769cbb838817de699e448c04766098210352 Mon Sep 17 00:00:00 2001 From: BrokenDuck Date: Tue, 2 Sep 2025 10:42:56 +0200 Subject: [PATCH 5/5] Remove other comment --- mcp-run-python/deno.lock | 12 +++++++++++- mcp-run-python/src/runCode.ts | 1 - 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mcp-run-python/deno.lock b/mcp-run-python/deno.lock index 295e7da112..4c76b79f5b 100644 --- a/mcp-run-python/deno.lock +++ b/mcp-run-python/deno.lock @@ -5,6 +5,7 @@ "jsr:@std/internal@^1.0.10": "1.0.10", "jsr:@std/path@^1.0.8": "1.1.2", "npm:@modelcontextprotocol/sdk@^1.17.4": "1.17.4_express@5.1.0_zod@3.25.76", + "npm:@types/node@*": "24.2.0", "npm:@types/node@22.12.0": "22.12.0", "npm:pyodide@0.28.2": "0.28.2", "npm:zod@^3.24.2": "3.25.76" @@ -44,7 +45,13 @@ "@types/node@22.12.0": { "integrity": "sha512-Fll2FZ1riMjNmlmJOdAyY5pUbkftXslB5DgEzlIuNaiWhXd00FhWxVC/r4yV/4wBb9JfImTu+jiSvXTkJ7F/gA==", "dependencies": [ - "undici-types" + "undici-types@6.20.0" + ] + }, + "@types/node@24.2.0": { + "integrity": "sha512-3xyG3pMCq3oYCNg7/ZP+E1ooTaGB4cG8JWRsqqOYQdbWNY4zbaV0Ennrd7stjiJEFZCaybcIgpTjJWHRfBSIDw==", + "dependencies": [ + "undici-types@7.10.0" ] }, "accepts@2.0.0": { @@ -500,6 +507,9 @@ "undici-types@6.20.0": { "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==" }, + "undici-types@7.10.0": { + "integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==" + }, "unpipe@1.0.0": { "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==" }, diff --git a/mcp-run-python/src/runCode.ts b/mcp-run-python/src/runCode.ts index bd7fd9ae13..dc067e9776 100644 --- a/mcp-run-python/src/runCode.ts +++ b/mcp-run-python/src/runCode.ts @@ -85,7 +85,6 @@ export async function runCode( } sys.stdout.flush() sys.stderr.flush() - // console.log = realConsoleLog; return runResult }