np-workflows 1.6.85__py3-none-any.whl → 1.6.87__py3-none-any.whl

np_workflows/shared/base_experiments.py

@@ -8,7 +8,7 @@ import pathlib
 import re
 import shutil
 import time
-from typing import Any, ClassVar, Iterable, Literal, Optional, Protocol, Sequence, Type
+from typing import Any, ClassVar, Iterable, Literal, Mapping, Optional, Protocol, Sequence, Type
 
 import fabric
 import invoke
@@ -382,6 +382,12 @@ class PipelineExperiment(WithSession):
                 renamed_folders.append(renamed)
             logger.info('Renamed split ephys folders %r', split_folders)
         np_services.OpenEphys.data_files = renamed_folders
+
+    @staticmethod
+    def contains_uuid(text: str) -> bool:
+        hexchars = '[0-9a-fA-F]'
+        pattern = rf"{hexchars}{{8}}-{hexchars}{{4}}-{hexchars}{{4}}-{hexchars}{{4}}-{hexchars}{{12}}"
+        return re.search(pattern, text) is not None
         
     def copy_data_files(self) -> None:
         """Copy data files from raw data storage to session folder for all services."""
@@ -405,6 +411,10 @@ class PipelineExperiment(WithSession):
                             for _ in ('opto', 'main', 'mapping', 'behavior'):
                                 if _ in file.name:
                                     renamed = f'{self.session.folder}.{"stim" if _ == "main" else _}.pkl'
+                                    break
+                            else:
+                                if self.contains_uuid(file.name):
+                                    renamed = f'{self.session.folder}.behavior.pkl'
                         elif file.suffix in ('.json', '.mp4') and (cam_label := re.match('Behavior|Eye|Face',file.name)):
                             renamed = f'{self.session.folder}.{cam_label.group().lower()}{file.suffix}'
                         elif file.suffix in ('.json', '.mp4') and (cam_label := re.match('BEH|EYE|FACE',file.name)):
@@ -702,7 +712,13 @@ class DynamicRoutingExperiment(WithSession):
         else:
             np_services.ScriptCamstim.script = self.camstim_script.as_posix()
         
-        np_services.ScriptCamstim.params = params
+        if (script_override_params := getattr(self, 'script_override_params', None)) is not None:
+            if not isinstance(script_override_params, Mapping):
+                raise TypeError(f"script_override_params must be a dict/Mapping, got {type(script_override_params)}")
+        else:
+            script_override_params = {}
+            
+        np_services.ScriptCamstim.params = params | script_override_params
         
         self.update_state()
         self.log(f"{stim} started")

{np_workflows-1.6.85.dist-info → np_workflows-1.6.87.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: np-workflows
-Version: 1.6.85
+Version: 1.6.87
 Summary: Ecephys and behavior workflows for the Mindscope Neuropixels team.
 Author-Email: Ben Hardcastle <ben.hardcastle@alleninstitute.org>
 License: MIT

{np_workflows-1.6.85.dist-info → np_workflows-1.6.87.dist-info}/RECORD

@@ -1,6 +1,6 @@
-np_workflows-1.6.85.dist-info/METADATA,sha256=hgjdOcKPZODfeCp2zJex33Jbyzv3_VVFXqlqgr3avnc,3991
-np_workflows-1.6.85.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-np_workflows-1.6.85.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+np_workflows-1.6.87.dist-info/METADATA,sha256=16Az2imZW_pvWAIUzXIII_-GpT91PVkRscVaoS-87DM,3991
+np_workflows-1.6.87.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+np_workflows-1.6.87.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
 np_workflows/__init__.py,sha256=QWnSRZ3THmQPF6HO8rFC4EkcjGd5ypap7BssqKqva64,232
 np_workflows/assets/images/logo_np_hab.png,sha256=N1skdSq4lQv0liucargHoulzfE-zeTYoud-wAePD2VY,10071
 np_workflows/assets/images/logo_np_vis.png,sha256=yDaQ3dQcX1OXPN8Rsne9SvaevUlgvVRcw_tWs02cyTU,19349
@@ -62,9 +62,9 @@ np_workflows/experiments/templeton/__init__.py,sha256=LrTnP6DnkTSB-sdadvSOJvLZMZ
 np_workflows/experiments/templeton/main.py,sha256=5JDBN4fQbBy2PfiUh6OQr0NVZo-h58la3C-mgfLsU3Y,2906
 np_workflows/experiments/templeton/widgets.py,sha256=e0t7zhD0N-i6Q5_8EWW4lYrESuAb7hIz_BEL4NPaywo,2884
 np_workflows/shared/__init__.py,sha256=L9h5R3dioT8m0KcwjlQV5_eoEFoneJHEzDTGaH4_ySg,131
-np_workflows/shared/base_experiments.py,sha256=-RPtBgsKnfFVL_UO8tm_G1RJI5cqqmLnsJD0KXzIFqA,33644
+np_workflows/shared/base_experiments.py,sha256=K0G4XSMkpP2s6c9XZAtxaj9niRd8GLpZQ6FVX3YDPuA,34500
 np_workflows/shared/camstim_scripts/flash_250ms.stim,sha256=ARwNQPJRRQwEaD_k0oXR1lafdafWlf_Kvfbq6TVEkDU,408
 np_workflows/shared/camstim_scripts/gabor_20_deg_250ms.stim,sha256=xvuRMORZiN9IuOLWZbNTWuxmhfHefGnZtIpeYcsQXpE,718
 np_workflows/shared/npxc.py,sha256=NWi826e14EEt3vKlsLwsQ2wYcsLk9Ea_Hrb8hn2iA3Y,6689
 np_workflows/shared/widgets.py,sha256=aehptvxluwfyRs7Sa4ZSvCMhOwGCxhUM7STBR4wFG5k,26880
-np_workflows-1.6.85.dist-info/RECORD,,
+np_workflows-1.6.87.dist-info/RECORD,,