fix(analysis): safeguard query when there's only one subject

SainsburyWellcomeCentre · Dec 13, 2024 · fef4465 · fef4465
1 parent 0910695
commit fef4465
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/aeon/dj_pipeline/analysis/block_analysis.py b/aeon/dj_pipeline/analysis/block_analysis.py
@@ -530,7 +530,8 @@ def make(self, key):
         rfid2subj_map = {
             int(lab_id): subj_name
             for subj_name, lab_id in zip(
-                *(subject.SubjectDetail.proj("lab_id") & f"subject in {tuple(subject_names)}").fetch(
+                *(subject.SubjectDetail.proj("lab_id")
+                  & f"subject in {tuple(list(subject_names) + [''])}").fetch(
                     "subject", "lab_id"
                 ),
                 strict=False,

diff --git a/aeon/dj_pipeline/scripts/update_in_patch_rfid_timestamps.py b/aeon/dj_pipeline/scripts/update_in_patch_rfid_timestamps.py
@@ -27,7 +27,8 @@ def update_in_patch_rfid_timestamps(block_key):
     rfid2subj_map = {
         int(lab_id): subj_name
         for subj_name, lab_id in zip(
-            *(subject.SubjectDetail.proj("lab_id") & f"subject in {tuple(subject_names)}").fetch(
+            *(subject.SubjectDetail.proj("lab_id")
+              & f"subject in {tuple(list(subject_names) + [''])}").fetch(
                 "subject", "lab_id"
             ),
             strict=False,
@@ -66,8 +67,9 @@ def update_in_patch_rfid_timestamps(block_key):
 
 def main():
     """Update in_patch_rfid_timestamps for all blocks that are missing it."""
-    block_keys = BlockSubjectAnalysis & (
-        BlockSubjectAnalysis.Patch & "in_patch_rfid_timestamps IS NULL"
+    block_keys = (
+            BlockSubjectAnalysis
+            & (BlockSubjectAnalysis.Patch & "in_patch_rfid_timestamps IS NULL")
     ).fetch("KEY")
     for block_key in block_keys:
         try: