RF: Move template fetching to iterator workflow, adhere to style

Author: mgxd

smriprep/interfaces/templateflow.py

@@ -203,8 +203,7 @@ def fetch_template_files(
 
     files = {}
     files['t1w'] = tf.get(name[0], desc=None, suffix='T1w', **specs)
-    files['mask'] = (
-        tf.get(name[0], desc='brain', suffix='mask', **specs)
-        or tf.get(name[0], label='brain', suffix='mask', **specs)
+    files['mask'] = tf.get(name[0], desc='brain', suffix='mask', **specs) or tf.get(
+        name[0], label='brain', suffix='mask', **specs
     )
     return files

smriprep/utils/misc.py

@@ -22,6 +22,7 @@
 #
 """Self-contained utilities to be used within Function nodes."""
 
+
 def apply_lut(in_dseg, lut, newpath=None):
     """Map the input discrete segmentation to a new label set (lookup table, LUT)."""
     import nibabel as nb

smriprep/workflows/anatomical.py

@@ -974,9 +974,6 @@ def init_anat_fit_wf(
     templates = []
     found_xfms = {}
     for template in spaces.get_spaces(nonstandard=False, dim=(3,)):
-        from smriprep.interfaces.templateflow import fetch_template_files
-
-        fetch_template_files(template, specs=None, sloppy=sloppy)
         xfms = precomputed.get('transforms', {}).get(template, {})
         if set(xfms) != {'forward', 'reverse'}:
             templates.append(template)

smriprep/workflows/outputs.py

@@ -1116,10 +1116,7 @@ def init_anat_second_derivatives_wf(
 
 
 def init_template_iterator_wf(
-    *,
-    spaces: 'SpatialReferences',
-    sloppy: bool = False,
-    name='template_iterator_wf'
+    *, spaces: 'SpatialReferences', sloppy: bool = False, name='template_iterator_wf'
 ):
     """Prepare the necessary components to resample an image to a template space
 
@@ -1130,6 +1127,11 @@ def init_template_iterator_wf(
 
     The fields in `outputnode` can be used as if they come from a single template.
     """
+    for template in spaces.get_spaces(nonstandard=False, dim=(3,)):
+        from smriprep.interfaces.templateflow import fetch_template_files
+
+        fetch_template_files(template, specs=None, sloppy=sloppy)
+
     workflow = pe.Workflow(name=name)
 
     inputnode = pe.Node(
@@ -1167,9 +1169,7 @@ def init_template_iterator_wf(
         name='select_xfm',
         run_without_submitting=True,
     )
-    select_tpl = pe.Node(
-        TemplateFlowSelect(), name='select_tpl', run_without_submitting=True
-    )
+    select_tpl = pe.Node(TemplateFlowSelect(), name='select_tpl', run_without_submitting=True)
 
     # fmt:off
     workflow.connect([