refactor: add ToolConfig pydantic model, replace tool_config dicts

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

agents/tools.py

@@ -97,11 +97,11 @@ class GenerateGcodeTool(BaseTool):
     args_schema: Type[BaseModel] = GenerateGcodeInput
 
     def _run(self, operations: list[str], tool_diameter: float = 6.0, post_processor: str = "grbl") -> str:
-        from core.cam import generate_gcode
+        from core.cam import generate_gcode, ToolConfig
         shape = get_last_shape()
         if shape is None:
             return json.dumps({"success": False, "error": "No shape available. Run Execute CadQuery Code first."})
-        tool_config = {"diameter": tool_diameter, "h_feed": 800, "v_feed": 200, "speed": 18000}
+        tool_config = ToolConfig(diameter=tool_diameter, h_feed=800, v_feed=200, speed=18000)
         result = generate_gcode(
             shape=shape, operations=operations,
             tool_config=tool_config, post_processor=post_processor,

core/cam.py

@@ -9,12 +9,20 @@ from __future__ import annotations
 from pydantic import BaseModel, Field
 
 
+class ToolConfig(BaseModel):
+    """CNC tool configuration for G-code generation."""
+    diameter: float = 6.0
+    h_feed: float = 800
+    v_feed: float = 200
+    speed: float = 18000
+
+
 class CAMResult(BaseModel):
     """Result of G-code generation from a CadQuery shape."""
     success: bool
     gcode: str | None = None
     operations: list[str] = Field(default_factory=list)
-    tool_config: dict = Field(default_factory=dict)
+    tool_config: ToolConfig = Field(default_factory=ToolConfig)
     post_processor: str = "grbl"
     error: str | None = None
 
@@ -29,25 +37,25 @@ class CAMPlan(BaseModel):
     tool_speed: float = Field(default=18000, description="Spindle speed RPM")
     post_processor: str = Field(default="grbl", description="G-code format")
 
-    def to_tool_config(self) -> dict:
-        """Convert to the dict format expected by generate_gcode()."""
-        return {
-            "diameter": self.tool_diameter,
-            "h_feed": self.tool_h_feed,
-            "v_feed": self.tool_v_feed,
-            "speed": self.tool_speed,
-        }
+    def to_tool_config(self) -> ToolConfig:
+        """Convert to ToolConfig for generate_gcode()."""
+        return ToolConfig(
+            diameter=self.tool_diameter,
+            h_feed=self.tool_h_feed,
+            v_feed=self.tool_v_feed,
+            speed=self.tool_speed,
+        )
 
 
 from config.settings import settings
 
 
-def _get_default_tool_config() -> dict:
+def _get_default_tool_config() -> ToolConfig:
     """Load default roughing tool config from config.yaml cam section."""
     roughing = settings.cam.tools.get("roughing")
     if roughing:
-        return roughing.model_dump()
-    return {"diameter": 6, "h_feed": 800, "v_feed": 200, "speed": 18000}
+        return ToolConfig(**roughing.model_dump())
+    return ToolConfig()
 
 
 def _get_default_post_processor() -> str:
@@ -63,7 +71,7 @@ def _get_stock_offset() -> float:
 def generate_gcode(
     shape,
     operations: list[str],
-    tool_config: dict | None = None,
+    tool_config: ToolConfig | None = None,
     post_processor: str | None = None,
     stock_offset_mm: float | None = None,
 ) -> CAMResult:
@@ -73,7 +81,7 @@ def generate_gcode(
         shape: A cq.Workplane object from the executor.
         operations: List of operation names: "adaptive", "pocket", "profile",
                     "face", "drill", "surface", "waterline".
-        tool_config: Dict with diameter, h_feed, v_feed, speed. Uses config defaults if None.
+        tool_config: ToolConfig with diameter, h_feed, v_feed, speed. Uses config defaults if None.
         post_processor: Post-processor name (e.g. "grbl", "linuxcnc"). Uses config default if None.
         stock_offset_mm: Stock offset from bounding box in mm. Uses config default if None.
 
@@ -105,10 +113,10 @@ def generate_gcode(
 
     try:
         tool = Endmill(
-            diameter=tool_config.get("diameter", 6),
-            h_feed=tool_config.get("h_feed", 800),
-            v_feed=tool_config.get("v_feed", 200),
-            speed=tool_config.get("speed", 18000),
+            diameter=tool_config.diameter,
+            h_feed=tool_config.h_feed,
+            v_feed=tool_config.v_feed,
+            speed=tool_config.speed,
         )
 
         so = stock_offset_mm

tests/test_cam.py

@@ -1,6 +1,27 @@
 """Tests for core/cam.py — CAM engine."""
 
-from core.cam import CAMResult
+from core.cam import CAMResult, ToolConfig
+
+
+class TestToolConfig:
+    def test_defaults(self):
+        tc = ToolConfig()
+        assert tc.diameter == 6.0
+        assert tc.h_feed == 800
+        assert tc.v_feed == 200
+        assert tc.speed == 18000
+
+    def test_custom_values(self):
+        tc = ToolConfig(diameter=3.0, h_feed=400, v_feed=100, speed=24000)
+        assert tc.diameter == 3.0
+        assert tc.h_feed == 400
+        assert tc.v_feed == 100
+        assert tc.speed == 24000
+
+    def test_model_dump(self):
+        tc = ToolConfig(diameter=10.0, h_feed=1000, v_feed=300, speed=12000)
+        d = tc.model_dump()
+        assert d == {"diameter": 10.0, "h_feed": 1000, "v_feed": 300, "speed": 12000}
 
 
 class TestCAMResult:
@@ -9,7 +30,7 @@ class TestCAMResult:
             success=True,
             gcode="G21 G90\nG00 X0 Y0 Z10\nM30",
             operations=["pocket", "profile"],
-            tool_config={"diameter": 6, "h_feed": 800},
+            tool_config=ToolConfig(diameter=6, h_feed=800),
             post_processor="grbl",
         )
         assert r.success is True
@@ -26,16 +47,20 @@ class TestCAMResult:
     def test_model_dump(self):
         r = CAMResult(
             success=True, gcode="G21 G90\nM30",
-            operations=["pocket"], tool_config={"diameter": 6},
+            operations=["pocket"], tool_config=ToolConfig(diameter=6),
         )
         d = r.model_dump()
         assert d["success"] is True
         assert d["gcode"] == "G21 G90\nM30"
         assert d["operations"] == ["pocket"]
-        assert d["tool_config"] == {"diameter": 6}
+        assert d["tool_config"] == {"diameter": 6.0, "h_feed": 800, "v_feed": 200, "speed": 18000}
         assert d["post_processor"] == "grbl"
         assert d["error"] is None
 
+    def test_default_tool_config_is_toolconfig(self):
+        r = CAMResult(success=True)
+        assert isinstance(r.tool_config, ToolConfig)
+
 
 from unittest.mock import patch, MagicMock
 from core.cam import generate_gcode
@@ -48,7 +73,7 @@ class TestGenerateGcode:
         result = generate_gcode(
             shape=mock_shape,
             operations=["pocket"],
-            tool_config={"diameter": 6, "h_feed": 800, "v_feed": 200, "speed": 18000},
+            tool_config=ToolConfig(diameter=6, h_feed=800, v_feed=200, speed=18000),
             post_processor="grbl",
         )
         assert result.success is False
@@ -71,13 +96,25 @@ class TestGenerateGcode:
             tool_config=None,
         )
         assert result.tool_config is not None
-        assert "diameter" in result.tool_config
+        assert isinstance(result.tool_config, ToolConfig)
+        assert result.tool_config.diameter == 6.0
 
     def test_uses_default_post_processor(self):
         mock_shape = MagicMock()
         result = generate_gcode(shape=mock_shape, operations=["pocket"])
         assert result.post_processor == "grbl"
 
+    def test_tool_config_attribute_access(self):
+        mock_shape = MagicMock()
+        tc = ToolConfig(diameter=3.0, h_feed=400, v_feed=100, speed=24000)
+        result = generate_gcode(
+            shape=mock_shape,
+            operations=["pocket"],
+            tool_config=tc,
+        )
+        assert result.tool_config.diameter == 3.0
+        assert result.tool_config.h_feed == 400
+
 
 from core.cam import CAMPlan
 
@@ -107,9 +144,8 @@ class TestCAMPlan:
     def test_to_tool_config(self):
         plan = CAMPlan(operations=["pocket"])
         config = plan.to_tool_config()
-        assert config == {
-            "diameter": 6.0,
-            "h_feed": 800,
-            "v_feed": 200,
-            "speed": 18000,
-        }
+        assert isinstance(config, ToolConfig)
+        assert config.diameter == 6.0
+        assert config.h_feed == 800
+        assert config.v_feed == 200
+        assert config.speed == 18000