Add reconvert command to merge PVs into an existing Device

src/pvi/__main__.py

@@ -179,6 +179,25 @@ def regroup(
     device.serialize(device_path)
 
 
+@app.command()
+def reconvert(
+    device_path: Annotated[
+        Path, typer.Argument(..., help="Path to the device.yaml file to add to")
+    ],
+    templates: Annotated[
+        list[Path],
+        typer.Option(..., "--template", help="Paths of templates to add PVs from"),
+    ],
+):
+    """Add PVs to an existing device.yaml file based on extra / updated templates."""
+    device = Device.deserialize(device_path)
+    template_components = TemplateConverter(templates).convert()
+
+    device.merge_components(template_components)
+
+    device.serialize(device_path)
+
+
 # test with: pipenv run python -m pvi
 if __name__ == "__main__":
     app()

src/pvi/device.py

@@ -300,6 +300,9 @@ class Component(Named):
     def get_label(self):
         return self.label or to_title_case(self.name)
 
+    def __eq__(self, other: object) -> bool:
+        return isinstance(other, Component) and self.name == other.name
+
 
 class Signal(Component, AccessModeMixin):
     """Base signal type representing one or two PVs of a `Device`."""
@@ -492,23 +495,32 @@ def deserialize_parents(self, yaml_paths: list[Path]):
         if self.parent is None or self.parent == "asynPortDriver":
             return
 
-        parent_parameters = find_components(self.parent, yaml_paths)
-        for node in parent_parameters:
+        parent_components = find_components(self.parent, yaml_paths)
+        self.merge_components(parent_components)
+
+    def merge_components(self, components: Tree) -> None:
+        existing_components = list(walk(self.children))
+        for node in components:
             if isinstance(node, Group):
-                for param_group in self.children:
-                    if not isinstance(param_group, Group):
+                for group in self.children:
+                    if not isinstance(group, Group):
                         continue
-                    elif param_group.name == node.name:
-                        param_group.children = list(node.children) + list(
-                            param_group.children
-                        )
-                        break  # Groups merged - skip to next parent group
+                    elif group.name == node.name:
+                        group.children = list(node.children) + list(group.children)
+                        break  # Groups merged - skip to next group
 
                 else:  # No break - Did not find the Group
+                    # Remove any signals already in device
+                    new_components: list[ComponentUnion] = []
+                    for component in walk([node]):
+                        if component not in existing_components:
+                            new_components.append(component)
+                    node.children = new_components
+
                     # Inherit as a new Group
                     self.children = list(self.children) + [node]
-                    continue  # Skip to next parent group
 
+                    continue  # Skip to next group
             else:
                 # Node is an individual AsynParameter - just append it
                 self.children = list(self.children) + [node]

tests/reconvert/input/simDetector.pvi.device.yaml

@@ -0,0 +1 @@
+../../convert/output/simDetector.pvi.device.yaml