add more tests (#14)

Author: samuelcolvin

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "uv_build"
 [project]
 name = "mcp-run-python"
 description = "Model Context Protocol server to run Python code in a sandbox."
-version = "0.0.20"
+version = "0.0.21"
 authors = [{ name = "Samuel Colvin", email = "samuel@pydantic.dev" }]
 license = "MIT"
 readme = "README.md"

tests/test_mcp_servers.py

@@ -81,15 +81,21 @@ async def test_list_tools(run_mcp_session: Callable[[list[str]], AbstractAsyncCo
         assert tool.name == 'run_python_code'
         assert tool.description
         assert tool.description.startswith('Tool to execute Python code and return stdout, stderr, and return value.')
-        assert tool.inputSchema['properties'] == snapshot(
+        assert tool.inputSchema == snapshot(
             {
-                'python_code': {'type': 'string', 'description': 'Python code to run'},
-                'global_variables': {
-                    'type': 'object',
-                    'additionalProperties': {},
-                    'default': {},
-                    'description': 'Map of global variables in context when the code is executed',
+                'type': 'object',
+                'properties': {
+                    'python_code': {'type': 'string', 'description': 'Python code to run'},
+                    'global_variables': {
+                        'type': 'object',
+                        'additionalProperties': {},
+                        'default': {},
+                        'description': 'Map of global variables in context when the code is executed',
+                    },
                 },
+                'required': ['python_code'],
+                'additionalProperties': False,
+                '$schema': 'http://json-schema.org/draft-07/schema#',
             }
         )
 

tests/test_sandbox.py

@@ -17,7 +17,7 @@ class Foobar:
 
 
 @pytest.mark.parametrize(
-    'deps,code,locals,expected',
+    'deps,code,globals,expected',
     [
         pytest.param(
             [],
@@ -26,6 +26,13 @@ class Foobar:
             snapshot({'status': 'success', 'output': [], 'return_value': 2}),
             id='return-value-success',
         ),
+        pytest.param(
+            [],
+            '"foobar"',
+            {},
+            snapshot({'status': 'success', 'output': [], 'return_value': 'foobar'}),
+            id='return-string',
+        ),
         pytest.param(
             [],
             'print(123)',
@@ -38,28 +45,35 @@ class Foobar:
             'a',
             {'a': [1, 2, 3]},
             snapshot({'status': 'success', 'output': [], 'return_value': [1, 2, 3]}),
-            id='access-local-variables',
+            id='access-global-variables',
         ),
         pytest.param(
             [],
             'a + b',
             {'a': 4, 'b': 5},
             snapshot({'status': 'success', 'output': [], 'return_value': 9}),
-            id='multiple-locals',
+            id='multiple-globals',
         ),
         pytest.param(
             [],
             'print(f)',
             {'f': Foobar(1, '2', b'3')},
             snapshot({'status': 'success', 'output': ["{'a': 1, 'b': '2', 'c': '3'}"], 'return_value': None}),
-            id='print-complex-local',
+            id='print-complex-global',
+        ),
+        pytest.param(
+            [],
+            'f',
+            {'f': Foobar(1, '2', b'3')},
+            snapshot({'status': 'success', 'output': [], 'return_value': {'a': 1, 'b': '2', 'c': '3'}}),
+            id='return-complex-global',
         ),
         pytest.param(
             [],
             'f',
             {'f': Foobar(1, '2', b'3')},
             snapshot({'status': 'success', 'output': [], 'return_value': {'a': 1, 'b': '2', 'c': '3'}}),
-            id='return-complex-local',
+            id='return-complex-global',
         ),
         pytest.param(
             [],
@@ -134,9 +148,9 @@ def baz():
         ),
     ],
 )
-async def test_sandbox(deps: list[str], code: str, locals: dict[str, Any], expected: Any):
+async def test_sandbox(deps: list[str], code: str, globals: dict[str, Any], expected: Any):
     async with code_sandbox(dependencies=deps) as sandbox:
-        result = await sandbox.eval(code, locals)
+        result = await sandbox.eval(code, globals)
         assert result == expected