not sure

Author: mattcieslak

pyproject.toml

@@ -21,9 +21,11 @@ dependencies = [
   "acres",
   "datalad",
   "nipype",
+  "nireports",
   "pandas",
   "pybids >= 0.15.6",
   "typer",
+  "toml",
   "pyyaml",
 ]
 dynamic = ["version"]

src/simbids/cli/parser.py

@@ -146,6 +146,12 @@ def _bids_filter(value, parser):
         ),
     )
 
+    parser.add_argument(
+        'bids_app',
+        choices=['qsiprep', 'qsirecon', 'xcp_d', 'fmriprep'],
+        help=('BIDS-App to be simulated'),
+    )
+
     g_bids = parser.add_argument_group('Options for filtering BIDS queries')
     g_bids.add_argument(
         '--skip_bids_validation',
@@ -336,3 +342,4 @@ def parse_args(args=None, namespace=None):
         )
 
     config.execution.participant_label = sorted(participant_label)
+    return opts

src/simbids/cli/run.py

@@ -23,6 +23,8 @@
 """Simulated BIDS workflows."""
 
 from simbids import config
+import sys
+import logging
 
 EXITCODE: int = -1
 
@@ -32,11 +34,11 @@ def main():
     import gc
     from multiprocessing import Manager, Process
 
+    from simbids.cli.parser import parse_args
     from simbids.cli.workflow import build_workflow
 
-    # Code Carbon
-    if config.execution.track_carbon:
-        pass
+    # Parse arguments
+    parse_args()
 
     if 'pdb' in config.execution.debug:
         from simbids.utils.debug import setup_exceptionhook
@@ -51,22 +53,7 @@ def main():
     config_file.parent.mkdir(exist_ok=True, parents=True)
     config.to_filename(config_file)
 
-    # CRITICAL Call build_workflow(config_file, retval) in a subprocess.
-    # Because Python on Linux does not ever free virtual memory (VM), running the
-    # workflow construction jailed within a process preempts excessive VM buildup.
-    if 'pdb' not in config.execution.debug:
-        with Manager() as mgr:
-            retval = mgr.dict()
-            p = Process(target=build_workflow, args=(str(config_file), retval))
-            p.start()
-            p.join()
-            retval = dict(retval.items())  # Convert to base dictionary
-
-            if p.exitcode:
-                retval['return_code'] = p.exitcode
-
-    else:
-        retval = build_workflow(str(config_file), {})
+    retval = build_workflow(str(config_file), {})
 
     global EXITCODE
     EXITCODE = retval.get('return_code', 0)

src/simbids/cli/workflow.py

@@ -36,8 +36,6 @@ def build_workflow(config_file, retval):
     """Create the Nipype Workflow that supports the whole execution graph."""
     from pathlib import Path
 
-    from fmriprep.utils.bids import check_pipeline_version
-    from fmriprep.utils.misc import check_deps
     from niworkflows.utils.bids import collect_participants
     from pkg_resources import resource_filename as pkgrf
 
@@ -64,15 +62,6 @@ def build_workflow(config_file, retval):
         banner += ['#' * len(banner[1])]
     build_log.log(25, f'\n{" " * 9}'.join(banner))
 
-    # warn if older results exist: check for dataset_description.json in output folder
-    msg = check_pipeline_version(
-        'SimBIDS',
-        version,
-        output_dir / 'dataset_description.json',
-    )
-    if msg is not None:
-        build_log.warning(msg)
-
     # Please note this is the input folder's dataset_description.json
     dset_desc_path = config.execution.bids_dir / 'dataset_description.json'
     if dset_desc_path.exists():
@@ -103,6 +92,7 @@ def build_workflow(config_file, retval):
         "Building SimBIDS's workflow:",
         f'BIDS dataset path: {config.execution.bids_dir}.',
         f'Participant list: {subject_list}.',
+        f'BIDS-App: {config.workflow.bids_app}.',
         f'Run identifier: {config.execution.run_uuid}.',
         f'Output spaces: {config.execution.output_spaces}.',
     ]
@@ -114,16 +104,6 @@ def build_workflow(config_file, retval):
 
     retval['workflow'] = init_simbids_wf()
 
-    # Check workflow for missing commands
-    missing = check_deps(retval['workflow'])
-    if missing:
-        build_log.critical(
-            'Cannot run SimBIDS. Missing dependencies:%s',
-            '\n\t* '.join([''] + [f'{cmd} (Interface: {iface})' for iface, cmd in missing]),
-        )
-        retval['return_code'] = 127  # 127 == command not found.
-        return retval
-
     config.to_filename(config_file)
     build_log.info(
         'SimBIDS workflow graph with %d nodes built successfully.',

src/simbids/config.py

@@ -206,7 +206,7 @@
 
 # Debug modes are names that influence the exposure of internal details to
 # the user, either through additional derivatives or increased verbosity
-DEBUG_MODES = 'pdb'
+DEBUG_MODES = ('pdb',)
 
 
 class _Config:
@@ -541,7 +541,7 @@ class workflow(_Config):
 
     ignore = None
     """Ignore particular steps for *SimBIDS*."""
-    simulated_app = 'qsiprep'
+    bids_app = 'qsiprep'
     """The BIDS App to simulate."""
 
 
@@ -731,14 +731,6 @@ def init_spaces(checkpoint=True):
     if 'MNI152NLin6Asym' not in spaces.get_spaces(nonstandard=False, dim=(3,)):
         spaces.add(Reference('MNI152NLin6Asym', {}))
 
-    # Ensure user-defined spatial references for outputs are correctly parsed.
-    # Certain options require normalization to a space not explicitly defined by users.
-    # These spaces will not be included in the final outputs.
-    cifti_output = workflow.cifti_output
-    if cifti_output:
-        # CIFTI grayordinates to corresponding FSL-MNI resolutions.
-        vol_res = '2' if cifti_output == '91k' else '1'
-        spaces.add(Reference('MNI152NLin6Asym', {'res': vol_res}))
 
     # Make the SpatialReferences object available
     workflow.spaces = spaces