Do not update scaup for atlases if two dcgs exist (#743)

To try and avoid the case where scaup directs to the atlas dcg when a processing one also exists.

Checks to see if the tag is an atlas and if so does not do the scaup updates if we have another dcg

Author: stephen-riggs

src/murfey/server/api/workflow.py

@@ -138,6 +138,7 @@ def register_dc_group(
                         _transport_object.feedback_queue,
                         {
                             "register": "atlas_update",
+                            "tag": dcg_instance.tag,
                             "atlas_id": dcg_instance.atlas_id,
                             "atlas": dcg_params.atlas,
                             "sample": dcg_params.sample,

src/murfey/workflows/register_atlas_update.py

@@ -1,9 +1,12 @@
 import logging
 from importlib.metadata import entry_points
+from pathlib import Path
 
+from sqlmodel import select
 from sqlmodel.orm.session import Session as SQLModelSession
 
 from murfey.server import _transport_object
+from murfey.util.db import DataCollectionGroup
 
 logger = logging.getLogger("murfey.workflows.register_atlas_update")
 
@@ -27,6 +30,24 @@ def run(
         collection_mode=message.get("collection_mode"),
         color_flags=message.get("color_flags", {}),
     )
+
+    # Find out how many dcgs we have with this atlas
+    if (
+        message.get("atlas")
+        and message.get("sample")
+        and "atlas" in Path(message.get("tag", "/")).parts
+    ):
+        dcgs_atlas = murfey_db.exec(
+            select(DataCollectionGroup)
+            .where(DataCollectionGroup.session_id == message["session_id"])
+            .where(DataCollectionGroup.atlas == message["atlas"])
+            .where(DataCollectionGroup.sample == message["sample"])
+        ).all()
+        if len(dcgs_atlas) > 1:
+            # Skip hooks if this is an atlas and there is a processing dcg present
+            logger.info(f"Skipping data collection group hooks for {message['tag']}")
+            return {"success": True}
+
     if dcg_hooks := entry_points(group="murfey.hooks", name="data_collection_group"):
         try:
             for hook in dcg_hooks:

src/murfey/workflows/register_data_collection_group.py

@@ -1,14 +1,15 @@
 import logging
 import time
 from importlib.metadata import entry_points
+from pathlib import Path
 
 import ispyb.sqlalchemy._auto_db_schema as ISPyBDB
 from sqlmodel import select
 from sqlmodel.orm.session import Session as SQLModelSession
 
-import murfey.util.db as MurfeyDB
 from murfey.server import _transport_object
 from murfey.server.ispyb import ISPyBSession, get_session_id
+from murfey.util.db import DataCollectionGroup
 
 logger = logging.getLogger("murfey.workflows.register_data_collection_group")
 
@@ -30,14 +31,14 @@ def run(message: dict, murfey_db: SQLModelSession) -> dict[str, bool]:
     )
 
     if dcg_murfey := murfey_db.exec(
-        select(MurfeyDB.DataCollectionGroup)
-        .where(MurfeyDB.DataCollectionGroup.session_id == message["session_id"])
-        .where(MurfeyDB.DataCollectionGroup.tag == message.get("tag"))
+        select(DataCollectionGroup)
+        .where(DataCollectionGroup.session_id == message["session_id"])
+        .where(DataCollectionGroup.tag == message.get("tag"))
     ).all():
         dcgid = dcg_murfey[0].id
     else:
         if ispyb_session_id is None:
-            murfey_dcg = MurfeyDB.DataCollectionGroup(
+            murfey_dcg = DataCollectionGroup(
                 session_id=message["session_id"],
                 tag=message.get("tag"),
             )
@@ -77,7 +78,7 @@ def run(message: dict, murfey_db: SQLModelSession) -> dict[str, bool]:
                 "return_value", None
             )
 
-            murfey_dcg = MurfeyDB.DataCollectionGroup(
+            murfey_dcg = DataCollectionGroup(
                 id=dcgid,
                 atlas_id=atlas_id,
                 atlas=message.get("atlas", ""),
@@ -90,6 +91,23 @@ def run(message: dict, murfey_db: SQLModelSession) -> dict[str, bool]:
         murfey_db.commit()
         murfey_db.close()
 
+    # Find out how many dcgs we have with this atlas
+    if (
+        message.get("atlas")
+        and message.get("sample")
+        and "atlas" in Path(message.get("tag", "/")).parts
+    ):
+        dcgs_atlas = murfey_db.exec(
+            select(DataCollectionGroup)
+            .where(DataCollectionGroup.session_id == message["session_id"])
+            .where(DataCollectionGroup.atlas == message["atlas"])
+            .where(DataCollectionGroup.sample == message["sample"])
+        ).all()
+        if len(dcgs_atlas) > 1:
+            # Skip hooks if this is an atlas and there is a processing dcg present
+            logger.info(f"Skipping data collection group hooks for {message['tag']}")
+            return {"success": True}
+
     if dcg_hooks := entry_points(group="murfey.hooks", name="data_collection_group"):
         try:
             for hook in dcg_hooks:

tests/server/api/test_workflow.py

@@ -177,6 +177,7 @@ def test_register_dc_group_processing_to_atlas(
             "atlas_pixel_size": 1e-4,
             "dcgid": 1,
             "session_id": ExampleVisit.murfey_session_id,
+            "tag": "processing_tag",
         },
     )
     mock_transport.send.assert_any_call(
@@ -189,6 +190,7 @@ def test_register_dc_group_processing_to_atlas(
             "atlas_pixel_size": 1e-4,
             "dcgid": 2,
             "session_id": ExampleVisit.murfey_session_id,
+            "tag": "second_processing_tag",
         },
     )
 
@@ -395,6 +397,7 @@ def test_register_dc_group_new_atlas_with_searchmaps(
             "atlas_pixel_size": 1e-4,
             "dcgid": 1,
             "session_id": ExampleVisit.murfey_session_id,
+            "tag": "processing_tag",
         },
     )