fix(server.py): improve error handling for missing fields in file operations to provide clearer error messages

test(server.py): update tests to check for RuntimeError on missing fields in file operations

Author: tumfwkm

src/mcp_text_editor/server.py

@@ -175,35 +175,23 @@ async def run_tool(self, arguments: Dict[str, Any]) -> Sequence[TextContent]:
                 return [TextContent(type="text", text=json.dumps(results, indent=2))]
 
             for file_operation in files:
-                file_path = None
+                if "path" not in file_operation:
+                    raise RuntimeError("Missing required field: path")
+                if "file_hash" not in file_operation:
+                    raise RuntimeError("Missing required field: file_hash")
+                if "patches" not in file_operation:
+                    raise RuntimeError("Missing required field: patches")
+
                 try:
-                    try:
-                        file_path = file_operation["path"]
-                    except KeyError as e:
-                        raise RuntimeError(
-                            "Missing required field: path in file operation"
-                        ) from e
-
-                    try:
-                        file_hash = file_operation["file_hash"]
-                    except KeyError as e:
-                        raise RuntimeError(
-                            f"Missing required field: file_hash for file {file_path}"
-                        ) from e
-
-                    # Ensure patches list is not empty
-                    try:
-                        patches = file_operation["patches"]
-                    except KeyError as e:
-                        raise RuntimeError(
-                            f"Missing required field: patches for file {file_path}"
-                        ) from e
+                    file_path = file_operation["path"]
+                    file_hash = file_operation["file_hash"]
+                    patches = file_operation["patches"]
 
                     if not patches:
                         results[file_path] = {
                             "result": "error",
                             "reason": "Empty patches list",
-                            "file_hash": None,
+                            "file_hash": file_hash,
                             "content": None,
                         }
                         continue
@@ -214,15 +202,22 @@ async def run_tool(self, arguments: Dict[str, Any]) -> Sequence[TextContent]:
                     )
                     results[file_path] = result
                 except Exception as e:
-                    if file_path:
-                        results[file_path] = {
-                            "result": "error",
-                            "reason": str(e),
-                            "file_hash": None,
-                            "content": None,
-                        }
-                    else:
-                        raise
+                    current_hash = None
+                    if "path" in file_operation:
+                        file_path = file_operation["path"]
+                        try:
+                            current_content, _, _, current_hash, _, _ = (
+                                await self.editor.read_file_contents(file_path)
+                            )
+                        except Exception:
+                            current_hash = None
+
+                    results[file_path if "path" in file_operation else "unknown"] = {
+                        "result": "error",
+                        "reason": str(e),
+                        "file_hash": current_hash,
+                        "content": None,
+                    }
 
             return [TextContent(type="text", text=json.dumps(results, indent=2))]
         except Exception as e:

tests/test_server.py

@@ -310,14 +310,13 @@ async def test_edit_contents_handler_malformed_input():
 @pytest.mark.asyncio
 async def test_edit_contents_handler_empty_patches():
     """Test EditTextFileContents handler with empty patches."""
-    edit_args = {"files": [{"path": "test.txt", "hash": "any_hash", "patches": []}]}
+    edit_args = {
+        "files": [{"path": "test.txt", "file_hash": "any_hash", "patches": []}]
+    }
     result = await edit_contents_handler.run_tool(edit_args)
     edit_results = json.loads(result[0].text)
     assert edit_results["test.txt"]["result"] == "error"
-    assert edit_results["test.txt"]["file_hash"] is None
-    edit_results = json.loads(result[0].text)
-    assert edit_results["test.txt"]["result"] == "error"
-    assert edit_results["test.txt"]["file_hash"] is None
+    assert edit_results["test.txt"]["reason"] == "Empty patches list"
 
 
 @pytest.mark.asyncio
@@ -361,10 +360,10 @@ async def test_edit_contents_handler_missing_hash(tmp_path):
         ]
     }
 
-    result = await edit_contents_handler.run_tool(edit_args)
-    edit_results = json.loads(result[0].text)
-    assert edit_results[str(test_file)]["result"] == "error"
-    assert "Missing required field: file_hash" in edit_results[str(test_file)]["reason"]
+    # file_hashが欠けている場合は例外が発生することを確認
+    with pytest.raises(RuntimeError) as exc_info:
+        await edit_contents_handler.run_tool(edit_args)
+    assert "Missing required field: file_hash" in str(exc_info.value)
 
 
 @pytest.mark.asyncio
@@ -402,7 +401,6 @@ async def test_edit_contents_handler_missing_patches():
     """Test EditTextFileContents handler with missing patches field."""
     edit_args = {"files": [{"path": "test.txt", "file_hash": "any_hash"}]}
 
-    result = await edit_contents_handler.run_tool(edit_args)
-    edit_results = json.loads(result[0].text)
-    assert edit_results["test.txt"]["result"] == "error"
-    assert "Missing required field: patches" in edit_results["test.txt"]["reason"]
+    with pytest.raises(RuntimeError) as exc_info:
+        await edit_contents_handler.run_tool(edit_args)
+    assert "Missing required field: patches" in str(exc_info.value)