Update openmc/mcp_output/mcp_plugin/mcp_service.py

openmc/mcp_output/mcp_plugin/mcp_service.py

@@ -114,7 +114,10 @@ def create_material(
 def create_surface(
     surface_type: str,
     boundary_type: str = "transmission",
-    **params
+    x0: float = 0.0,
+    y0: float = 0.0,
+    z0: float = 0.0,
+    r: float = 1.0
 ) -> dict:
     """
     Create an OpenMC surface.
@@ -122,10 +125,10 @@ def create_surface(
     Parameters:
     - surface_type: Type of surface (Sphere, ZCylinder, XPlane, YPlane, ZPlane, etc.)
     - boundary_type: Boundary condition (transmission, vacuum, reflective, periodic)
-    - params: Surface-specific parameters:
-      - For Sphere: x0, y0, z0, r (radius)
-      - For ZCylinder: x0, y0, r
-      - For XPlane/YPlane/ZPlane: x0/y0/z0
+    - x0: X coordinate of center (for Sphere, XCylinder) or position (for XPlane)
+    - y0: Y coordinate of center (for Sphere, YCylinder) or position (for YPlane)
+    - z0: Z coordinate of center (for Sphere, ZCylinder) or position (for ZPlane)
+    - r: Radius (for Sphere, Cylinder surfaces)
 
     Returns:
     - dict: Surface information.
@@ -134,30 +137,39 @@ def create_surface(
         return {"success": False, "result": None, "error": "OpenMC not available"}
     
     try:
-        surface_classes = {
-            "sphere": openmc.Sphere,
-            "zcylinder": openmc.ZCylinder,
-            "xcylinder": openmc.XCylinder,
-            "ycylinder": openmc.YCylinder,
-            "xplane": openmc.XPlane,
-            "yplane": openmc.YPlane,
-            "zplane": openmc.ZPlane,
-            "xcone": openmc.XCone,
-            "ycone": openmc.YCone,
-            "zcone": openmc.ZCone,
-        }
-        
         surface_type_lower = surface_type.lower()
-        if surface_type_lower not in surface_classes:
+        surface = None
+        params = {}
+        
+        if surface_type_lower == "sphere":
+            surface = openmc.Sphere(x0=x0, y0=y0, z0=z0, r=r, boundary_type=boundary_type)
+            params = {"x0": x0, "y0": y0, "z0": z0, "r": r}
+        elif surface_type_lower == "zcylinder":
+            surface = openmc.ZCylinder(x0=x0, y0=y0, r=r, boundary_type=boundary_type)
+            params = {"x0": x0, "y0": y0, "r": r}
+        elif surface_type_lower == "xcylinder":
+            surface = openmc.XCylinder(y0=y0, z0=z0, r=r, boundary_type=boundary_type)
+            params = {"y0": y0, "z0": z0, "r": r}
+        elif surface_type_lower == "ycylinder":
+            surface = openmc.YCylinder(x0=x0, z0=z0, r=r, boundary_type=boundary_type)
+            params = {"x0": x0, "z0": z0, "r": r}
+        elif surface_type_lower == "xplane":
+            surface = openmc.XPlane(x0=x0, boundary_type=boundary_type)
+            params = {"x0": x0}
+        elif surface_type_lower == "yplane":
+            surface = openmc.YPlane(y0=y0, boundary_type=boundary_type)
+            params = {"y0": y0}
+        elif surface_type_lower == "zplane":
+            surface = openmc.ZPlane(z0=z0, boundary_type=boundary_type)
+            params = {"z0": z0}
+        else:
+            available = ["sphere", "zcylinder", "xcylinder", "ycylinder", "xplane", "yplane", "zplane"]
             return {
                 "success": False,
                 "result": None,
-                "error": f"Unknown surface type: {surface_type}. Available: {list(surface_classes.keys())}"
+                "error": f"Unknown surface type: {surface_type}. Available: {available}"
             }
         
-        surface_class = surface_classes[surface_type_lower]
-        surface = surface_class(boundary_type=boundary_type, **params)
-        
         return {
             "success": True,
             "result": {