working on client tooling

Author: samuelcolvin

mcp-run-python/src/main.ts

@@ -87,7 +87,7 @@ response.text
 `
   if (callbacks) {
     toolDescription += `
-The following functions are globally available to call:
+The following functions are already defined and available to call:
 
 \`\`\`python
 ${callbacks}

mcp-run-python/src/prepare_env.py

@@ -139,7 +139,7 @@ def _json_fallback(value: Any) -> Any:
     elif module == 'pyodide.ffi':
         return value.to_py()
     else:
-        return repr(value)
+        return str(value)
 
 
 def _add_extra_dependencies(dependencies: list[str]) -> list[str]:

mcp-run-python/test_mcp_servers.py

@@ -19,9 +19,9 @@
 DENO_ARGS = [
     'run',
     '-N',
+    '--node-modules-dir=auto',
     '-R=mcp-run-python/node_modules',
     '-W=mcp-run-python/node_modules',
-    '--node-modules-dir=auto',
     'mcp-run-python/src/main.ts',
 ]
 

mcp-run-python/uprev.py

@@ -1,31 +1,33 @@
 import re
 import sys
-
 from pathlib import Path
 
 if len(sys.argv) != 2:
-    print("Usage: python uprev.py <new_version>")
+    print('Usage: python uprev.py <new_version>')
     sys.exit(1)
 
 new_version = sys.argv[1]
 this_dir = Path(__file__).parent
+root_dir = (this_dir / '..').resolve()
 
 path_regexes = [
     (this_dir / 'deno.jsonc', r'^\s+"version": "(.+?)"'),
     (this_dir / 'src/main.ts', "^const VERSION = '(.+?)'"),
-    (this_dir / '../pydantic_ai_slim/pydantic_ai/mcp_run_python.py', "^MCP_RUN_PYTHON_VERSION = '(.+?)'")
+    (root_dir / 'pydantic_ai_slim/pydantic_ai/mcp_run_python.py', "^MCP_RUN_PYTHON_VERSION = '(.+?)'"),
 ]
 
-def replace_version(m: re.Match[str]) -> str:
-    version = m.group(1)
-    return m.group(0).replace(version, new_version)
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     for path, regex in path_regexes:
-        path = path.resolve()
+        path_pretty = path.relative_to(root_dir)
+
+        def replace_version(m: re.Match[str]) -> str:
+            version = m.group(1)
+            print(f'Updated version from {version} to {new_version} in {path_pretty}')
+            return m.group(0).replace(version, new_version)
+
         content = path.read_text()
         content, count = re.subn(regex, replace_version, content, count=1, flags=re.M)
         if count != 1:
-            raise ValueError(f"Failed to update version in {path}")
+            raise ValueError(f'Failed to update version in {path}')
         path.write_text(content)
-        print(f"Updated version to {new_version} in {path}")

pydantic_ai_slim/pydantic_ai/mcp_run_python.py

@@ -0,0 +1,65 @@
+import ast
+import inspect
+from collections.abc import Awaitable, Sequence
+from typing import Any, Callable, Literal
+
+from .mcp import MCPServerStdio
+
+__all__ = ('mcp_run_python_stdio',)
+
+MCP_RUN_PYTHON_VERSION = '0.0.13'
+Callback = Callable[..., Awaitable[Any]]
+
+
+def mcp_run_python_stdio(callbacks: Sequence[Callback] = (), *, local_code: bool = False) -> MCPServerStdio:
+    """Prepare a server server connection using `'stdio'` transport.
+
+    Args:
+        callbacks: A sequence of callback functions to be register on the server.
+        local_code: Whether to run local `mcp-run-python` code.
+
+    Returns:
+        A server connection definition.
+    """
+    return MCPServerStdio('deno', args=_deno_args('stdio', callbacks, local_code))
+
+
+def _deno_args(mode: Literal['stdio', 'sse'], callbacks: Sequence[Callback], local_code: bool) -> list[str]:
+    path_prefix = 'mcp-run-python/' if local_code else ''
+    args = [
+        'run',
+        '-N',
+        f'-R={path_prefix}node_modules',
+        f'-W={path_prefix}node_modules',
+        '--node-modules-dir=auto',
+        'mcp-run-python/src/main.ts' if local_code else f'jsr:@pydantic/mcp-run-python@{MCP_RUN_PYTHON_VERSION}',
+        mode,
+    ]
+
+    if callbacks:
+        sigs = '\n\n'.join(_callback_signature(cb) for cb in callbacks)
+        args += ['--callbacks', sigs]
+    return args
+
+
+def _callback_signature(func: Callback) -> str:
+    """Extract the signature of a function.
+
+    This simply means getting the source code of the function, and removing the body of the function while keeping the docstring.
+    """
+    source = inspect.getsource(func)
+    ast_mod = ast.parse(source)
+    assert isinstance(ast_mod, ast.Module), f'Expected Module, got {type(ast_mod)}'
+    assert len(ast_mod.body) == 1, f'Expected single function definition, got {len(ast_mod.body)}'
+    f = ast_mod.body[0]
+    assert isinstance(f, ast.AsyncFunctionDef), f'Expected an async function, got {type(func)}'
+    lines = lines = source.splitlines()
+    e = f.body[0]
+    # if the first expression is a docstring, keep it and no need for an ellipsis as the body
+    if isinstance(e, ast.Expr) and isinstance(e.value, ast.Constant) and isinstance(e.value.value, str):
+        e = f.body[1]
+        lines = lines[: e.lineno - 1]
+    else:
+        lines = lines[: e.lineno - 1]
+        lines.append(e.col_offset * ' ' + '...')
+    return '\n'.join(lines)