Merged recent changes from 'main' branch

Author: tieneupin

src/murfey/server/feedback.py

@@ -2113,7 +2113,9 @@ def feedback_callback(header: dict, message: dict, _db=murfey_db) -> None:
                 if bfactors_registered:
                     murfey.server._transport_object.transport.ack(header)
                 else:
-                    murfey.server._transport_object.transport.nack(header)
+                    murfey.server._transport_object.transport.nack(
+                        header, requeue=False
+                    )
             return None
         elif message["register"] == "done_bfactor":
             _save_bfactor(message, _db)
@@ -2144,8 +2146,8 @@ def feedback_callback(header: dict, message: dict, _db=murfey_db) -> None:
                 else:
                     # Send it directly to DLQ without trying to rerun it
                     murfey.server._transport_object.transport.nack(
-                        header, requeue=result.get("requeue", False)
-                    )
+                        header, requeue=False
+                    )  # should be result.get("requeue", False)
             if not result:
                 logger.error(
                     f"Workflow {sanitise(message['register'])} returned {result}"
@@ -2160,18 +2162,24 @@ def feedback_callback(header: dict, message: dict, _db=murfey_db) -> None:
         _db.close()
         logger.warning("Murfey database required a rollback")
         if murfey.server._transport_object:
-            murfey.server._transport_object.transport.nack(header, requeue=True)
+            murfey.server._transport_object.transport.nack(
+                header, requeue=False
+            )  # should be True
     except OperationalError:
         logger.warning("Murfey database error encountered", exc_info=True)
         time.sleep(1)
         if murfey.server._transport_object:
-            murfey.server._transport_object.transport.nack(header, requeue=True)
+            murfey.server._transport_object.transport.nack(
+                header, requeue=False
+            )  # should be True
     except NoResultFound:
         # Missing rows might be due to a race condition and should be requeued
         logger.warning("No matching database row was found", exc_info=True)
         time.sleep(1)
         if murfey.server._transport_object:
-            murfey.server._transport_object.transport.nack(header, requeue=True)
+            murfey.server._transport_object.transport.nack(
+                header, requeue=False
+            )  # should be True
     except Exception:
         logger.warning(
             "Exception encountered in server RabbitMQ callback", exc_info=True

src/murfey/workflows/clem/register_preprocessing_results.py

@@ -59,11 +59,13 @@ class CLEMPreprocessingResult(BaseModel):
     @cached_property
     def is_denoised(self) -> bool:
         """
-        The "_Lng_LVCC" suffix appended to a CLEM dataset's position name indicates
-        that it's a denoised image set of the same position. These results should
-        override or supersede the original ones once they're available.
+        The "_Lng_LVCC" and "_Lng_SVCC" suffixes appended to a CLEM dataset's position
+        name indicate that it's a denoised image set of the same position. They should
+        override or supersede the original ones if they're present
         """
-        return "_Lng_LVCC" in self.series_name
+        return any(
+            pattern in self.series_name for pattern in ("_Lng_LVCC", "_Lng_SVCC")
+        )
 
     # Valid Pydantic decorator not supported by MyPy
     @computed_field  # type: ignore
@@ -73,7 +75,7 @@ def site_name(self) -> str:
         Extract just the name of the site by removing the "_Lng_LVCC" suffix from
         the series name.
         """
-        return self.series_name.replace("_Lng_LVCC", "")
+        return self.series_name.replace("_Lng_LVCC", "").replace("_Lng_SVCC", "")
 
     # Valid Pydantic decorator not supported by MyPy
     @computed_field  # type: ignore