Make name separator configurable

src/ophyd_async/core/_device.py

@@ -97,7 +97,7 @@ def log(self) -> LoggerAdapter:
             getLogger("ophyd_async.devices"), {"ophyd_async_device_name": self.name}
         )
 
-    def set_name(self, name: str):
+    def set_name(self, name: str, separator: str = "-"):
         """Set ``self.name=name`` and each ``self.child.name=name+"-child"``.
 
         Parameters
@@ -110,8 +110,8 @@ def set_name(self, name: str):
         if "log" in self.__dict__:
             del self.log
         for child_name, child in self.children():
-            child_name = f"{self.name}-{child_name.strip('_')}" if self.name else ""
-            child.set_name(child_name)
+            child_name = f"{self.name}{separator}{child_name}" if self.name else ""
+            child.set_name(child_name, separator)
 
     def __setattr__(self, name: str, value: Any) -> None:
         # Bear in mind that this function is called *a lot*, so

src/ophyd_async/epics/demo/_mover.py

@@ -37,8 +37,8 @@ def __init__(self, prefix: str, name="") -> None:
 
         super().__init__(name=name)
 
-    def set_name(self, name: str):
-        super().set_name(name)
+    def set_name(self, name: str, separator: str = "-"):
+        super().set_name(name, separator)
         # Readback should be named the same as its parent in read()
         self.readback.set_name(name)
 

src/ophyd_async/epics/motor.py

@@ -91,8 +91,8 @@ def __init__(self, prefix: str, name="") -> None:
 
         super().__init__(name=name)
 
-    def set_name(self, name: str):
-        super().set_name(name)
+    def set_name(self, name: str, separator: str = "-"):
+        super().set_name(name, separator)
         # Readback should be named the same as its parent in read()
         self.user_readback.set_name(name)
 

tests/core/test_device.py

@@ -102,7 +102,7 @@ async def test_children_of_device_have_set_names_and_get_connected(
 ):
     assert parent.name == "parent"
     assert parent.child1.name == "parent-child1"
-    assert parent._child2.name == "parent-child2"
+    assert parent._child2.name == "parent-_child2"
     assert parent.dict_with_children.name == "parent-dict_with_children"
     assert parent.dict_with_children[123].name == "parent-dict_with_children-123"
 
@@ -112,6 +112,17 @@ async def test_children_of_device_have_set_names_and_get_connected(
     assert parent.dict_with_children[123].connected
 
 
+async def test_children_of_device_with_different_separator(
+    parent: DummyDeviceGroup,
+):
+    parent.set_name("parent", separator="_")
+    assert parent.name == "parent"
+    assert parent.child1.name == "parent_child1"
+    assert parent._child2.name == "parent__child2"
+    assert parent.dict_with_children.name == "parent_dict_with_children"
+    assert parent.dict_with_children[123].name == "parent_dict_with_children_123"
+
+
 async def test_device_with_device_collector():
     async with DeviceCollector(mock=True):
         parent = DummyDeviceGroup("parent")
@@ -120,7 +131,7 @@ async def test_device_with_device_collector():
     assert parent.parent is None
     assert parent.child1.name == "parent-child1"
     assert parent.child1.parent == parent
-    assert parent._child2.name == "parent-child2"
+    assert parent._child2.name == "parent-_child2"
     assert parent._child2.parent == parent
     assert parent.dict_with_children.name == "parent-dict_with_children"
     assert parent.dict_with_children.parent == parent

tests/epics/demo/test_demo.py

@@ -315,7 +315,7 @@ async def test_assembly_renaming() -> None:
     thing.set_name("foo")
     assert thing.x.name == "foo-x"
     assert thing.x.velocity.name == "foo-x-velocity"
-    assert thing.x.stop_.name == "foo-x-stop"
+    assert thing.x.stop_.name == "foo-x-stop_"
 
 
 async def test_dynamic_sensor_group_disconnected():