niwrap-afni 0.6.3__py3-none-any.whl → 0.7.0__py3-none-any.whl

niwrap_afni/afni/afni_batch_r.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 AFNI_BATCH_R_METADATA = Metadata(
-    id="39ea4622e4b183dcd7e35b66e0a43635840d5735.boutiques",
+    id="c7cc5f0b815d249a95d33b3d577ecee6aee694de.boutiques",
     name="AFNI_Batch_R",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,49 +14,26 @@ AFNI_BATCH_R_METADATA = Metadata(
 
 
 AfniBatchRParameters = typing.TypedDict('AfniBatchRParameters', {
-    "__STYXTYPE__": typing.Literal["AFNI_Batch_R"],
+    "@type": typing.NotRequired[typing.Literal["afni/AFNI_Batch_R"]],
+    "no_restore": bool,
+    "save_workspace": bool,
+    "no_readline": bool,
+    "vanilla_mode": bool,
+    "help": bool,
+})
+AfniBatchRParametersTagged = typing.TypedDict('AfniBatchRParametersTagged', {
+    "@type": typing.Literal["afni/AFNI_Batch_R"],
     "no_restore": bool,
     "save_workspace": bool,
     "no_readline": bool,
     "vanilla_mode": bool,
     "help": bool,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "AFNI_Batch_R": afni_batch_r_cargs,
-    }.get(t)
-
-
-def dyn_outputs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build outputs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build outputs function.
-    """
-    return {
-    }.get(t)
 
 
 class AfniBatchROutputs(typing.NamedTuple):
     """
-    Output object returned when calling `afni_batch_r(...)`.
+    Output object returned when calling `AfniBatchRParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -68,7 +45,7 @@ def afni_batch_r_params(
     no_readline: bool = False,
     vanilla_mode: bool = False,
     help_: bool = False,
-) -> AfniBatchRParameters:
+) -> AfniBatchRParametersTagged:
     """
     Build parameters.
     
@@ -83,7 +60,7 @@ def afni_batch_r_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "AFNI_Batch_R",
+        "@type": "afni/AFNI_Batch_R",
         "no_restore": no_restore,
         "save_workspace": save_workspace,
         "no_readline": no_readline,
@@ -111,15 +88,15 @@ def afni_batch_r_cargs(
     cargs.append("R")
     cargs.append("CMD")
     cargs.append("BATCH")
-    if params.get("no_restore"):
+    if params.get("no_restore", False):
         cargs.append("--no-restore")
-    if params.get("save_workspace"):
+    if params.get("save_workspace", False):
         cargs.append("--save")
-    if params.get("no_readline"):
+    if params.get("no_readline", False):
         cargs.append("--no-readline")
-    if params.get("vanilla_mode"):
+    if params.get("vanilla_mode", False):
         cargs.append("--vanilla")
-    if params.get("help"):
+    if params.get("help", False):
         cargs.append("-help")
     return cargs
 
@@ -145,9 +122,11 @@ def afni_batch_r_outputs(
 
 def afni_batch_r_execute(
     params: AfniBatchRParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> AfniBatchROutputs:
     """
+    AFNI_Batch_R
+    
     Batch mode for executing R scripts in the AFNI environment.
     
     Author: AFNI Developers
@@ -156,10 +135,12 @@ def afni_batch_r_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `AfniBatchROutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(AFNI_BATCH_R_METADATA)
     params = execution.params(params)
     cargs = afni_batch_r_cargs(params, execution)
     ret = afni_batch_r_outputs(params, execution)
@@ -176,6 +157,8 @@ def afni_batch_r(
     runner: Runner | None = None,
 ) -> AfniBatchROutputs:
     """
+    AFNI_Batch_R
+    
     Batch mode for executing R scripts in the AFNI environment.
     
     Author: AFNI Developers
@@ -193,8 +176,6 @@ def afni_batch_r(
     Returns:
         NamedTuple of outputs (described in `AfniBatchROutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(AFNI_BATCH_R_METADATA)
     params = afni_batch_r_params(
         no_restore=no_restore,
         save_workspace=save_workspace,
@@ -202,13 +183,13 @@ def afni_batch_r(
         vanilla_mode=vanilla_mode,
         help_=help_,
     )
-    return afni_batch_r_execute(params, execution)
+    return afni_batch_r_execute(params, runner)
 
 
 __all__ = [
     "AFNI_BATCH_R_METADATA",
     "AfniBatchROutputs",
-    "AfniBatchRParameters",
     "afni_batch_r",
+    "afni_batch_r_execute",
     "afni_batch_r_params",
 ]

niwrap_afni/afni/afni_check_omp.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 AFNI_CHECK_OMP_METADATA = Metadata(
-    id="32dd1aee513bc5242efdf26e5514ec120679a8b1.boutiques",
+    id="902e7955e7e9298e8850ef2d18d6e0b1a5e24ec2.boutiques",
     name="afni_check_omp",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,45 +14,18 @@ AFNI_CHECK_OMP_METADATA = Metadata(
 
 
 AfniCheckOmpParameters = typing.TypedDict('AfniCheckOmpParameters', {
-    "__STYXTYPE__": typing.Literal["afni_check_omp"],
+    "@type": typing.NotRequired[typing.Literal["afni/afni_check_omp"]],
+    "iterations": typing.NotRequired[float | None],
+})
+AfniCheckOmpParametersTagged = typing.TypedDict('AfniCheckOmpParametersTagged', {
+    "@type": typing.Literal["afni/afni_check_omp"],
     "iterations": typing.NotRequired[float | None],
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "afni_check_omp": afni_check_omp_cargs,
-    }.get(t)
-
-
-def dyn_outputs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build outputs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build outputs function.
-    """
-    return {
-    }.get(t)
 
 
 class AfniCheckOmpOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `afni_check_omp(...)`.
+    Output object returned when calling `AfniCheckOmpParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -60,7 +33,7 @@ class AfniCheckOmpOutputs(typing.NamedTuple):
 
 def afni_check_omp_params(
     iterations: float | None = None,
-) -> AfniCheckOmpParameters:
+) -> AfniCheckOmpParametersTagged:
     """
     Build parameters.
     
@@ -70,7 +43,7 @@ def afni_check_omp_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "afni_check_omp",
+        "@type": "afni/afni_check_omp",
     }
     if iterations is not None:
         params["iterations"] = iterations
@@ -92,8 +65,8 @@ def afni_check_omp_cargs(
     """
     cargs = []
     cargs.append("afni_check_omp")
-    if params.get("iterations") is not None:
-        cargs.append(str(params.get("iterations")))
+    if params.get("iterations", None) is not None:
+        cargs.append(str(params.get("iterations", None)))
     return cargs
 
 
@@ -118,9 +91,11 @@ def afni_check_omp_outputs(
 
 def afni_check_omp_execute(
     params: AfniCheckOmpParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> AfniCheckOmpOutputs:
     """
+    afni_check_omp
+    
     Tool to check the OpenMP multi-threading environment for AFNI.
     
     Author: AFNI Developers
@@ -129,10 +104,12 @@ def afni_check_omp_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `AfniCheckOmpOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(AFNI_CHECK_OMP_METADATA)
     params = execution.params(params)
     cargs = afni_check_omp_cargs(params, execution)
     ret = afni_check_omp_outputs(params, execution)
@@ -145,6 +122,8 @@ def afni_check_omp(
     runner: Runner | None = None,
 ) -> AfniCheckOmpOutputs:
     """
+    afni_check_omp
+    
     Tool to check the OpenMP multi-threading environment for AFNI.
     
     Author: AFNI Developers
@@ -157,18 +136,16 @@ def afni_check_omp(
     Returns:
         NamedTuple of outputs (described in `AfniCheckOmpOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(AFNI_CHECK_OMP_METADATA)
     params = afni_check_omp_params(
         iterations=iterations,
     )
-    return afni_check_omp_execute(params, execution)
+    return afni_check_omp_execute(params, runner)
 
 
 __all__ = [
     "AFNI_CHECK_OMP_METADATA",
     "AfniCheckOmpOutputs",
-    "AfniCheckOmpParameters",
     "afni_check_omp",
+    "afni_check_omp_execute",
     "afni_check_omp_params",
 ]

niwrap_afni/afni/afni_history.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 AFNI_HISTORY_METADATA = Metadata(
-    id="d7491062207cc6368cfd5898668689b91ac28654.boutiques",
+    id="d5230640c68a23a8036ed85856e26929274553bf.boutiques",
     name="afni_history",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,31 @@ AFNI_HISTORY_METADATA = Metadata(
 
 
 AfniHistoryParameters = typing.TypedDict('AfniHistoryParameters', {
-    "__STYXTYPE__": typing.Literal["afni_history"],
+    "@type": typing.NotRequired[typing.Literal["afni/afni_history"]],
+    "verb_level": typing.NotRequired[int | None],
+    "check_date": typing.NotRequired[str | None],
+    "help": bool,
+    "history": bool,
+    "list_authors": bool,
+    "list_types": bool,
+    "version": bool,
+    "author": typing.NotRequired[str | None],
+    "level": typing.NotRequired[int | None],
+    "min_level": typing.NotRequired[int | None],
+    "program": typing.NotRequired[str | None],
+    "past_entries": typing.NotRequired[int | None],
+    "past_days": typing.NotRequired[int | None],
+    "past_months": typing.NotRequired[int | None],
+    "past_years": typing.NotRequired[int | None],
+    "type": typing.NotRequired[str | None],
+    "html": bool,
+    "dline": bool,
+    "reverse": bool,
+    "show_field": typing.NotRequired[str | None],
+    "show_field_names": bool,
+})
+AfniHistoryParametersTagged = typing.TypedDict('AfniHistoryParametersTagged', {
+    "@type": typing.Literal["afni/afni_history"],
     "verb_level": typing.NotRequired[int | None],
     "check_date": typing.NotRequired[str | None],
     "help": bool,
@@ -37,42 +61,11 @@ AfniHistoryParameters = typing.TypedDict('AfniHistoryParameters', {
     "show_field": typing.NotRequired[str | None],
     "show_field_names": bool,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "afni_history": afni_history_cargs,
-    }.get(t)
-
-
-def dyn_outputs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build outputs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build outputs function.
-    """
-    return {
-    }.get(t)
 
 
 class AfniHistoryOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `afni_history(...)`.
+    Output object returned when calling `AfniHistoryParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -100,7 +93,7 @@ def afni_history_params(
     reverse: bool = False,
     show_field: str | None = None,
     show_field_names: bool = False,
-) -> AfniHistoryParameters:
+) -> AfniHistoryParametersTagged:
     """
     Build parameters.
     
@@ -136,7 +129,7 @@ def afni_history_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "afni_history",
+        "@type": "afni/afni_history",
         "help": help_,
         "history": history,
         "list_authors": list_authors,
@@ -189,83 +182,83 @@ def afni_history_cargs(
     """
     cargs = []
     cargs.append("afni_history")
-    if params.get("verb_level") is not None:
+    if params.get("verb_level", None) is not None:
         cargs.extend([
             "-verb",
-            str(params.get("verb_level"))
+            str(params.get("verb_level", None))
         ])
-    if params.get("check_date") is not None:
+    if params.get("check_date", None) is not None:
         cargs.extend([
             "-check_date",
-            params.get("check_date")
+            params.get("check_date", None)
         ])
-    if params.get("help"):
+    if params.get("help", False):
         cargs.append("-help")
-    if params.get("history"):
+    if params.get("history", False):
         cargs.append("-hist")
-    if params.get("list_authors"):
+    if params.get("list_authors", False):
         cargs.append("-list_authors")
-    if params.get("list_types"):
+    if params.get("list_types", False):
         cargs.append("-list_types")
-    if params.get("version"):
+    if params.get("version", False):
         cargs.append("-ver")
-    if params.get("author") is not None:
+    if params.get("author", None) is not None:
         cargs.extend([
             "-author",
-            params.get("author")
+            params.get("author", None)
         ])
-    if params.get("level") is not None:
+    if params.get("level", None) is not None:
         cargs.extend([
             "-level",
-            str(params.get("level"))
+            str(params.get("level", None))
         ])
-    if params.get("min_level") is not None:
+    if params.get("min_level", None) is not None:
         cargs.extend([
             "-min_level",
-            str(params.get("min_level"))
+            str(params.get("min_level", None))
         ])
-    if params.get("program") is not None:
+    if params.get("program", None) is not None:
         cargs.extend([
             "-program",
-            params.get("program")
+            params.get("program", None)
         ])
-    if params.get("past_entries") is not None:
+    if params.get("past_entries", None) is not None:
         cargs.extend([
             "-past_entries",
-            str(params.get("past_entries"))
+            str(params.get("past_entries", None))
         ])
-    if params.get("past_days") is not None:
+    if params.get("past_days", None) is not None:
         cargs.extend([
             "-past_days",
-            str(params.get("past_days"))
+            str(params.get("past_days", None))
         ])
-    if params.get("past_months") is not None:
+    if params.get("past_months", None) is not None:
         cargs.extend([
             "-past_months",
-            str(params.get("past_months"))
+            str(params.get("past_months", None))
         ])
-    if params.get("past_years") is not None:
+    if params.get("past_years", None) is not None:
         cargs.extend([
             "-past_years",
-            str(params.get("past_years"))
+            str(params.get("past_years", None))
         ])
-    if params.get("type") is not None:
+    if params.get("type", None) is not None:
         cargs.extend([
             "-type",
-            params.get("type")
+            params.get("type", None)
         ])
-    if params.get("html"):
+    if params.get("html", False):
         cargs.append("-html")
-    if params.get("dline"):
+    if params.get("dline", False):
         cargs.append("-dline")
-    if params.get("reverse"):
+    if params.get("reverse", False):
         cargs.append("-reverse")
-    if params.get("show_field") is not None:
+    if params.get("show_field", None) is not None:
         cargs.extend([
             "-show_field",
-            params.get("show_field")
+            params.get("show_field", None)
         ])
-    if params.get("show_field_names"):
+    if params.get("show_field_names", False):
         cargs.append("-show_field_names")
     return cargs
 
@@ -291,9 +284,11 @@ def afni_history_outputs(
 
 def afni_history_execute(
     params: AfniHistoryParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> AfniHistoryOutputs:
     """
+    afni_history
+    
     Show AFNI updates per user, dates, or levels.
     
     Author: AFNI Developers
@@ -302,10 +297,12 @@ def afni_history_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `AfniHistoryOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(AFNI_HISTORY_METADATA)
     params = execution.params(params)
     cargs = afni_history_cargs(params, execution)
     ret = afni_history_outputs(params, execution)
@@ -338,6 +335,8 @@ def afni_history(
     runner: Runner | None = None,
 ) -> AfniHistoryOutputs:
     """
+    afni_history
+    
     Show AFNI updates per user, dates, or levels.
     
     Author: AFNI Developers
@@ -376,8 +375,6 @@ def afni_history(
     Returns:
         NamedTuple of outputs (described in `AfniHistoryOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(AFNI_HISTORY_METADATA)
     params = afni_history_params(
         verb_level=verb_level,
         check_date=check_date,
@@ -401,13 +398,13 @@ def afni_history(
         show_field=show_field,
         show_field_names=show_field_names,
     )
-    return afni_history_execute(params, execution)
+    return afni_history_execute(params, runner)
 
 
 __all__ = [
     "AFNI_HISTORY_METADATA",
     "AfniHistoryOutputs",
-    "AfniHistoryParameters",
     "afni_history",
+    "afni_history_execute",
     "afni_history_params",
 ]