np-workflows 1.6.84__tar.gz → 1.6.86__tar.gz

{np_workflows-1.6.84 → np_workflows-1.6.86}/PKG-INFO

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

{np_workflows-1.6.84 → np_workflows-1.6.86}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "np-workflows"
-version = "1.6.84"
+version = "1.6.86"
 description = "Ecephys and behavior workflows for the Mindscope Neuropixels team."
 authors = [
     { name = "Ben Hardcastle", email = "ben.hardcastle@alleninstitute.org" },

{np_workflows-1.6.84 → np_workflows-1.6.86}/src/np_workflows/shared/base_experiments.py

@@ -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."""
@@ -402,9 +408,13 @@ class PipelineExperiment(WithSession):
                         if file.suffix == '.h5':
                             renamed = f'{self.session.folder}.sync'
                         elif file.suffix == '.pkl':
-                            for _ in ('opto', 'main', 'mapping'):
+                            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)):