Include YAML path in validation errors

src/pvi/device.py

@@ -19,6 +19,7 @@
     BaseModel,
     ConfigDict,
     Field,
+    ValidationError,
     field_validator,
     model_validator,
 )
@@ -463,7 +464,14 @@ def deserialize(cls, yaml: Path) -> Device:
 
         """
         serialized = cls.validate_yaml(yaml)
-        return cls(**serialized)
+        try:
+            return cls(**serialized)
+        except ValidationError as e:
+            # Re-raise exception with YAML file path included
+            raise ValidationError.from_exception_data(
+                f"{e.title} {yaml}",
+                e.errors(),  # type: ignore
+            ) from None
 
     def deserialize_parents(self, yaml_paths: list[Path]):
         """Populate Device with Components from Device yaml of parent classes.

tests/bad.pvi.device.yaml

@@ -0,0 +1,44 @@
+label: label
+parent: parent
+children:
+
+- type: Group
+  name: Parameters
+  layout:
+    type: Grid
+    labelled: true
+  children:
+
+  - type: SignalW
+    name: WidthUnits
+    write_pv: WIDTH:UNITS
+    write_widget:
+      type: ComboBox
+
+  - type: SignalRW
+    name: Width
+    write_pv: WIDTH
+    write_widget:
+      type: TextWrite
+    read_pv: WIDTH_RBV
+    read_widget:
+      type: TextRead
+
+- type: SignalW
+  name: Table
+  write_pv: TABLE
+  write_widget:
+    type: TableWrite
+    widgets:
+
+    - type: CheckBox
+
+    - type: ComboBox
+
+    - type: TextWrite
+
+- type: SignalR
+  name: OutA
+  red_pv: OUTA
+  read_widget:
+    type: LED

tests/test_device_serialization.py

@@ -55,6 +55,7 @@ def device():
 
 
 DEVICE_YAML = Path(__file__).parent / "test.pvi.device.yaml"
+BAD_DEVICE_YAML = Path(__file__).parent / "bad.pvi.device.yaml"
 
 
 def test_serialize(device: Device):
@@ -72,6 +73,12 @@ def test_deserialize(device: Device):
     assert d == device
 
 
+def test_deserialize_raises(tmp_path):
+    # Check that an exception is raised with the file name included
+    with pytest.raises(ValidationError, match=str(BAD_DEVICE_YAML)):
+        Device.deserialize(BAD_DEVICE_YAML)
+
+
 def test_validate_fails():
     class NotTypedModel(BaseModel):
         pass