Merge branch 'main' into 32_remove_duplicates_in_pvs

Author: shihab-dls

src/fastcs_odin/eiger_fan.py

@@ -19,5 +19,3 @@ def _process_parameters(self):
             match parameter.uri:
                 case ["0", "status" | "config", *_]:
                     parameter.set_path(parameter.path[2:])
-                case ["0", _]:
-                    parameter.set_path(parameter.path[1:])

src/fastcs_odin/meta_writer.py

@@ -24,8 +24,6 @@ def _process_parameters(self):
             match parameter.uri:
                 case ["0", "status" | "config", *_]:
                     parameter.set_path(parameter.path[2:])
-                case ["0", _]:
-                    parameter.set_path(parameter.path[1:])
 
     acquisition_id: AttrRW = AttrRW(
         String(), io_ref=ParameterTreeAttributeIORef("api/0.1/mw/config/acquisition_id")

tests/test_introspection.py

@@ -314,6 +314,9 @@ async def test_mw_initialise(mocker: MockerFixture):
     await meta_writer.stop()
     mock_connection.put.assert_called_once_with("api/0.1/mw/config/stop", True)
 
+    # Check `0/status/` removed
+    assert meta_writer.timestamp.path == []  # type: ignore
+
 
 @pytest.mark.asyncio
 async def test_ef_initialise(mocker: MockerFixture):
@@ -323,7 +326,10 @@ async def test_ef_initialise(mocker: MockerFixture):
     mock_connection = mocker.MagicMock()
 
     parameters = create_odin_parameters(response)
-    controller = EigerFanAdapterController(mock_connection, parameters, "prefix", [])
-    await controller.initialise()
+    eiger_fan = EigerFanAdapterController(mock_connection, parameters, "prefix", [])
+    await eiger_fan.initialise()
+
+    assert len(eiger_fan.attributes) == 28
 
-    assert len(controller.attributes) == 28
+    # Check `0/status/` removed
+    assert eiger_fan.timestamp.path == []  # type: ignore