Merge pull request #62 from ph3t/ph3t/fix-mcp-errors

Ensure correct order and handling of function arguments and literals

Author: evilsocket

nerve/tools/mcp/compiler.py

@@ -97,9 +97,11 @@ async def create_function_body(client: Client, mcp_tool: Tool) -> tuple[str, dic
             type_defs.update(args_def)
 
         if "default" in arg_props:
-            arg["default"] = arg_props["default"]
+            arg["default"] = repr(arg_props["default"])
 
         typed_args.append(arg)
+    
+    typed_args.sort(key=lambda arg: 'default' in arg)
 
     # load the template from the same directory as this script
     template_path = os.path.join(os.path.dirname(__file__), "body.j2")

nerve/tools/mcp/compilter_test.py nerve/tools/mcp/compiler_test.pynerve/tools/mcp/compilter_test.py renamed to nerve/tools/mcp/compiler_test.py

@@ -89,6 +89,60 @@ async def calculate(operation: Annotated[str, "The operation to perform"], value
             func_body,
         )
 
+    async def test_create_function_body_with_unsorted_string_and_int_arguments_with_default(self) -> None:
+        # Mock the client
+        client = MagicMock(spec=Client)
+
+        # Create a mock tool with string and int arguments
+        mock_tool = Tool(
+            name="calculate",
+            description="A function that performs a calculation",
+            inputSchema={
+                "type": "object",
+                "properties": {
+                    "value": {"type": "integer", "description": "The value to calculate with", "default": 10},
+                    "operation": {"type": "string", "description": "The operation to perform"},
+                },
+                "required": ["operation"],
+            },
+        )
+
+        func_body, type_defs = await create_function_body(client, mock_tool)
+
+        self.assertIn(
+            '''
+async def calculate(operation: Annotated[str, "The operation to perform"], value: Annotated[int, "The value to calculate with"] = 10) -> Any:
+    """A function that performs a calculation"""
+'''.strip(),
+            func_body,
+        )
+    
+    async def test_create_function_body_with_string_default_colliding_with_builtin(self) -> None:
+        client = MagicMock(spec=Client)
+
+        mock_tool = Tool(
+            name="test_state_tool",
+            description="A tool to test default string handling.",
+            inputSchema={
+                "type": "object",
+                "properties": {
+                    "state": {
+                        "type": "string",
+                        "description": "The state of the entity.",
+                        "default": "open",  # This default value could be misinterpreted as the 'open' function.
+                    },
+                },
+            },
+        )
+
+        func_body, type_defs = await create_function_body(client, mock_tool)
+
+        # Default value to be correctly quoted as a string literal: 'open'
+        self.assertIn(
+            """async def test_state_tool(state: Annotated[str, "The state of the entity."] = 'open') -> Any:""",
+            func_body,
+        )
+
     async def test_create_function_body_with_complex_nested_arguments(self) -> None:
         # Mock the client
         client = MagicMock(spec=Client)