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

niwrap_afni/afni/v_3d_hist.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_3D_HIST_METADATA = Metadata(
-    id="9e96048d8d417ad0c0b2cb1ebd17194a1c90d3b8.boutiques",
+    id="9ed3795a6a7ee1b571a822487ea09a4c6478ae4e.boutiques",
     name="3dHist",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,30 @@ V_3D_HIST_METADATA = Metadata(
 
 
 V3dHistParameters = typing.TypedDict('V3dHistParameters', {
-    "__STYXTYPE__": typing.Literal["3dHist"],
+    "@type": typing.NotRequired[typing.Literal["afni/3dHist"]],
+    "input": InputPathType,
+    "dind_subbrick": typing.NotRequired[float | None],
+    "mask_dset": typing.NotRequired[InputPathType | None],
+    "mask_range": typing.NotRequired[list[float] | None],
+    "cmask": typing.NotRequired[str | None],
+    "hist_file": typing.NotRequired[InputPathType | None],
+    "prefix": typing.NotRequired[str | None],
+    "equalized": typing.NotRequired[str | None],
+    "nbin": typing.NotRequired[float | None],
+    "min": typing.NotRequired[float | None],
+    "max": typing.NotRequired[float | None],
+    "binwidth": typing.NotRequired[float | None],
+    "ignore_out": bool,
+    "range_hist": typing.NotRequired[InputPathType | None],
+    "showhist": bool,
+    "at_val": typing.NotRequired[float | None],
+    "get_params": typing.NotRequired[str | None],
+    "voxvol": typing.NotRequired[float | None],
+    "val_at": typing.NotRequired[str | None],
+    "quiet": bool,
+})
+V3dHistParametersTagged = typing.TypedDict('V3dHistParametersTagged', {
+    "@type": typing.Literal["afni/3dHist"],
     "input": InputPathType,
     "dind_subbrick": typing.NotRequired[float | None],
     "mask_dset": typing.NotRequired[InputPathType | None],
@@ -36,42 +59,11 @@ V3dHistParameters = typing.TypedDict('V3dHistParameters', {
     "val_at": typing.NotRequired[str | None],
     "quiet": bool,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "3dHist": v_3d_hist_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 V3dHistOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_3d_hist(...)`.
+    Output object returned when calling `V3dHistParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -98,7 +90,7 @@ def v_3d_hist_params(
     voxvol: float | None = None,
     val_at: str | None = None,
     quiet: bool = False,
-) -> V3dHistParameters:
+) -> V3dHistParametersTagged:
     """
     Build parameters.
     
@@ -133,7 +125,7 @@ def v_3d_hist_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "3dHist",
+        "@type": "afni/3dHist",
         "input": input_,
         "ignore_out": ignore_out,
         "showhist": showhist,
@@ -189,92 +181,92 @@ def v_3d_hist_cargs(
     """
     cargs = []
     cargs.append("3dHist")
-    cargs.append(execution.input_file(params.get("input")))
-    if params.get("dind_subbrick") is not None:
+    cargs.append(execution.input_file(params.get("input", None)))
+    if params.get("dind_subbrick", None) is not None:
         cargs.extend([
             "-dind",
-            str(params.get("dind_subbrick"))
+            str(params.get("dind_subbrick", None))
         ])
-    if params.get("mask_dset") is not None:
+    if params.get("mask_dset", None) is not None:
         cargs.extend([
             "-mask",
-            execution.input_file(params.get("mask_dset"))
+            execution.input_file(params.get("mask_dset", None))
         ])
-    if params.get("mask_range") is not None:
+    if params.get("mask_range", None) is not None:
         cargs.extend([
             "-mask_range",
-            *map(str, params.get("mask_range"))
+            *map(str, params.get("mask_range", None))
         ])
-    if params.get("cmask") is not None:
+    if params.get("cmask", None) is not None:
         cargs.extend([
             "-cmask",
-            params.get("cmask")
+            params.get("cmask", None)
         ])
-    if params.get("hist_file") is not None:
+    if params.get("hist_file", None) is not None:
         cargs.extend([
             "-thishist",
-            execution.input_file(params.get("hist_file"))
+            execution.input_file(params.get("hist_file", None))
         ])
-    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("equalized") is not None:
+    if params.get("equalized", None) is not None:
         cargs.extend([
             "-equalized",
-            params.get("equalized")
+            params.get("equalized", None)
         ])
-    if params.get("nbin") is not None:
+    if params.get("nbin", None) is not None:
         cargs.extend([
             "-nbin",
-            str(params.get("nbin"))
+            str(params.get("nbin", None))
         ])
-    if params.get("min") is not None:
+    if params.get("min", None) is not None:
         cargs.extend([
             "-min",
-            str(params.get("min"))
+            str(params.get("min", None))
         ])
-    if params.get("max") is not None:
+    if params.get("max", None) is not None:
         cargs.extend([
             "-max",
-            str(params.get("max"))
+            str(params.get("max", None))
         ])
-    if params.get("binwidth") is not None:
+    if params.get("binwidth", None) is not None:
         cargs.extend([
             "-binwidth",
-            str(params.get("binwidth"))
+            str(params.get("binwidth", None))
         ])
-    if params.get("ignore_out"):
+    if params.get("ignore_out", False):
         cargs.append("-ignore_out")
-    if params.get("range_hist") is not None:
+    if params.get("range_hist", None) is not None:
         cargs.extend([
             "-rhist",
-            execution.input_file(params.get("range_hist"))
+            execution.input_file(params.get("range_hist", None))
         ])
-    if params.get("showhist"):
+    if params.get("showhist", False):
         cargs.append("-showhist")
-    if params.get("at_val") is not None:
+    if params.get("at_val", None) is not None:
         cargs.extend([
             "-at",
-            str(params.get("at_val"))
+            str(params.get("at_val", None))
         ])
-    if params.get("get_params") is not None:
+    if params.get("get_params", None) is not None:
         cargs.extend([
             "-get",
-            params.get("get_params")
+            params.get("get_params", None)
         ])
-    if params.get("voxvol") is not None:
+    if params.get("voxvol", None) is not None:
         cargs.extend([
             "-voxvol",
-            str(params.get("voxvol"))
+            str(params.get("voxvol", None))
         ])
-    if params.get("val_at") is not None:
+    if params.get("val_at", None) is not None:
         cargs.extend([
             "-val_at",
-            params.get("val_at")
+            params.get("val_at", None)
         ])
-    if params.get("quiet"):
+    if params.get("quiet", False):
         cargs.append("-quiet")
     return cargs
 
@@ -300,9 +292,11 @@ def v_3d_hist_outputs(
 
 def v_3d_hist_execute(
     params: V3dHistParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V3dHistOutputs:
     """
+    3dHist
+    
     Computes histograms using functions for generating priors.
     
     Author: AFNI Developers
@@ -311,10 +305,12 @@ def v_3d_hist_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V3dHistOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_3D_HIST_METADATA)
     params = execution.params(params)
     cargs = v_3d_hist_cargs(params, execution)
     ret = v_3d_hist_outputs(params, execution)
@@ -346,6 +342,8 @@ def v_3d_hist(
     runner: Runner | None = None,
 ) -> V3dHistOutputs:
     """
+    3dHist
+    
     Computes histograms using functions for generating priors.
     
     Author: AFNI Developers
@@ -383,8 +381,6 @@ def v_3d_hist(
     Returns:
         NamedTuple of outputs (described in `V3dHistOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_3D_HIST_METADATA)
     params = v_3d_hist_params(
         input_=input_,
         dind_subbrick=dind_subbrick,
@@ -407,13 +403,13 @@ def v_3d_hist(
         val_at=val_at,
         quiet=quiet,
     )
-    return v_3d_hist_execute(params, execution)
+    return v_3d_hist_execute(params, runner)
 
 
 __all__ = [
     "V3dHistOutputs",
-    "V3dHistParameters",
     "V_3D_HIST_METADATA",
     "v_3d_hist",
+    "v_3d_hist_execute",
     "v_3d_hist_params",
 ]

niwrap_afni/afni/v_3d_icc.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_3D_ICC_METADATA = Metadata(
-    id="58d26a68e385d16936a1a88b29bf7a5505bc0d8f.boutiques",
+    id="7b457f0376258e279b541a448350293a753fe7d3.boutiques",
     name="3dICC",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,24 @@ V_3D_ICC_METADATA = Metadata(
 
 
 V3dIccParameters = typing.TypedDict('V3dIccParameters', {
-    "__STYXTYPE__": typing.Literal["3dICC"],
+    "@type": typing.NotRequired[typing.Literal["afni/3dICC"]],
+    "model": str,
+    "prefix": str,
+    "mask": typing.NotRequired[InputPathType | None],
+    "data_table": str,
+    "bounds": typing.NotRequired[list[float] | None],
+    "jobs": typing.NotRequired[float | None],
+    "qVars": typing.NotRequired[str | None],
+    "qVarCenters": typing.NotRequired[str | None],
+    "subj": typing.NotRequired[str | None],
+    "input_file_column": typing.NotRequired[str | None],
+    "tStat": typing.NotRequired[str | None],
+    "dbgArgs": bool,
+    "cio": bool,
+    "rio": bool,
+})
+V3dIccParametersTagged = typing.TypedDict('V3dIccParametersTagged', {
+    "@type": typing.Literal["afni/3dICC"],
     "model": str,
     "prefix": str,
     "mask": typing.NotRequired[InputPathType | None],
@@ -30,43 +47,11 @@ V3dIccParameters = typing.TypedDict('V3dIccParameters', {
     "cio": bool,
     "rio": bool,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "3dICC": v_3d_icc_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 {
-        "3dICC": v_3d_icc_outputs,
-    }.get(t)
 
 
 class V3dIccOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_3d_icc(...)`.
+    Output object returned when calling `V3dIccParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -89,7 +74,7 @@ def v_3d_icc_params(
     dbg_args: bool = False,
     cio: bool = False,
     rio: bool = False,
-) -> V3dIccParameters:
+) -> V3dIccParametersTagged:
     """
     Build parameters.
     
@@ -129,7 +114,7 @@ def v_3d_icc_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "3dICC",
+        "@type": "afni/3dICC",
         "model": model,
         "prefix": prefix,
         "data_table": data_table,
@@ -171,60 +156,60 @@ def v_3d_icc_cargs(
     """
     cargs = []
     cargs.append("3dICC")
-    cargs.append(params.get("model"))
+    cargs.append(params.get("model", None))
     cargs.extend([
         "-prefix",
-        params.get("prefix")
+        params.get("prefix", 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))
         ])
     cargs.extend([
         "-dataTable",
-        params.get("data_table")
+        params.get("data_table", None)
     ])
-    if params.get("bounds") is not None:
+    if params.get("bounds", None) is not None:
         cargs.extend([
             "-bounds",
-            *map(str, params.get("bounds"))
+            *map(str, params.get("bounds", None))
         ])
-    if params.get("jobs") is not None:
+    if params.get("jobs", None) is not None:
         cargs.extend([
             "-jobs",
-            str(params.get("jobs"))
+            str(params.get("jobs", None))
         ])
-    if params.get("qVars") is not None:
+    if params.get("qVars", None) is not None:
         cargs.extend([
             "-qVars",
-            params.get("qVars")
+            params.get("qVars", None)
         ])
-    if params.get("qVarCenters") is not None:
+    if params.get("qVarCenters", None) is not None:
         cargs.extend([
             "-qVarCenters",
-            params.get("qVarCenters")
+            params.get("qVarCenters", None)
         ])
-    if params.get("subj") is not None:
+    if params.get("subj", None) is not None:
         cargs.extend([
             "-Subj",
-            params.get("subj")
+            params.get("subj", None)
         ])
-    if params.get("input_file_column") is not None:
+    if params.get("input_file_column", None) is not None:
         cargs.extend([
             "-IF",
-            params.get("input_file_column")
+            params.get("input_file_column", None)
         ])
-    if params.get("tStat") is not None:
+    if params.get("tStat", None) is not None:
         cargs.extend([
             "-tStat",
-            params.get("tStat")
+            params.get("tStat", None)
         ])
-    if params.get("dbgArgs"):
+    if params.get("dbgArgs", False):
         cargs.append("-dbgArgs")
-    if params.get("cio"):
+    if params.get("cio", False):
         cargs.append("-cio")
-    if params.get("rio"):
+    if params.get("rio", False):
         cargs.append("-Rio")
     return cargs
 
@@ -244,16 +229,18 @@ def v_3d_icc_outputs(
     """
     ret = V3dIccOutputs(
         root=execution.output_file("."),
-        output_file=execution.output_file(params.get("prefix")),
+        output_file=execution.output_file(params.get("prefix", None)),
     )
     return ret
 
 
 def v_3d_icc_execute(
     params: V3dIccParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V3dIccOutputs:
     """
+    3dICC
+    
     AFNI Program for IntraClass Correlatin (ICC) Analysis.
     
     Author: AFNI Developers
@@ -262,10 +249,12 @@ def v_3d_icc_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V3dIccOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_3D_ICC_METADATA)
     params = execution.params(params)
     cargs = v_3d_icc_cargs(params, execution)
     ret = v_3d_icc_outputs(params, execution)
@@ -291,6 +280,8 @@ def v_3d_icc(
     runner: Runner | None = None,
 ) -> V3dIccOutputs:
     """
+    3dICC
+    
     AFNI Program for IntraClass Correlatin (ICC) Analysis.
     
     Author: AFNI Developers
@@ -333,8 +324,6 @@ def v_3d_icc(
     Returns:
         NamedTuple of outputs (described in `V3dIccOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_3D_ICC_METADATA)
     params = v_3d_icc_params(
         model=model,
         prefix=prefix,
@@ -351,13 +340,13 @@ def v_3d_icc(
         cio=cio,
         rio=rio,
     )
-    return v_3d_icc_execute(params, execution)
+    return v_3d_icc_execute(params, runner)
 
 
 __all__ = [
     "V3dIccOutputs",
-    "V3dIccParameters",
     "V_3D_ICC_METADATA",
     "v_3d_icc",
+    "v_3d_icc_execute",
     "v_3d_icc_params",
 ]