From 767d9981cdfd6a178237574bfb9defb85688e0c8 Mon Sep 17 00:00:00 2001 From: Daniel Hatton Date: Mon, 10 Feb 2025 11:41:08 +0000 Subject: [PATCH 1/2] Sort out mess --- src/murfey/server/__init__.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/murfey/server/__init__.py b/src/murfey/server/__init__.py index caf38d049..88530275a 100644 --- a/src/murfey/server/__init__.py +++ b/src/murfey/server/__init__.py @@ -2557,6 +2557,16 @@ def feedback_callback(header: dict, message: dict) -> None: message.get("tag"): dcgid } _transport_object.transport.ack(header) + if dcg_hooks := entry_points().select( + group="murfey.hooks", name="data_collection_group" + ): + try: + for hook in dcg_hooks: + hook(dcgid) + except Exception: + logger.error( + "Call to data collection group hook failed", exc_info=True + ) return None elif message["register"] == "atlas_update": if _transport_object: From b9fd2c567f1bc0dea7df045db7cd3c225530033f Mon Sep 17 00:00:00 2001 From: Daniel Hatton Date: Mon, 10 Feb 2025 11:51:09 +0000 Subject: [PATCH 2/2] Will need the session ID here --- src/murfey/server/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/murfey/server/__init__.py b/src/murfey/server/__init__.py index 88530275a..2ace38da3 100644 --- a/src/murfey/server/__init__.py +++ b/src/murfey/server/__init__.py @@ -2562,7 +2562,7 @@ def feedback_callback(header: dict, message: dict) -> None: ): try: for hook in dcg_hooks: - hook(dcgid) + hook(dcgid, session_id=message["session_id"]) except Exception: logger.error( "Call to data collection group hook failed", exc_info=True