fix: make config attribute public, use match statements

Author: mgxd

nibabies/cli/parser.py

@@ -842,33 +842,51 @@ def parse_args(args=None, namespace=None):
     work_dir = config.execution.work_dir
     version = config.environment.version
     output_layout = config.execution.output_layout
-    config.execution._config_hash = config.hash_config(config.get())
-
-    if config.execution.fs_subjects_dir is None:
-        if output_layout in ('bids', 'multiverse'):
-            config.execution.fs_subjects_dir = output_dir / 'sourcedata' / 'freesurfer'
-        elif output_layout == 'legacy':
-            config.execution.fs_subjects_dir = output_dir / 'freesurfer'
+    config.execution.parameters_hash = config.hash_config(config.get())
 
+    # Multiverse behaves as a cross between bids and legacy
     if config.execution.nibabies_dir is None:
-        if output_layout in 'bids':
-            config.execution.nibabies_dir = output_dir
-        elif output_layout == 'legacy':
-            config.execution.nibabies_dir = output_dir / 'nibabies'
-        elif output_layout == 'multiverse':
-            config.loggers.cli.warning(
-                'Multiverse output selected - assigning output directory based on version'
-                ' and configuration hash.'
-            )
-            config.execution.nibabies_dir = (
-                output_dir / f'nibabies-{version.split("+", 1)[0]}-{config.execution._config_hash}'
-            )
+        match output_layout:
+            case 'bids':
+                config.execution.nibabies_dir = output_dir
+            case 'legacy':
+                config.execution.nibabies_dir = output_dir / 'nibabies'
+            case 'multiverse':
+                config.loggers.cli.warning(
+                    'Multiverse output selected - assigning output directory based on version'
+                    ' and configuration hash.'
+                )
+                config.execution.nibabies_dir = (
+                    output_dir
+                    / f'nibabies-{version.split("+", 1)[0]}-{config.execution.parameters_hash}'
+                )
+            case _:
+                config.loggers.cli.warning('Unknown output layout %s', output_layout)
+                pass
+
+    nibabies_dir = config.execution.nibabies_dir
+
+    if config.execution.fs_subjects_dir is None:
+        match output_layout:
+            case 'bids':
+                config.execution.fs_subjects_dir = output_dir / 'sourcedata' / 'freesurfer'
+            case 'legacy':
+                config.execution.fs_subjects_dir = output_dir / 'freesurfer'
+            case 'multiverse':
+                config.execution.fs_subjects_dir = nibabies_dir / 'sourcedata' / 'freesurfer'
+            case _:
+                pass
 
     if config.workflow.surface_recon_method == 'mcribs':
-        if output_layout in ('bids', 'multiverse'):
-            config.execution.mcribs_dir = output_dir / 'sourcedata' / 'mcribs'
-        elif output_layout == 'legacy':
-            config.execution.mcribs_dir = output_dir / 'mcribs'
+        match output_layout:
+            case 'bids':
+                config.execution.mcribs_dir = output_dir / 'sourcedata' / 'mcribs'
+            case 'legacy':
+                config.execution.mcribs_dir = output_dir / 'mcribs'
+            case 'multiverse':
+                config.execution.mcribs_dir = nibabies_dir / 'sourcedata' / 'mcribs'
+            case _:
+                pass
         # Ensure the directory is created
         config.execution.mcribs_dir.mkdir(exist_ok=True, parents=True)
 

nibabies/cli/run.py

@@ -151,13 +151,13 @@ def main():
                 config.execution.unique_labels,
                 config.execution.nibabies_dir,
                 config.execution.run_uuid,
-                config.execution._config_hash if add_hash else None,
+                config_hash=config.execution.parameters_hash if add_hash else None,
             )
             write_derivative_description(
                 config.execution.bids_dir,
                 config.execution.nibabies_dir,
                 config.execution.dataset_links,
-                config.execution._config_hash,
+                config.execution.parameters_hash,
             )
             write_bidsignore(config.execution.nibabies_dir)
 

nibabies/config.py

@@ -410,6 +410,8 @@ class execution(_Config):
     output_spaces = None
     """List of (non)standard spaces designated (with the ``--output-spaces`` flag of
     the command line) as spatial references for outputs."""
+    parameters_hash = None
+    """Unique hash of the current configuration parameters."""
     reference_anat = None
     """Force usage of this anatomical scan as the structural reference."""
     reports_only = False
@@ -433,7 +435,6 @@ class execution(_Config):
     write_graph = False
     """Write out the computational graph corresponding to the planned preprocessing."""
     _layout = None
-    _config_hash = None
 
     _paths = (
         'anat_derivatives',