Fix tiled queries for new node structure

pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
     "fastapi>=0.136.0",
     "graypy>=2.1.0",
     "pydantic>=2.13.2",
-    "tiled[client]>=0.2.9",
+    "tiled[client]>=0.2.21",
 ]
 dynamic = ["version"]
 license.file = "LICENSE"

src/daq_queuing_service/external_interaction/tiled/tiled.py

@@ -55,27 +55,30 @@ def get_tiled_client(
 
 
 def get_metadata_from_tiled(
-    tiled_client: Container, instrument_session: str, blueapi_task_id: str
+    tiled_client: Container,
+    instrument: str,
+    instrument_session: str,
+    blueapi_task_id: str,
 ) -> list[tuple[str, dict[str, Any]]]:
 
     @cached(cache)
     def _query_tiled(
-        instrument_session: str, blueapi_task_id: str
+        instrument: str, instrument_session: str, blueapi_task_id: str
     ) -> list[tuple[str, dict[str, Any]]]:
-        result: Container = tiled_client.search(
-            Eq("start.instrument_session", instrument_session)
-        ).search(Eq("start.blueapi_task_id", blueapi_task_id))
+        result: Container = tiled_client[
+            f"{instrument}/{instrument_session.split('-')[0]}/{instrument_session}"
+        ].search(Eq("start.blueapi_task_id", blueapi_task_id))
 
         items = sorted(
             ((key, dict(value.metadata)) for key, value in result.items()),
             key=lambda item: item[1]["start"]["time"],
         )
         return items
 
-    return _query_tiled(instrument_session, blueapi_task_id)
+    return _query_tiled(instrument, instrument_session, blueapi_task_id)
 
 
-def get_tiled_and_scan_ids(tiled_client: Container, call: BlueapiCall):
+def get_tiled_and_scan_ids(tiled_client: Container, instrument: str, call: BlueapiCall):
     tiled_ids: list[str] = []
     scan_ids: list[int] = []
 
@@ -84,7 +87,7 @@ def get_tiled_and_scan_ids(tiled_client: Container, call: BlueapiCall):
         return tiled_ids, scan_ids
 
     scan_metadatas = get_metadata_from_tiled(
-        tiled_client, call.task_request.instrument_session, call.blueapi_id
+        tiled_client, instrument, call.task_request.instrument_session, call.blueapi_id
     )
 
     for item in scan_metadatas:

src/daq_queuing_service/plugins/i15_1/tiled_interaction.py

@@ -31,8 +31,9 @@ def _query_tiled(instrument_session: str) -> list[TiledAuxiliary]:
 
         oldest_valid_time = time.time() - stale_time_s
         result: Container = (
-            tiled_client.search(Eq("start.instrument", "i15-1"))
-            .search(Eq("start.instrument_session", instrument_session))
+            tiled_client[
+                f"i15-1/{instrument_session.split('-')[0]}/{instrument_session}"
+            ]
             .search(Eq("stop.exit_status", "success"))
             .search(Comparison("ge", "stop.time", oldest_valid_time))
             .search(In("start.scan_type", list(AuxiliaryScanType)))

src/daq_queuing_service/task_queue/queue.py

@@ -354,7 +354,11 @@ async def complete_call(self, call: BlueapiCall, result: TaskResult):
             result (TaskResult): The result of the task from blueapi
         """
         with add_session_to_logger(call.task_request.instrument_session):
-            tiled_ids, scan_ids = get_tiled_and_scan_ids(self._tiled_client, call)
+            tiled_ids, scan_ids = (
+                get_tiled_and_scan_ids(self._tiled_client, self.instrument, call)
+                if self.instrument
+                else ([], [])
+            )
             should_pause = self._converter.pause_on_complete_blueapi_call(
                 call.model_copy(), result
             )
@@ -383,7 +387,12 @@ async def fail_call(
             should_pause = self._converter.pause_on_fail_blueapi_call(
                 call.model_copy(), errors
             )
-            tiled_ids, scan_ids = get_tiled_and_scan_ids(self._tiled_client, call)
+
+            tiled_ids, scan_ids = (
+                get_tiled_and_scan_ids(self._tiled_client, self.instrument, call)
+                if self.instrument
+                else ([], [])
+            )
             LOGGER.error(f"Plan {call} has failed with the following errors: {errors}")
 
         async with self._modifying:

tests/unit_tests/external_interaction/tiled/test_tiled.py

@@ -39,14 +39,13 @@ def mock_tiled_search(
         }
     }
 
-    search_result = MagicMock()
-    search_result.search = MagicMock(
+    search_result = MagicMock(
         return_value={"tiled_id_1": result_1, "tiled_id_2": result_2}
     )
 
-    tiled_client.search = MagicMock(return_value=search_result)
+    tiled_client["ixx/cm12345/cm12345-1"].search = search_result
 
-    return (tiled_client, search_result)
+    return tiled_client
 
 
 def test_get_tiled_client_instantiates_client_from_uri():
@@ -104,22 +103,21 @@ def get_next_env_variable(*_, **__):  # type:ignore
     )
 
 
-def test_get_metadata_from_tiled_makes_expected_searches(
-    mock_tiled_search: tuple[MagicMock, MagicMock],
+def test_get_metadata_from_tiled_makes_expected_search(
+    mock_tiled_search: MagicMock,
 ):
-    client, result = mock_tiled_search
-    get_metadata_from_tiled(client, "cm12345-1", "bapi_task_id")
-    client.search.assert_called_once_with(
-        Eq(key="start.instrument_session", value="cm12345-1")
+    client = mock_tiled_search
+    get_metadata_from_tiled(client, "ixx", "cm12345-1", "bapi_task_id")
+    client["ixx/cm12345/cm12345-1"].search.assert_called_once_with(  # type:ignore
+        Eq("start.blueapi_task_id", "bapi_task_id")
     )
-    result.search.assert_called_once_with(Eq("start.blueapi_task_id", "bapi_task_id"))
 
 
 def test_get_metadata_from_tiled_returns_expected_result(
-    mock_tiled_search: tuple[MagicMock, MagicMock],
+    mock_tiled_search: MagicMock,
 ):
-    client, _ = mock_tiled_search
-    result = get_metadata_from_tiled(client, "cm12345-1", "bapi_task_id")
+    client = mock_tiled_search
+    result = get_metadata_from_tiled(client, "ixx", "cm12345-1", "bapi_task_id")
     assert result == [  # Should be in chronological order
         (
             "tiled_id_2",
@@ -149,9 +147,9 @@ def test_get_metadata_from_tiled_returns_expected_result(
 
 
 def test_get_metadata_from_tiled_returns_empty_list_if_no_result_found(
-    mock_tiled_search: tuple[MagicMock, MagicMock],
+    mock_tiled_search: MagicMock,
 ):
-    client, search = mock_tiled_search
-    search.search = MagicMock(return_value={})
-    result = get_metadata_from_tiled(client, "cm12345-1", "bapi_task_id")
+    client = mock_tiled_search
+    client["ixx/cm12345/cm12345-1"].search = MagicMock(return_value={})
+    result = get_metadata_from_tiled(client, "ixx", "cm12345-1", "bapi_task_id")
     assert result == []

tests/unit_tests/plugins/i15_1/test_tiled_interaction.py

@@ -28,7 +28,7 @@ def mock_current_time():
 @pytest.fixture()
 def mock_tiled_searches(
     tiled_client: MagicMock,
-) -> tuple[MagicMock, MagicMock, MagicMock, MagicMock, MagicMock, MagicMock]:
+) -> tuple[MagicMock, MagicMock, MagicMock, MagicMock]:
     result_1 = MagicMock()
 
     result_1.metadata = {
@@ -93,8 +93,8 @@ def mock_tiled_searches(
         }
     }
 
-    search_result_6 = MagicMock()
-    search_result_6.search = MagicMock(
+    search_result_4 = MagicMock()
+    search_result_4.search = MagicMock(
         return_value={
             "tiled_id_1": result_1,
             "tiled_id_2": result_2,
@@ -104,51 +104,38 @@ def mock_tiled_searches(
         }
     )
 
-    search_result_5 = MagicMock()
-    search_result_5.search = MagicMock(return_value=search_result_6)
-    search_result_4 = MagicMock()
-    search_result_4.search = MagicMock(return_value=search_result_5)
     search_result_3 = MagicMock()
     search_result_3.search = MagicMock(return_value=search_result_4)
     search_result_2 = MagicMock()
     search_result_2.search = MagicMock(return_value=search_result_3)
 
-    tiled_client.search = MagicMock(return_value=search_result_2)
-
-    return (
-        tiled_client,
-        search_result_2,
-        search_result_3,
-        search_result_4,
-        search_result_5,
-        search_result_6,
+    tiled_client["i15-1/cm12345/cm12345-1"].search = MagicMock(
+        return_value=search_result_2
     )
 
+    return (tiled_client, search_result_2, search_result_3, search_result_4)
+
 
 def test_get_suitable_tiled_background_makes_expected_searches(
-    mock_tiled_searches: tuple[
-        MagicMock, MagicMock, MagicMock, MagicMock, MagicMock, MagicMock
-    ],
+    mock_tiled_searches: tuple[MagicMock, MagicMock, MagicMock, MagicMock],
     queue_params: QueueParameters,
 ):
-    client, search_2, search_3, search_4, search_5, search_6 = mock_tiled_searches
+    client, search_2, search_3, search_4 = mock_tiled_searches
     get_suitable_tiled_scan(
         client,
         AuxiliaryScan(instrument_session="cm12345-1", pin=None, time_per_pdf=10),
         queue_params.tiled_stale_time_s,
     )
-    client.search.assert_called_once_with(Eq(key="start.instrument", value="i15-1"))
-    search_2.search.assert_called_once_with(
-        Eq(key="start.instrument_session", value="cm12345-1")
+    client["i15-1/cm12345/cm12345-1"].search.assert_called_once_with(  # type: ignore
+        Eq("stop.exit_status", "success")
     )
-    search_3.search.assert_called_once_with(Eq("stop.exit_status", "success"))
-    search_4.search.assert_called_once_with(
+    search_2.search.assert_called_once_with(
         Comparison("ge", "stop.time", 30 - queue_params.tiled_stale_time_s)
     )
-    search_5.search.assert_called_once_with(
+    search_3.search.assert_called_once_with(
         In(key="start.scan_type", value=["Air", "Empty Capillary", "Standard Sample"])
     )
-    search_6.search.assert_called_once_with(
+    search_4.search.assert_called_once_with(
         KeyPresent("start.experiment_definition.data.time_per_pdf")
     )