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

niwrap_afni/afni/v_3d_empty.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_3D_EMPTY_METADATA = Metadata(
-    id="d95bc850048040b099fd6ef056090b564f3ff824.boutiques",
+    id="df2312983b963af4c47cdf0727b5a3bd8c42e262.boutiques",
     name="3dEmpty",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,49 +14,24 @@ V_3D_EMPTY_METADATA = Metadata(
 
 
 V3dEmptyParameters = typing.TypedDict('V3dEmptyParameters', {
-    "__STYXTYPE__": typing.Literal["3dEmpty"],
+    "@type": typing.NotRequired[typing.Literal["afni/3dEmpty"]],
+    "prefix": typing.NotRequired[str | None],
+    "geometry": typing.NotRequired[str | None],
+    "nxyz": typing.NotRequired[list[float] | None],
+    "nt": typing.NotRequired[float | None],
+})
+V3dEmptyParametersTagged = typing.TypedDict('V3dEmptyParametersTagged', {
+    "@type": typing.Literal["afni/3dEmpty"],
     "prefix": typing.NotRequired[str | None],
     "geometry": typing.NotRequired[str | None],
     "nxyz": typing.NotRequired[list[float] | None],
     "nt": 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 {
-        "3dEmpty": v_3d_empty_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 {
-        "3dEmpty": v_3d_empty_outputs,
-    }.get(t)
 
 
 class V3dEmptyOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_3d_empty(...)`.
+    Output object returned when calling `V3dEmptyParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -69,7 +44,7 @@ def v_3d_empty_params(
     geometry: str | None = None,
     nxyz: list[float] | None = None,
     nt_: float | None = None,
-) -> V3dEmptyParameters:
+) -> V3dEmptyParametersTagged:
     """
     Build parameters.
     
@@ -84,7 +59,7 @@ def v_3d_empty_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "3dEmpty",
+        "@type": "afni/3dEmpty",
     }
     if prefix is not None:
         params["prefix"] = prefix
@@ -112,25 +87,25 @@ def v_3d_empty_cargs(
     """
     cargs = []
     cargs.append("3dEmpty")
-    if params.get("prefix") is not None:
+    if params.get("prefix", None) is not None:
         cargs.extend([
             "-prefix",
-            params.get("prefix")
+            params.get("prefix", None)
         ])
-    if params.get("geometry") is not None:
+    if params.get("geometry", None) is not None:
         cargs.extend([
             "-geometry",
-            params.get("geometry")
+            params.get("geometry", None)
         ])
-    if params.get("nxyz") is not None:
+    if params.get("nxyz", None) is not None:
         cargs.extend([
             "-nxyz",
-            *map(str, params.get("nxyz"))
+            *map(str, params.get("nxyz", None))
         ])
-    if params.get("nt") is not None:
+    if params.get("nt", None) is not None:
         cargs.extend([
             "-nt",
-            str(params.get("nt"))
+            str(params.get("nt", None))
         ])
     return cargs
 
@@ -150,16 +125,18 @@ def v_3d_empty_outputs(
     """
     ret = V3dEmptyOutputs(
         root=execution.output_file("."),
-        outfile=execution.output_file(params.get("prefix") + ".HEAD") if (params.get("prefix") is not None) else None,
+        outfile=execution.output_file(params.get("prefix", None) + ".HEAD") if (params.get("prefix") is not None) else None,
     )
     return ret
 
 
 def v_3d_empty_execute(
     params: V3dEmptyParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V3dEmptyOutputs:
     """
+    3dEmpty
+    
     Tool to create an 'empty' dataset .HEAD file.
     
     Author: AFNI Developers
@@ -168,10 +145,12 @@ def v_3d_empty_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V3dEmptyOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_3D_EMPTY_METADATA)
     params = execution.params(params)
     cargs = v_3d_empty_cargs(params, execution)
     ret = v_3d_empty_outputs(params, execution)
@@ -187,6 +166,8 @@ def v_3d_empty(
     runner: Runner | None = None,
 ) -> V3dEmptyOutputs:
     """
+    3dEmpty
+    
     Tool to create an 'empty' dataset .HEAD file.
     
     Author: AFNI Developers
@@ -204,21 +185,19 @@ def v_3d_empty(
     Returns:
         NamedTuple of outputs (described in `V3dEmptyOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_3D_EMPTY_METADATA)
     params = v_3d_empty_params(
         prefix=prefix,
         geometry=geometry,
         nxyz=nxyz,
         nt_=nt_,
     )
-    return v_3d_empty_execute(params, execution)
+    return v_3d_empty_execute(params, runner)
 
 
 __all__ = [
     "V3dEmptyOutputs",
-    "V3dEmptyParameters",
     "V_3D_EMPTY_METADATA",
     "v_3d_empty",
+    "v_3d_empty_execute",
     "v_3d_empty_params",
 ]

niwrap_afni/afni/v_3d_entropy.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_3D_ENTROPY_METADATA = Metadata(
-    id="0257d51dd6a9431a9662e4b253ceaa842332ae4c.boutiques",
+    id="37180c210ae193dc8f3a04afa2996bd7472200be.boutiques",
     name="3dEntropy",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,46 +14,20 @@ V_3D_ENTROPY_METADATA = Metadata(
 
 
 V3dEntropyParameters = typing.TypedDict('V3dEntropyParameters', {
-    "__STYXTYPE__": typing.Literal["3dEntropy"],
+    "@type": typing.NotRequired[typing.Literal["afni/3dEntropy"]],
+    "zskip": bool,
+    "input_dataset": InputPathType,
+})
+V3dEntropyParametersTagged = typing.TypedDict('V3dEntropyParametersTagged', {
+    "@type": typing.Literal["afni/3dEntropy"],
     "zskip": bool,
     "input_dataset": InputPathType,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "3dEntropy": v_3d_entropy_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 V3dEntropyOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_3d_entropy(...)`.
+    Output object returned when calling `V3dEntropyParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -62,7 +36,7 @@ class V3dEntropyOutputs(typing.NamedTuple):
 def v_3d_entropy_params(
     input_dataset: InputPathType,
     zskip: bool = False,
-) -> V3dEntropyParameters:
+) -> V3dEntropyParametersTagged:
     """
     Build parameters.
     
@@ -73,7 +47,7 @@ def v_3d_entropy_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "3dEntropy",
+        "@type": "afni/3dEntropy",
         "zskip": zskip,
         "input_dataset": input_dataset,
     }
@@ -95,9 +69,9 @@ def v_3d_entropy_cargs(
     """
     cargs = []
     cargs.append("3dEntropy")
-    if params.get("zskip"):
+    if params.get("zskip", False):
         cargs.append("-zskip")
-    cargs.append(execution.input_file(params.get("input_dataset")))
+    cargs.append(execution.input_file(params.get("input_dataset", None)))
     return cargs
 
 
@@ -122,9 +96,11 @@ def v_3d_entropy_outputs(
 
 def v_3d_entropy_execute(
     params: V3dEntropyParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V3dEntropyOutputs:
     """
+    3dEntropy
+    
     Computes entropy for a 3D dataset.
     
     Author: AFNI Developers
@@ -133,10 +109,12 @@ def v_3d_entropy_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V3dEntropyOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_3D_ENTROPY_METADATA)
     params = execution.params(params)
     cargs = v_3d_entropy_cargs(params, execution)
     ret = v_3d_entropy_outputs(params, execution)
@@ -150,6 +128,8 @@ def v_3d_entropy(
     runner: Runner | None = None,
 ) -> V3dEntropyOutputs:
     """
+    3dEntropy
+    
     Computes entropy for a 3D dataset.
     
     Author: AFNI Developers
@@ -163,19 +143,17 @@ def v_3d_entropy(
     Returns:
         NamedTuple of outputs (described in `V3dEntropyOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_3D_ENTROPY_METADATA)
     params = v_3d_entropy_params(
         zskip=zskip,
         input_dataset=input_dataset,
     )
-    return v_3d_entropy_execute(params, execution)
+    return v_3d_entropy_execute(params, runner)
 
 
 __all__ = [
     "V3dEntropyOutputs",
-    "V3dEntropyParameters",
     "V_3D_ENTROPY_METADATA",
     "v_3d_entropy",
+    "v_3d_entropy_execute",
     "v_3d_entropy_params",
 ]

niwrap_afni/afni/v_3d_errts_cormat.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_3D_ERRTS_CORMAT_METADATA = Metadata(
-    id="27ff9611a565195edc13b6e85a9a5b1aa081dede.boutiques",
+    id="d14e91ea697278239ebae181e3192bf27d7d44bf.boutiques",
     name="3dErrtsCormat",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,16 @@ V_3D_ERRTS_CORMAT_METADATA = Metadata(
 
 
 V3dErrtsCormatParameters = typing.TypedDict('V3dErrtsCormatParameters', {
-    "__STYXTYPE__": typing.Literal["3dErrtsCormat"],
+    "@type": typing.NotRequired[typing.Literal["afni/3dErrtsCormat"]],
+    "dset": InputPathType,
+    "concat": typing.NotRequired[str | None],
+    "input": typing.NotRequired[InputPathType | None],
+    "mask": typing.NotRequired[InputPathType | None],
+    "maxlag": typing.NotRequired[float | None],
+    "polort": typing.NotRequired[float | None],
+})
+V3dErrtsCormatParametersTagged = typing.TypedDict('V3dErrtsCormatParametersTagged', {
+    "@type": typing.Literal["afni/3dErrtsCormat"],
     "dset": InputPathType,
     "concat": typing.NotRequired[str | None],
     "input": typing.NotRequired[InputPathType | None],
@@ -22,43 +31,11 @@ V3dErrtsCormatParameters = typing.TypedDict('V3dErrtsCormatParameters', {
     "maxlag": typing.NotRequired[float | None],
     "polort": 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 {
-        "3dErrtsCormat": v_3d_errts_cormat_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 {
-        "3dErrtsCormat": v_3d_errts_cormat_outputs,
-    }.get(t)
 
 
 class V3dErrtsCormatOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_3d_errts_cormat(...)`.
+    Output object returned when calling `V3dErrtsCormatParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -73,7 +50,7 @@ def v_3d_errts_cormat_params(
     mask: InputPathType | None = None,
     maxlag: float | None = None,
     polort: float | None = None,
-) -> V3dErrtsCormatParameters:
+) -> V3dErrtsCormatParametersTagged:
     """
     Build parameters.
     
@@ -88,7 +65,7 @@ def v_3d_errts_cormat_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "3dErrtsCormat",
+        "@type": "afni/3dErrtsCormat",
         "dset": dset,
     }
     if concat is not None:
@@ -119,31 +96,31 @@ def v_3d_errts_cormat_cargs(
     """
     cargs = []
     cargs.append("3dErrtsCormat")
-    cargs.append(execution.input_file(params.get("dset")))
-    if params.get("concat") is not None:
+    cargs.append(execution.input_file(params.get("dset", None)))
+    if params.get("concat", None) is not None:
         cargs.extend([
             "-concat",
-            params.get("concat")
+            params.get("concat", None)
         ])
-    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("mask") is not None:
+    if params.get("mask", None) is not None:
         cargs.extend([
             "-mask",
-            execution.input_file(params.get("mask"))
+            execution.input_file(params.get("mask", None))
         ])
-    if params.get("maxlag") is not None:
+    if params.get("maxlag", None) is not None:
         cargs.extend([
             "-maxlag",
-            str(params.get("maxlag"))
+            str(params.get("maxlag", None))
         ])
-    if params.get("polort") is not None:
+    if params.get("polort", None) is not None:
         cargs.extend([
             "-polort",
-            str(params.get("polort"))
+            str(params.get("polort", None))
         ])
     return cargs
 
@@ -170,11 +147,13 @@ def v_3d_errts_cormat_outputs(
 
 def v_3d_errts_cormat_execute(
     params: V3dErrtsCormatParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V3dErrtsCormatOutputs:
     """
-    Computes the correlation matrix corresponding to the residual (or error) time
-    series in 'dset'.
+    3dErrtsCormat
+    
+    Computes the correlation matrix corresponding to the residual (or error)
+    time series in 'dset'.
     
     Author: AFNI Developers
     
@@ -182,10 +161,12 @@ def v_3d_errts_cormat_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V3dErrtsCormatOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_3D_ERRTS_CORMAT_METADATA)
     params = execution.params(params)
     cargs = v_3d_errts_cormat_cargs(params, execution)
     ret = v_3d_errts_cormat_outputs(params, execution)
@@ -203,8 +184,10 @@ def v_3d_errts_cormat(
     runner: Runner | None = None,
 ) -> V3dErrtsCormatOutputs:
     """
-    Computes the correlation matrix corresponding to the residual (or error) time
-    series in 'dset'.
+    3dErrtsCormat
+    
+    Computes the correlation matrix corresponding to the residual (or error)
+    time series in 'dset'.
     
     Author: AFNI Developers
     
@@ -221,8 +204,6 @@ def v_3d_errts_cormat(
     Returns:
         NamedTuple of outputs (described in `V3dErrtsCormatOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_3D_ERRTS_CORMAT_METADATA)
     params = v_3d_errts_cormat_params(
         dset=dset,
         concat=concat,
@@ -231,13 +212,13 @@ def v_3d_errts_cormat(
         maxlag=maxlag,
         polort=polort,
     )
-    return v_3d_errts_cormat_execute(params, execution)
+    return v_3d_errts_cormat_execute(params, runner)
 
 
 __all__ = [
     "V3dErrtsCormatOutputs",
-    "V3dErrtsCormatParameters",
     "V_3D_ERRTS_CORMAT_METADATA",
     "v_3d_errts_cormat",
+    "v_3d_errts_cormat_execute",
     "v_3d_errts_cormat_params",
 ]