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

niwrap_afni/afni/v_1dsum.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_1DSUM_METADATA = Metadata(
-    id="951ee34d4f572f020c977d77aecef1c12039b08f.boutiques",
+    id="076f7885b357064e414a836c5044b162ef80dacc.boutiques",
     name="1dsum",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,16 @@ V_1DSUM_METADATA = Metadata(
 
 
 V1dsumParameters = typing.TypedDict('V1dsumParameters', {
-    "__STYXTYPE__": typing.Literal["1dsum"],
+    "@type": typing.NotRequired[typing.Literal["afni/1dsum"]],
+    "input_files": list[InputPathType],
+    "ignore_rows": typing.NotRequired[float | None],
+    "use_rows": typing.NotRequired[float | None],
+    "mean_flag": bool,
+    "nocomment_flag": bool,
+    "okempty_flag": bool,
+})
+V1dsumParametersTagged = typing.TypedDict('V1dsumParametersTagged', {
+    "@type": typing.Literal["afni/1dsum"],
     "input_files": list[InputPathType],
     "ignore_rows": typing.NotRequired[float | None],
     "use_rows": typing.NotRequired[float | None],
@@ -22,43 +31,11 @@ V1dsumParameters = typing.TypedDict('V1dsumParameters', {
     "nocomment_flag": bool,
     "okempty_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 {
-        "1dsum": v_1dsum_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 {
-        "1dsum": v_1dsum_outputs,
-    }.get(t)
 
 
 class V1dsumOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_1dsum(...)`.
+    Output object returned when calling `V1dsumParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -73,7 +50,7 @@ def v_1dsum_params(
     mean_flag: bool = False,
     nocomment_flag: bool = False,
     okempty_flag: bool = False,
-) -> V1dsumParameters:
+) -> V1dsumParametersTagged:
     """
     Build parameters.
     
@@ -91,7 +68,7 @@ def v_1dsum_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "1dsum",
+        "@type": "afni/1dsum",
         "input_files": input_files,
         "mean_flag": mean_flag,
         "nocomment_flag": nocomment_flag,
@@ -119,22 +96,22 @@ def v_1dsum_cargs(
     """
     cargs = []
     cargs.append("1dsum")
-    cargs.extend([execution.input_file(f) for f in params.get("input_files")])
-    if params.get("ignore_rows") is not None:
+    cargs.extend([execution.input_file(f) for f in params.get("input_files", None)])
+    if params.get("ignore_rows", None) is not None:
         cargs.extend([
             "-ignore",
-            str(params.get("ignore_rows"))
+            str(params.get("ignore_rows", None))
         ])
-    if params.get("use_rows") is not None:
+    if params.get("use_rows", None) is not None:
         cargs.extend([
             "-use",
-            str(params.get("use_rows"))
+            str(params.get("use_rows", None))
         ])
-    if params.get("mean_flag"):
+    if params.get("mean_flag", False):
         cargs.append("-mean")
-    if params.get("nocomment_flag"):
+    if params.get("nocomment_flag", False):
         cargs.append("-nocomment")
-    if params.get("okempty_flag"):
+    if params.get("okempty_flag", False):
         cargs.append("-OKempty")
     return cargs
 
@@ -161,10 +138,13 @@ def v_1dsum_outputs(
 
 def v_1dsum_execute(
     params: V1dsumParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V1dsumOutputs:
     """
-    Sum or average columns of ASCII files with numbers arranged in rows and columns.
+    1dsum
+    
+    Sum or average columns of ASCII files with numbers arranged in rows and
+    columns.
     
     Author: AFNI Developers
     
@@ -172,10 +152,12 @@ def v_1dsum_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V1dsumOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_1DSUM_METADATA)
     params = execution.params(params)
     cargs = v_1dsum_cargs(params, execution)
     ret = v_1dsum_outputs(params, execution)
@@ -193,7 +175,10 @@ def v_1dsum(
     runner: Runner | None = None,
 ) -> V1dsumOutputs:
     """
-    Sum or average columns of ASCII files with numbers arranged in rows and columns.
+    1dsum
+    
+    Sum or average columns of ASCII files with numbers arranged in rows and
+    columns.
     
     Author: AFNI Developers
     
@@ -213,8 +198,6 @@ def v_1dsum(
     Returns:
         NamedTuple of outputs (described in `V1dsumOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_1DSUM_METADATA)
     params = v_1dsum_params(
         input_files=input_files,
         ignore_rows=ignore_rows,
@@ -223,13 +206,13 @@ def v_1dsum(
         nocomment_flag=nocomment_flag,
         okempty_flag=okempty_flag,
     )
-    return v_1dsum_execute(params, execution)
+    return v_1dsum_execute(params, runner)
 
 
 __all__ = [
     "V1dsumOutputs",
-    "V1dsumParameters",
     "V_1DSUM_METADATA",
     "v_1dsum",
+    "v_1dsum_execute",
     "v_1dsum_params",
 ]

niwrap_afni/afni/v_1dsvd.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_1DSVD_METADATA = Metadata(
-    id="a44411b921407798a01380cba6cb97822fb9b904.boutiques",
+    id="ee1dc53825eff232e33d7e748e005465a290f31a.boutiques",
     name="1dsvd",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,21 @@ V_1DSVD_METADATA = Metadata(
 
 
 V1dsvdParameters = typing.TypedDict('V1dsvdParameters', {
-    "__STYXTYPE__": typing.Literal["1dsvd"],
+    "@type": typing.NotRequired[typing.Literal["afni/1dsvd"]],
+    "one": bool,
+    "vmean": bool,
+    "vnorm": bool,
+    "cond": bool,
+    "sing": bool,
+    "sort": bool,
+    "nosort": bool,
+    "asort": bool,
+    "left_eigenvectors": bool,
+    "num_eigenvectors": typing.NotRequired[str | None],
+    "input_files": list[InputPathType],
+})
+V1dsvdParametersTagged = typing.TypedDict('V1dsvdParametersTagged', {
+    "@type": typing.Literal["afni/1dsvd"],
     "one": bool,
     "vmean": bool,
     "vnorm": bool,
@@ -27,43 +41,11 @@ V1dsvdParameters = typing.TypedDict('V1dsvdParameters', {
     "num_eigenvectors": typing.NotRequired[str | None],
     "input_files": list[InputPathType],
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "1dsvd": v_1dsvd_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 {
-        "1dsvd": v_1dsvd_outputs,
-    }.get(t)
 
 
 class V1dsvdOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_1dsvd(...)`.
+    Output object returned when calling `V1dsvdParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -83,7 +65,7 @@ def v_1dsvd_params(
     asort: bool = False,
     left_eigenvectors: bool = False,
     num_eigenvectors: str | None = None,
-) -> V1dsvdParameters:
+) -> V1dsvdParametersTagged:
     """
     Build parameters.
     
@@ -103,7 +85,7 @@ def v_1dsvd_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "1dsvd",
+        "@type": "afni/1dsvd",
         "one": one,
         "vmean": vmean,
         "vnorm": vnorm,
@@ -135,30 +117,30 @@ def v_1dsvd_cargs(
     """
     cargs = []
     cargs.append("1dsvd")
-    if params.get("one"):
+    if params.get("one", False):
         cargs.append("-one")
-    if params.get("vmean"):
+    if params.get("vmean", False):
         cargs.append("-vmean")
-    if params.get("vnorm"):
+    if params.get("vnorm", False):
         cargs.append("-vnorm")
-    if params.get("cond"):
+    if params.get("cond", False):
         cargs.append("-cond")
-    if params.get("sing"):
+    if params.get("sing", False):
         cargs.append("-sing")
-    if params.get("sort"):
+    if params.get("sort", False):
         cargs.append("-sort")
-    if params.get("nosort"):
+    if params.get("nosort", False):
         cargs.append("-nosort")
-    if params.get("asort"):
+    if params.get("asort", False):
         cargs.append("-asort")
-    if params.get("left_eigenvectors"):
+    if params.get("left_eigenvectors", False):
         cargs.append("-1Dleft")
-    if params.get("num_eigenvectors") is not None:
+    if params.get("num_eigenvectors", None) is not None:
         cargs.extend([
             "-nev",
-            params.get("num_eigenvectors")
+            params.get("num_eigenvectors", None)
         ])
-    cargs.extend([execution.input_file(f) for f in params.get("input_files")])
+    cargs.extend([execution.input_file(f) for f in params.get("input_files", None)])
     return cargs
 
 
@@ -184,11 +166,13 @@ def v_1dsvd_outputs(
 
 def v_1dsvd_execute(
     params: V1dsvdParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V1dsvdOutputs:
     """
-    Computes SVD of the matrix formed by the 1D file(s) and outputs the result on
-    stdout.
+    1dsvd
+    
+    Computes SVD of the matrix formed by the 1D file(s) and outputs the result
+    on stdout.
     
     Author: AFNI Developers
     
@@ -196,10 +180,12 @@ def v_1dsvd_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V1dsvdOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_1DSVD_METADATA)
     params = execution.params(params)
     cargs = v_1dsvd_cargs(params, execution)
     ret = v_1dsvd_outputs(params, execution)
@@ -222,8 +208,10 @@ def v_1dsvd(
     runner: Runner | None = None,
 ) -> V1dsvdOutputs:
     """
-    Computes SVD of the matrix formed by the 1D file(s) and outputs the result on
-    stdout.
+    1dsvd
+    
+    Computes SVD of the matrix formed by the 1D file(s) and outputs the result
+    on stdout.
     
     Author: AFNI Developers
     
@@ -245,8 +233,6 @@ def v_1dsvd(
     Returns:
         NamedTuple of outputs (described in `V1dsvdOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_1DSVD_METADATA)
     params = v_1dsvd_params(
         one=one,
         vmean=vmean,
@@ -260,13 +246,13 @@ def v_1dsvd(
         num_eigenvectors=num_eigenvectors,
         input_files=input_files,
     )
-    return v_1dsvd_execute(params, execution)
+    return v_1dsvd_execute(params, runner)
 
 
 __all__ = [
     "V1dsvdOutputs",
-    "V1dsvdParameters",
     "V_1DSVD_METADATA",
     "v_1dsvd",
+    "v_1dsvd_execute",
     "v_1dsvd_params",
 ]

niwrap_afni/afni/v_1dtranspose.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_1DTRANSPOSE_METADATA = Metadata(
-    id="d5a8a98288b5be2bc2aa9af67472ccf3e0d6d9a5.boutiques",
+    id="f4ff626f4718338a7c571ed1bc65d6c5b941b9fc.boutiques",
     name="1dtranspose",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,47 +14,20 @@ V_1DTRANSPOSE_METADATA = Metadata(
 
 
 V1dtransposeParameters = typing.TypedDict('V1dtransposeParameters', {
-    "__STYXTYPE__": typing.Literal["1dtranspose"],
+    "@type": typing.NotRequired[typing.Literal["afni/1dtranspose"]],
+    "infile": InputPathType,
+    "outfile": typing.NotRequired[str | None],
+})
+V1dtransposeParametersTagged = typing.TypedDict('V1dtransposeParametersTagged', {
+    "@type": typing.Literal["afni/1dtranspose"],
     "infile": InputPathType,
     "outfile": typing.NotRequired[str | None],
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "1dtranspose": v_1dtranspose_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 {
-        "1dtranspose": v_1dtranspose_outputs,
-    }.get(t)
 
 
 class V1dtransposeOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_1dtranspose(...)`.
+    Output object returned when calling `V1dtransposeParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -65,7 +38,7 @@ class V1dtransposeOutputs(typing.NamedTuple):
 def v_1dtranspose_params(
     infile: InputPathType,
     outfile: str | None = None,
-) -> V1dtransposeParameters:
+) -> V1dtransposeParametersTagged:
     """
     Build parameters.
     
@@ -77,7 +50,7 @@ def v_1dtranspose_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "1dtranspose",
+        "@type": "afni/1dtranspose",
         "infile": infile,
     }
     if outfile is not None:
@@ -100,9 +73,9 @@ def v_1dtranspose_cargs(
     """
     cargs = []
     cargs.append("1dtranspose")
-    cargs.append(execution.input_file(params.get("infile")))
-    if params.get("outfile") is not None:
-        cargs.append(params.get("outfile"))
+    cargs.append(execution.input_file(params.get("infile", None)))
+    if params.get("outfile", None) is not None:
+        cargs.append(params.get("outfile", None))
     return cargs
 
 
@@ -121,16 +94,18 @@ def v_1dtranspose_outputs(
     """
     ret = V1dtransposeOutputs(
         root=execution.output_file("."),
-        outfile=execution.output_file(params.get("outfile")) if (params.get("outfile") is not None) else None,
+        outfile=execution.output_file(params.get("outfile", None)) if (params.get("outfile") is not None) else None,
     )
     return ret
 
 
 def v_1dtranspose_execute(
     params: V1dtransposeParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V1dtransposeOutputs:
     """
+    1dtranspose
+    
     Transpose an AFNI *.1D file (ASCII list of numbers arranged in columns).
     
     Author: AFNI Developers
@@ -139,10 +114,12 @@ def v_1dtranspose_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V1dtransposeOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_1DTRANSPOSE_METADATA)
     params = execution.params(params)
     cargs = v_1dtranspose_cargs(params, execution)
     ret = v_1dtranspose_outputs(params, execution)
@@ -156,6 +133,8 @@ def v_1dtranspose(
     runner: Runner | None = None,
 ) -> V1dtransposeOutputs:
     """
+    1dtranspose
+    
     Transpose an AFNI *.1D file (ASCII list of numbers arranged in columns).
     
     Author: AFNI Developers
@@ -170,19 +149,17 @@ def v_1dtranspose(
     Returns:
         NamedTuple of outputs (described in `V1dtransposeOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_1DTRANSPOSE_METADATA)
     params = v_1dtranspose_params(
         infile=infile,
         outfile=outfile,
     )
-    return v_1dtranspose_execute(params, execution)
+    return v_1dtranspose_execute(params, runner)
 
 
 __all__ = [
     "V1dtransposeOutputs",
-    "V1dtransposeParameters",
     "V_1DTRANSPOSE_METADATA",
     "v_1dtranspose",
+    "v_1dtranspose_execute",
     "v_1dtranspose_params",
 ]

niwrap_afni/afni/v_24swap.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_24SWAP_METADATA = Metadata(
-    id="7bff8c87ec5e9d1f68524b27c8cf903189e91f26.boutiques",
+    id="da742d50523f632410ceb194d0365bc9b69d8087.boutiques",
     name="24swap",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,47 +14,22 @@ V_24SWAP_METADATA = Metadata(
 
 
 V24swapParameters = typing.TypedDict('V24swapParameters', {
-    "__STYXTYPE__": typing.Literal["24swap"],
+    "@type": typing.NotRequired[typing.Literal["afni/24swap"]],
+    "quiet": bool,
+    "pattern": typing.NotRequired[str | None],
+    "input_files": list[InputPathType],
+})
+V24swapParametersTagged = typing.TypedDict('V24swapParametersTagged', {
+    "@type": typing.Literal["afni/24swap"],
     "quiet": bool,
     "pattern": typing.NotRequired[str | None],
     "input_files": list[InputPathType],
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "24swap": v_24swap_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 V24swapOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_24swap(...)`.
+    Output object returned when calling `V24swapParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -64,7 +39,7 @@ def v_24swap_params(
     input_files: list[InputPathType],
     quiet: bool = False,
     pattern: str | None = None,
-) -> V24swapParameters:
+) -> V24swapParametersTagged:
     """
     Build parameters.
     
@@ -76,7 +51,7 @@ def v_24swap_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "24swap",
+        "@type": "afni/24swap",
         "quiet": quiet,
         "input_files": input_files,
     }
@@ -100,14 +75,14 @@ def v_24swap_cargs(
     """
     cargs = []
     cargs.append("24swap")
-    if params.get("quiet"):
+    if params.get("quiet", False):
         cargs.append("-q")
-    if params.get("pattern") is not None:
+    if params.get("pattern", None) is not None:
         cargs.extend([
             "-pattern",
-            params.get("pattern")
+            params.get("pattern", None)
         ])
-    cargs.extend([execution.input_file(f) for f in params.get("input_files")])
+    cargs.extend([execution.input_file(f) for f in params.get("input_files", None)])
     return cargs
 
 
@@ -132,9 +107,11 @@ def v_24swap_outputs(
 
 def v_24swap_execute(
     params: V24swapParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V24swapOutputs:
     """
+    24swap
+    
     Swaps bytes pairs and/or quadruples on the files listed.
     
     Author: AFNI Developers
@@ -143,10 +120,12 @@ def v_24swap_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V24swapOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_24SWAP_METADATA)
     params = execution.params(params)
     cargs = v_24swap_cargs(params, execution)
     ret = v_24swap_outputs(params, execution)
@@ -161,6 +140,8 @@ def v_24swap(
     runner: Runner | None = None,
 ) -> V24swapOutputs:
     """
+    24swap
+    
     Swaps bytes pairs and/or quadruples on the files listed.
     
     Author: AFNI Developers
@@ -175,20 +156,18 @@ def v_24swap(
     Returns:
         NamedTuple of outputs (described in `V24swapOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_24SWAP_METADATA)
     params = v_24swap_params(
         quiet=quiet,
         pattern=pattern,
         input_files=input_files,
     )
-    return v_24swap_execute(params, execution)
+    return v_24swap_execute(params, runner)
 
 
 __all__ = [
     "V24swapOutputs",
-    "V24swapParameters",
     "V_24SWAP_METADATA",
     "v_24swap",
+    "v_24swap_execute",
     "v_24swap_params",
 ]