Recipe and manuall recipe wrapping are not needed for messages not originating from Murfey

Author: tieneupin

recipes/ispyb/correlative-align-images.json

@@ -1,10 +1,10 @@
 from pathlib import Path
+from typing import Any
 
 from pydantic import BaseModel, ValidationError
-from workflows.recipe import wrap_subscribe
+from workflows.recipe import RecipeWrapper, wrap_subscribe
 
 from cryoemservices.services.common_service import CommonService
-from cryoemservices.util.models import MockRW
 
 
 class AlignImagesParameters(BaseModel):
@@ -35,19 +35,13 @@ def initializing(self):
             allow_non_recipe_messages=True,
         )
 
-    def call_align_images(self, rw, header, message):
+    def call_align_images(
+        self,
+        rw: RecipeWrapper,
+        header: dict[str, Any],
+        message: dict[str, Any] | None,
+    ):
         """Pass incoming message to the relevant plugin function."""
-        # Encase message in ReceipeWrapper if none was provided
-        if not rw:
-            self.log.info("Received a simple message")
-            if not isinstance(message, dict):
-                self.log.error("Rejected invalid simple message")
-                self._reject_message(header, requeue=False)
-                return
-            # Create a wrapper-like object to be passed to functions
-            rw = MockRW(self._transport)
-            rw.recipe_step = {"paramters": message}
-
         try:
             if isinstance(message, dict):
                 params = AlignImagesParameters(

src/cryoemservices/services/correlative_align_images.py

@@ -20,17 +20,9 @@ def offline_transport(mocker: MockerFixture):
     return transport
 
 
-@pytest.mark.parametrize(
-    "use_recwrap",
-    (
-        True,
-        False,
-    ),
-)
 def test_align_images_service(
     tmp_path: Path,
     offline_transport: OfflineTransport,
-    use_recwrap: bool,
 ):
     # Set up the message parameters
     header = {
@@ -51,20 +43,13 @@ def test_align_images_service(
     service = AlignImagesService(environment={"queue": ""}, transport=offline_transport)
     service.log = MagicMock()  # Mock the logger to evaluate calls
     service.initializing()
-    if use_recwrap:
-        recwrap = MockRW(offline_transport)
-        recwrap.recipe_step = {"parameters": align_images_test_message}
-        service.call_align_images(
-            recwrap,
-            header=header,
-            message=None,
-        )
-    else:
-        service.call_align_images(
-            None,
-            header=header,
-            message=align_images_test_message,
-        )
+    recwrap = MockRW(offline_transport)
+    recwrap.recipe_step = {"parameters": align_images_test_message}
+    service.call_align_images(
+        recwrap,
+        header=header,
+        message=None,
+    )
 
     # Check that the main block in the function was run
     service.log.info.assert_called_with(