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

niwrap_afni/afni/v_3d_fwhmx.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_3D_FWHMX_METADATA = Metadata(
-    id="6272d178703339c8d6eba97fc0341f4e17ad91e9.boutiques",
+    id="408b0ca2210d336d7abec8bdaf127930c857b898.boutiques",
     name="3dFWHMx",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,23 @@ V_3D_FWHMX_METADATA = Metadata(
 
 
 V3dFwhmxParameters = typing.TypedDict('V3dFwhmxParameters', {
-    "__STYXTYPE__": typing.Literal["3dFWHMx"],
+    "@type": typing.NotRequired[typing.Literal["afni/3dFWHMx"]],
+    "mask": typing.NotRequired[InputPathType | None],
+    "automask": bool,
+    "demed": bool,
+    "unif": bool,
+    "detrend": typing.NotRequired[float | None],
+    "detprefix": typing.NotRequired[str | None],
+    "geom": bool,
+    "arith": bool,
+    "combine": bool,
+    "out": typing.NotRequired[str | None],
+    "compat": bool,
+    "acf": typing.NotRequired[str | None],
+    "infile": InputPathType,
+})
+V3dFwhmxParametersTagged = typing.TypedDict('V3dFwhmxParametersTagged', {
+    "@type": typing.Literal["afni/3dFWHMx"],
     "mask": typing.NotRequired[InputPathType | None],
     "automask": bool,
     "demed": bool,
@@ -29,43 +45,11 @@ V3dFwhmxParameters = typing.TypedDict('V3dFwhmxParameters', {
     "acf": typing.NotRequired[str | None],
     "infile": InputPathType,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "3dFWHMx": v_3d_fwhmx_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 {
-        "3dFWHMx": v_3d_fwhmx_outputs,
-    }.get(t)
 
 
 class V3dFwhmxOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_3d_fwhmx(...)`.
+    Output object returned when calling `V3dFwhmxParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -89,7 +73,7 @@ def v_3d_fwhmx_params(
     out: str | None = None,
     compat: bool = False,
     acf: str | None = None,
-) -> V3dFwhmxParameters:
+) -> V3dFwhmxParametersTagged:
     """
     Build parameters.
     
@@ -117,7 +101,7 @@ def v_3d_fwhmx_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "3dFWHMx",
+        "@type": "afni/3dFWHMx",
         "automask": automask,
         "demed": demed,
         "unif": unif,
@@ -155,46 +139,46 @@ def v_3d_fwhmx_cargs(
     """
     cargs = []
     cargs.append("3dFWHMx")
-    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("automask"):
+    if params.get("automask", False):
         cargs.append("-automask")
-    if params.get("demed"):
+    if params.get("demed", False):
         cargs.append("-demed")
-    if params.get("unif"):
+    if params.get("unif", False):
         cargs.append("-unif")
-    if params.get("detrend") is not None:
+    if params.get("detrend", None) is not None:
         cargs.extend([
             "-detrend",
-            str(params.get("detrend"))
+            str(params.get("detrend", None))
         ])
-    if params.get("detprefix") is not None:
+    if params.get("detprefix", None) is not None:
         cargs.extend([
             "-detprefix",
-            params.get("detprefix")
+            params.get("detprefix", None)
         ])
-    if params.get("geom"):
+    if params.get("geom", False):
         cargs.append("-geom")
-    if params.get("arith"):
+    if params.get("arith", False):
         cargs.append("-arith")
-    if params.get("combine"):
+    if params.get("combine", False):
         cargs.append("-combine")
-    if params.get("out") is not None:
+    if params.get("out", None) is not None:
         cargs.extend([
             "-out",
-            params.get("out")
+            params.get("out", None)
         ])
-    if params.get("compat"):
+    if params.get("compat", False):
         cargs.append("-compat")
-    if params.get("acf") is not None:
+    if params.get("acf", None) is not None:
         cargs.extend([
             "-acf",
-            params.get("acf")
+            params.get("acf", None)
         ])
-    cargs.append(execution.input_file(params.get("infile")))
+    cargs.append(execution.input_file(params.get("infile", None)))
     return cargs
 
 
@@ -213,17 +197,19 @@ def v_3d_fwhmx_outputs(
     """
     ret = V3dFwhmxOutputs(
         root=execution.output_file("."),
-        out_file=execution.output_file(params.get("out") + ".1D") if (params.get("out") is not None) else None,
-        detrended_dataset=execution.output_file(params.get("detprefix") + ".nii.gz") if (params.get("detprefix") is not None) else None,
+        out_file=execution.output_file(params.get("out", None) + ".1D") if (params.get("out") is not None) else None,
+        detrended_dataset=execution.output_file(params.get("detprefix", None) + ".nii.gz") if (params.get("detprefix") is not None) else None,
     )
     return ret
 
 
 def v_3d_fwhmx_execute(
     params: V3dFwhmxParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V3dFwhmxOutputs:
     """
+    3dFWHMx
+    
     Compute Full Width at Half Maximum (FWHM) for FMRI datasets using
     AutoCorrelation Function (ACF).
     
@@ -233,10 +219,12 @@ def v_3d_fwhmx_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V3dFwhmxOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_3D_FWHMX_METADATA)
     params = execution.params(params)
     cargs = v_3d_fwhmx_cargs(params, execution)
     ret = v_3d_fwhmx_outputs(params, execution)
@@ -261,6 +249,8 @@ def v_3d_fwhmx(
     runner: Runner | None = None,
 ) -> V3dFwhmxOutputs:
     """
+    3dFWHMx
+    
     Compute Full Width at Half Maximum (FWHM) for FMRI datasets using
     AutoCorrelation Function (ACF).
     
@@ -292,8 +282,6 @@ def v_3d_fwhmx(
     Returns:
         NamedTuple of outputs (described in `V3dFwhmxOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_3D_FWHMX_METADATA)
     params = v_3d_fwhmx_params(
         mask=mask,
         automask=automask,
@@ -309,13 +297,13 @@ def v_3d_fwhmx(
         acf=acf,
         infile=infile,
     )
-    return v_3d_fwhmx_execute(params, execution)
+    return v_3d_fwhmx_execute(params, runner)
 
 
 __all__ = [
     "V3dFwhmxOutputs",
-    "V3dFwhmxParameters",
     "V_3D_FWHMX_METADATA",
     "v_3d_fwhmx",
+    "v_3d_fwhmx_execute",
     "v_3d_fwhmx_params",
 ]

niwrap_afni/afni/v_3d_gen_feature_dist.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_3D_GEN_FEATURE_DIST_METADATA = Metadata(
-    id="a93f01b8f1e3bff0ef89e500133816c34255aec1.boutiques",
+    id="d42e06b53846e1ec66b2897929ce39b2457df34b.boutiques",
     name="3dGenFeatureDist",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,22 @@ V_3D_GEN_FEATURE_DIST_METADATA = Metadata(
 
 
 V3dGenFeatureDistParameters = typing.TypedDict('V3dGenFeatureDistParameters', {
-    "__STYXTYPE__": typing.Literal["3dGenFeatureDist"],
+    "@type": typing.NotRequired[typing.Literal["afni/3dGenFeatureDist"]],
+    "features_string": str,
+    "class_string": str,
+    "prefix": typing.NotRequired[str | None],
+    "overwrite": bool,
+    "debug_level": typing.NotRequired[float | None],
+    "other": bool,
+    "no_other": bool,
+    "samp": typing.NotRequired[list[str] | None],
+    "sig": typing.NotRequired[list[str] | None],
+    "hspec": typing.NotRequired[list[str] | None],
+    "labeltable": typing.NotRequired[InputPathType | None],
+    "show_histograms": typing.NotRequired[str | None],
+})
+V3dGenFeatureDistParametersTagged = typing.TypedDict('V3dGenFeatureDistParametersTagged', {
+    "@type": typing.Literal["afni/3dGenFeatureDist"],
     "features_string": str,
     "class_string": str,
     "prefix": typing.NotRequired[str | None],
@@ -28,43 +43,11 @@ V3dGenFeatureDistParameters = typing.TypedDict('V3dGenFeatureDistParameters', {
     "labeltable": typing.NotRequired[InputPathType | None],
     "show_histograms": 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 {
-        "3dGenFeatureDist": v_3d_gen_feature_dist_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 {
-        "3dGenFeatureDist": v_3d_gen_feature_dist_outputs,
-    }.get(t)
 
 
 class V3dGenFeatureDistOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_3d_gen_feature_dist(...)`.
+    Output object returned when calling `V3dGenFeatureDistParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -85,7 +68,7 @@ def v_3d_gen_feature_dist_params(
     hspec: list[str] | None = None,
     labeltable: InputPathType | None = None,
     show_histograms: str | None = None,
-) -> V3dGenFeatureDistParameters:
+) -> V3dGenFeatureDistParametersTagged:
     """
     Build parameters.
     
@@ -109,7 +92,7 @@ def v_3d_gen_feature_dist_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "3dGenFeatureDist",
+        "@type": "afni/3dGenFeatureDist",
         "features_string": features_string,
         "class_string": class_string,
         "overwrite": overwrite,
@@ -150,52 +133,52 @@ def v_3d_gen_feature_dist_cargs(
     cargs.append("3dGenFeatureDist")
     cargs.extend([
         "-features",
-        params.get("features_string")
+        params.get("features_string", None)
     ])
     cargs.extend([
         "-classes",
-        params.get("class_string")
+        params.get("class_string", 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("overwrite"):
+    if params.get("overwrite", False):
         cargs.append("-overwrite")
-    if params.get("debug_level") is not None:
+    if params.get("debug_level", None) is not None:
         cargs.extend([
             "-debug",
-            str(params.get("debug_level"))
+            str(params.get("debug_level", None))
         ])
-    if params.get("other"):
+    if params.get("other", False):
         cargs.append("-OTHER")
-    if params.get("no_other"):
+    if params.get("no_other", False):
         cargs.append("-no_OTHER")
-    if params.get("samp") is not None:
+    if params.get("samp", None) is not None:
         cargs.extend([
             "-samp",
-            *params.get("samp")
+            *params.get("samp", None)
         ])
-    if params.get("sig") is not None:
+    if params.get("sig", None) is not None:
         cargs.extend([
             "-sig",
-            *params.get("sig")
+            *params.get("sig", None)
         ])
-    if params.get("hspec") is not None:
+    if params.get("hspec", None) is not None:
         cargs.extend([
             "-hspec",
-            *params.get("hspec")
+            *params.get("hspec", None)
         ])
-    if params.get("labeltable") is not None:
+    if params.get("labeltable", None) is not None:
         cargs.extend([
             "-labeltable",
-            execution.input_file(params.get("labeltable"))
+            execution.input_file(params.get("labeltable", None))
         ])
-    if params.get("show_histograms") is not None:
+    if params.get("show_histograms", None) is not None:
         cargs.extend([
             "-ShowTheseHists",
-            params.get("show_histograms")
+            params.get("show_histograms", None)
         ])
     return cargs
 
@@ -215,16 +198,18 @@ def v_3d_gen_feature_dist_outputs(
     """
     ret = V3dGenFeatureDistOutputs(
         root=execution.output_file("."),
-        output_hive=execution.output_file(params.get("prefix") + "_hive.nii.gz") if (params.get("prefix") is not None) else None,
+        output_hive=execution.output_file(params.get("prefix", None) + "_hive.nii.gz") if (params.get("prefix") is not None) else None,
     )
     return ret
 
 
 def v_3d_gen_feature_dist_execute(
     params: V3dGenFeatureDistParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V3dGenFeatureDistOutputs:
     """
+    3dGenFeatureDist
+    
     3dGenFeatureDist produces histogram volume (hives) from input data.
     
     Author: AFNI Developers
@@ -233,10 +218,12 @@ def v_3d_gen_feature_dist_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V3dGenFeatureDistOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_3D_GEN_FEATURE_DIST_METADATA)
     params = execution.params(params)
     cargs = v_3d_gen_feature_dist_cargs(params, execution)
     ret = v_3d_gen_feature_dist_outputs(params, execution)
@@ -260,6 +247,8 @@ def v_3d_gen_feature_dist(
     runner: Runner | None = None,
 ) -> V3dGenFeatureDistOutputs:
     """
+    3dGenFeatureDist
+    
     3dGenFeatureDist produces histogram volume (hives) from input data.
     
     Author: AFNI Developers
@@ -286,8 +275,6 @@ def v_3d_gen_feature_dist(
     Returns:
         NamedTuple of outputs (described in `V3dGenFeatureDistOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_3D_GEN_FEATURE_DIST_METADATA)
     params = v_3d_gen_feature_dist_params(
         features_string=features_string,
         class_string=class_string,
@@ -302,13 +289,13 @@ def v_3d_gen_feature_dist(
         labeltable=labeltable,
         show_histograms=show_histograms,
     )
-    return v_3d_gen_feature_dist_execute(params, execution)
+    return v_3d_gen_feature_dist_execute(params, runner)
 
 
 __all__ = [
     "V3dGenFeatureDistOutputs",
-    "V3dGenFeatureDistParameters",
     "V_3D_GEN_FEATURE_DIST_METADATA",
     "v_3d_gen_feature_dist",
+    "v_3d_gen_feature_dist_execute",
     "v_3d_gen_feature_dist_params",
 ]