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

niwrap_afni/afni/vecwarp.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 VECWARP_METADATA = Metadata(
-    id="09bfed5029029deef59dcf7bcb89635431ccb5cb.boutiques",
+    id="eee2d3334c6ced0ad01d689ccca832cba4f16ad5.boutiques",
     name="Vecwarp",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,17 @@ VECWARP_METADATA = Metadata(
 
 
 VecwarpParameters = typing.TypedDict('VecwarpParameters', {
-    "__STYXTYPE__": typing.Literal["Vecwarp"],
+    "@type": typing.NotRequired[typing.Literal["afni/Vecwarp"]],
+    "apar": typing.NotRequired[InputPathType | None],
+    "matvec": typing.NotRequired[InputPathType | None],
+    "forward": bool,
+    "backward": bool,
+    "input": typing.NotRequired[InputPathType | None],
+    "output": typing.NotRequired[str | None],
+    "force": bool,
+})
+VecwarpParametersTagged = typing.TypedDict('VecwarpParametersTagged', {
+    "@type": typing.Literal["afni/Vecwarp"],
     "apar": typing.NotRequired[InputPathType | None],
     "matvec": typing.NotRequired[InputPathType | None],
     "forward": bool,
@@ -23,43 +33,11 @@ VecwarpParameters = typing.TypedDict('VecwarpParameters', {
     "output": typing.NotRequired[str | None],
     "force": bool,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "Vecwarp": vecwarp_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 {
-        "Vecwarp": vecwarp_outputs,
-    }.get(t)
 
 
 class VecwarpOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `vecwarp(...)`.
+    Output object returned when calling `VecwarpParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -75,7 +53,7 @@ def vecwarp_params(
     input_: InputPathType | None = None,
     output: str | None = None,
     force: bool = False,
-) -> VecwarpParameters:
+) -> VecwarpParametersTagged:
     """
     Build parameters.
     
@@ -99,7 +77,7 @@ def vecwarp_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "Vecwarp",
+        "@type": "afni/Vecwarp",
         "forward": forward,
         "backward": backward,
         "force": force,
@@ -130,31 +108,31 @@ def vecwarp_cargs(
     """
     cargs = []
     cargs.append("Vecwarp")
-    if params.get("apar") is not None:
+    if params.get("apar", None) is not None:
         cargs.extend([
             "-apar",
-            execution.input_file(params.get("apar"))
+            execution.input_file(params.get("apar", None))
         ])
-    if params.get("matvec") is not None:
+    if params.get("matvec", None) is not None:
         cargs.extend([
             "-matvec",
-            execution.input_file(params.get("matvec"))
+            execution.input_file(params.get("matvec", None))
         ])
-    if params.get("forward"):
+    if params.get("forward", False):
         cargs.append("-forward")
-    if params.get("backward"):
+    if params.get("backward", False):
         cargs.append("-backward")
-    if params.get("input") is not None:
+    if params.get("input", None) is not None:
         cargs.extend([
             "-input",
-            execution.input_file(params.get("input"))
+            execution.input_file(params.get("input", None))
         ])
-    if params.get("output") is not None:
+    if params.get("output", None) is not None:
         cargs.extend([
             "-output",
-            params.get("output")
+            params.get("output", None)
         ])
-    if params.get("force"):
+    if params.get("force", False):
         cargs.append("-force")
     return cargs
 
@@ -174,18 +152,20 @@ def vecwarp_outputs(
     """
     ret = VecwarpOutputs(
         root=execution.output_file("."),
-        output_file=execution.output_file(params.get("output")) if (params.get("output") is not None) else None,
+        output_file=execution.output_file(params.get("output", None)) if (params.get("output") is not None) else None,
     )
     return ret
 
 
 def vecwarp_execute(
     params: VecwarpParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> VecwarpOutputs:
     """
-    Transforms (warps) a list of 3-vectors into another list of 3-vectors according
-    to the specified options.
+    Vecwarp
+    
+    Transforms (warps) a list of 3-vectors into another list of 3-vectors
+    according to the specified options.
     
     Author: AFNI Developers
     
@@ -193,10 +173,12 @@ def vecwarp_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `VecwarpOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(VECWARP_METADATA)
     params = execution.params(params)
     cargs = vecwarp_cargs(params, execution)
     ret = vecwarp_outputs(params, execution)
@@ -215,8 +197,10 @@ def vecwarp(
     runner: Runner | None = None,
 ) -> VecwarpOutputs:
     """
-    Transforms (warps) a list of 3-vectors into another list of 3-vectors according
-    to the specified options.
+    Vecwarp
+    
+    Transforms (warps) a list of 3-vectors into another list of 3-vectors
+    according to the specified options.
     
     Author: AFNI Developers
     
@@ -242,8 +226,6 @@ def vecwarp(
     Returns:
         NamedTuple of outputs (described in `VecwarpOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(VECWARP_METADATA)
     params = vecwarp_params(
         apar=apar,
         matvec=matvec,
@@ -253,13 +235,13 @@ def vecwarp(
         output=output,
         force=force,
     )
-    return vecwarp_execute(params, execution)
+    return vecwarp_execute(params, runner)
 
 
 __all__ = [
     "VECWARP_METADATA",
     "VecwarpOutputs",
-    "VecwarpParameters",
     "vecwarp",
+    "vecwarp_execute",
     "vecwarp_params",
 ]

niwrap_afni/afni/waver.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 WAVER_METADATA = Metadata(
-    id="22c694b493b2abc7c7740befa135d2780eb41019.boutiques",
+    id="87f8c0d04d3c90a12e2c0e2447ae75e4bde1b7e0.boutiques",
     name="waver",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,32 @@ WAVER_METADATA = Metadata(
 
 
 WaverParameters = typing.TypedDict('WaverParameters', {
-    "__STYXTYPE__": typing.Literal["waver"],
+    "@type": typing.NotRequired[typing.Literal["afni/waver"]],
+    "wav": bool,
+    "gam": bool,
+    "expr": typing.NotRequired[str | None],
+    "file_opt": typing.NotRequired[str | None],
+    "delay_time": typing.NotRequired[float | None],
+    "rise_time": typing.NotRequired[float | None],
+    "fall_time": typing.NotRequired[float | None],
+    "undershoot": typing.NotRequired[float | None],
+    "restore_time": typing.NotRequired[float | None],
+    "gamb": typing.NotRequired[float | None],
+    "gamc": typing.NotRequired[float | None],
+    "gamd": typing.NotRequired[float | None],
+    "peak": typing.NotRequired[float | None],
+    "dt": typing.NotRequired[float | None],
+    "tr": typing.NotRequired[float | None],
+    "xyout": bool,
+    "input_file": typing.NotRequired[InputPathType | None],
+    "inline_data": typing.NotRequired[str | None],
+    "tstim_data": typing.NotRequired[str | None],
+    "when_data": typing.NotRequired[str | None],
+    "numout": typing.NotRequired[int | None],
+    "ver_flag": bool,
+})
+WaverParametersTagged = typing.TypedDict('WaverParametersTagged', {
+    "@type": typing.Literal["afni/waver"],
     "wav": bool,
     "gam": bool,
     "expr": typing.NotRequired[str | None],
@@ -38,43 +63,11 @@ WaverParameters = typing.TypedDict('WaverParameters', {
     "numout": typing.NotRequired[int | None],
     "ver_flag": bool,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "waver": waver_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 {
-        "waver": waver_outputs,
-    }.get(t)
 
 
 class WaverOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `waver(...)`.
+    Output object returned when calling `WaverParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -105,7 +98,7 @@ def waver_params(
     when_data: str | None = None,
     numout: int | None = None,
     ver_flag: bool = False,
-) -> WaverParameters:
+) -> WaverParametersTagged:
     """
     Build parameters.
     
@@ -146,7 +139,7 @@ def waver_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "waver",
+        "@type": "afni/waver",
         "wav": wav,
         "gam": gam,
         "xyout": xyout,
@@ -206,103 +199,103 @@ def waver_cargs(
     """
     cargs = []
     cargs.append("waver")
-    if params.get("wav"):
+    if params.get("wav", False):
         cargs.append("-WAV")
-    if params.get("gam"):
+    if params.get("gam", False):
         cargs.append("-GAM")
-    if params.get("expr") is not None:
+    if params.get("expr", None) is not None:
         cargs.extend([
             "-EXPR",
-            params.get("expr")
+            params.get("expr", None)
         ])
-    if params.get("file_opt") is not None:
+    if params.get("file_opt", None) is not None:
         cargs.extend([
             "-FILE",
-            params.get("file_opt")
+            params.get("file_opt", None)
         ])
-    if params.get("delay_time") is not None:
+    if params.get("delay_time", None) is not None:
         cargs.extend([
             "-delaytime",
-            str(params.get("delay_time"))
+            str(params.get("delay_time", None))
         ])
-    if params.get("rise_time") is not None:
+    if params.get("rise_time", None) is not None:
         cargs.extend([
             "-risetime",
-            str(params.get("rise_time"))
+            str(params.get("rise_time", None))
         ])
-    if params.get("fall_time") is not None:
+    if params.get("fall_time", None) is not None:
         cargs.extend([
             "-falltime",
-            str(params.get("fall_time"))
+            str(params.get("fall_time", None))
         ])
-    if params.get("undershoot") is not None:
+    if params.get("undershoot", None) is not None:
         cargs.extend([
             "-undershoot",
-            str(params.get("undershoot"))
+            str(params.get("undershoot", None))
         ])
-    if params.get("restore_time") is not None:
+    if params.get("restore_time", None) is not None:
         cargs.extend([
             "-restoretime",
-            str(params.get("restore_time"))
+            str(params.get("restore_time", None))
         ])
-    if params.get("gamb") is not None:
+    if params.get("gamb", None) is not None:
         cargs.extend([
             "-gamb",
-            str(params.get("gamb"))
+            str(params.get("gamb", None))
         ])
-    if params.get("gamc") is not None:
+    if params.get("gamc", None) is not None:
         cargs.extend([
             "-gamc",
-            str(params.get("gamc"))
+            str(params.get("gamc", None))
         ])
-    if params.get("gamd") is not None:
+    if params.get("gamd", None) is not None:
         cargs.extend([
             "-gamd",
-            str(params.get("gamd"))
+            str(params.get("gamd", None))
         ])
-    if params.get("peak") is not None:
+    if params.get("peak", None) is not None:
         cargs.extend([
             "-peak",
-            str(params.get("peak"))
+            str(params.get("peak", None))
         ])
-    if params.get("dt") is not None:
+    if params.get("dt", None) is not None:
         cargs.extend([
             "-dt",
-            str(params.get("dt"))
+            str(params.get("dt", None))
         ])
-    if params.get("tr") is not None:
+    if params.get("tr", None) is not None:
         cargs.extend([
             "-TR",
-            str(params.get("tr"))
+            str(params.get("tr", None))
         ])
-    if params.get("xyout"):
+    if params.get("xyout", False):
         cargs.append("-xyout")
-    if params.get("input_file") is not None:
+    if params.get("input_file", None) is not None:
         cargs.extend([
             "-input",
-            execution.input_file(params.get("input_file"))
+            execution.input_file(params.get("input_file", None))
         ])
-    if params.get("inline_data") is not None:
+    if params.get("inline_data", None) is not None:
         cargs.extend([
             "-inline",
-            params.get("inline_data")
+            params.get("inline_data", None)
         ])
-    if params.get("tstim_data") is not None:
+    if params.get("tstim_data", None) is not None:
         cargs.extend([
             "-tstim",
-            params.get("tstim_data")
+            params.get("tstim_data", None)
         ])
-    if params.get("when_data") is not None:
+    if params.get("when_data", None) is not None:
         cargs.extend([
             "-when",
-            params.get("when_data")
+            params.get("when_data", None)
         ])
-    if params.get("numout") is not None:
+    if params.get("numout", None) is not None:
         cargs.extend([
             "-numout",
-            str(params.get("numout"))
+            str(params.get("numout", None))
         ])
-    if params.get("ver_flag"):
+    if params.get("ver_flag", False):
         cargs.append("-ver")
     return cargs
 
@@ -329,9 +322,11 @@ def waver_outputs(
 
 def waver_execute(
     params: WaverParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> WaverOutputs:
     """
+    waver
+    
     Creates an ideal waveform timeseries file.
     
     Author: AFNI Developers
@@ -340,10 +335,12 @@ def waver_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `WaverOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(WAVER_METADATA)
     params = execution.params(params)
     cargs = waver_cargs(params, execution)
     ret = waver_outputs(params, execution)
@@ -377,6 +374,8 @@ def waver(
     runner: Runner | None = None,
 ) -> WaverOutputs:
     """
+    waver
+    
     Creates an ideal waveform timeseries file.
     
     Author: AFNI Developers
@@ -420,8 +419,6 @@ def waver(
     Returns:
         NamedTuple of outputs (described in `WaverOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(WAVER_METADATA)
     params = waver_params(
         wav=wav,
         gam=gam,
@@ -446,13 +443,13 @@ def waver(
         numout=numout,
         ver_flag=ver_flag,
     )
-    return waver_execute(params, execution)
+    return waver_execute(params, runner)
 
 
 __all__ = [
     "WAVER_METADATA",
     "WaverOutputs",
-    "WaverParameters",
     "waver",
+    "waver_execute",
     "waver_params",
 ]