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

niwrap_afni/afni/v_3dhistog.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_3DHISTOG_METADATA = Metadata(
-    id="992d25c6f72b404f788d8f27f20442680bbe9bdd.boutiques",
+    id="24d0ff6d7c8b05720aa5aa52e4f3d4acbfcf0ae4.boutiques",
     name="3dhistog",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,28 @@ V_3DHISTOG_METADATA = Metadata(
 
 
 V3dhistogParameters = typing.TypedDict('V3dhistogParameters', {
-    "__STYXTYPE__": typing.Literal["3dhistog"],
+    "@type": typing.NotRequired[typing.Literal["afni/3dhistog"]],
+    "dataset": InputPathType,
+    "nbin": typing.NotRequired[float | None],
+    "dind": typing.NotRequired[float | None],
+    "omit": typing.NotRequired[list[float] | None],
+    "mask": typing.NotRequired[InputPathType | None],
+    "roi_mask": typing.NotRequired[InputPathType | None],
+    "doall": bool,
+    "noempty": bool,
+    "notitle": bool,
+    "log10": bool,
+    "pdf": bool,
+    "min": typing.NotRequired[float | None],
+    "max": typing.NotRequired[float | None],
+    "igfac": bool,
+    "int": bool,
+    "float": bool,
+    "unq": typing.NotRequired[str | None],
+    "prefix": typing.NotRequired[str | None],
+})
+V3dhistogParametersTagged = typing.TypedDict('V3dhistogParametersTagged', {
+    "@type": typing.Literal["afni/3dhistog"],
     "dataset": InputPathType,
     "nbin": typing.NotRequired[float | None],
     "dind": typing.NotRequired[float | None],
@@ -34,43 +55,11 @@ V3dhistogParameters = typing.TypedDict('V3dhistogParameters', {
     "unq": typing.NotRequired[str | None],
     "prefix": 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 {
-        "3dhistog": v_3dhistog_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 {
-        "3dhistog": v_3dhistog_outputs,
-    }.get(t)
 
 
 class V3dhistogOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_3dhistog(...)`.
+    Output object returned when calling `V3dhistogParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -97,7 +86,7 @@ def v_3dhistog_params(
     float_: bool = False,
     unq: str | None = None,
     prefix: str | None = None,
-) -> V3dhistogParameters:
+) -> V3dhistogParametersTagged:
     """
     Build parameters.
     
@@ -124,7 +113,7 @@ def v_3dhistog_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "3dhistog",
+        "@type": "afni/3dhistog",
         "dataset": dataset,
         "doall": doall,
         "noempty": noempty,
@@ -171,67 +160,67 @@ def v_3dhistog_cargs(
     """
     cargs = []
     cargs.append("3dhistog")
-    cargs.append(execution.input_file(params.get("dataset")))
-    if params.get("nbin") is not None:
+    cargs.append(execution.input_file(params.get("dataset", None)))
+    if params.get("nbin", None) is not None:
         cargs.extend([
             "-nbin",
-            str(params.get("nbin"))
+            str(params.get("nbin", None))
         ])
-    if params.get("dind") is not None:
+    if params.get("dind", None) is not None:
         cargs.extend([
             "-dind",
-            str(params.get("dind"))
+            str(params.get("dind", None))
         ])
-    if params.get("omit") is not None:
+    if params.get("omit", None) is not None:
         cargs.extend([
             "-omit",
-            *map(str, params.get("omit"))
+            *map(str, params.get("omit", 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("roi_mask") is not None:
+    if params.get("roi_mask", None) is not None:
         cargs.extend([
             "-roi_mask",
-            execution.input_file(params.get("roi_mask"))
+            execution.input_file(params.get("roi_mask", None))
         ])
-    if params.get("doall"):
+    if params.get("doall", False):
         cargs.append("-doall")
-    if params.get("noempty"):
+    if params.get("noempty", False):
         cargs.append("-noempty")
-    if params.get("notitle"):
+    if params.get("notitle", False):
         cargs.append("-notitle")
-    if params.get("log10"):
+    if params.get("log10", False):
         cargs.append("-log10")
-    if params.get("pdf"):
+    if params.get("pdf", False):
         cargs.append("-pdf")
-    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("igfac"):
+    if params.get("igfac", False):
         cargs.append("-igfac")
-    if params.get("int"):
+    if params.get("int", False):
         cargs.append("-int")
-    if params.get("float"):
+    if params.get("float", False):
         cargs.append("-float")
-    if params.get("unq") is not None:
+    if params.get("unq", None) is not None:
         cargs.extend([
             "-unq",
-            params.get("unq")
+            params.get("unq", 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)
         ])
     return cargs
 
@@ -258,9 +247,11 @@ def v_3dhistog_outputs(
 
 def v_3dhistog_execute(
     params: V3dhistogParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V3dhistogOutputs:
     """
+    3dhistog
+    
     Compute histogram of a 3D dataset.
     
     Author: AFNI Developers
@@ -269,10 +260,12 @@ def v_3dhistog_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V3dhistogOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_3DHISTOG_METADATA)
     params = execution.params(params)
     cargs = v_3dhistog_cargs(params, execution)
     ret = v_3dhistog_outputs(params, execution)
@@ -302,6 +295,8 @@ def v_3dhistog(
     runner: Runner | None = None,
 ) -> V3dhistogOutputs:
     """
+    3dhistog
+    
     Compute histogram of a 3D dataset.
     
     Author: AFNI Developers
@@ -331,8 +326,6 @@ def v_3dhistog(
     Returns:
         NamedTuple of outputs (described in `V3dhistogOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_3DHISTOG_METADATA)
     params = v_3dhistog_params(
         dataset=dataset,
         nbin=nbin,
@@ -353,13 +346,13 @@ def v_3dhistog(
         unq=unq,
         prefix=prefix,
     )
-    return v_3dhistog_execute(params, execution)
+    return v_3dhistog_execute(params, runner)
 
 
 __all__ = [
     "V3dhistogOutputs",
-    "V3dhistogParameters",
     "V_3DHISTOG_METADATA",
     "v_3dhistog",
+    "v_3dhistog_execute",
     "v_3dhistog_params",
 ]

niwrap_afni/afni/v_3dinfill.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_3DINFILL_METADATA = Metadata(
-    id="e192d1724307f82f868e42a5d697adf2714da949.boutiques",
+    id="7c02b47d67b1f7d68e47ba9a754a7865584a2b99.boutiques",
     name="3dinfill",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,20 @@ V_3DINFILL_METADATA = Metadata(
 
 
 V3dinfillParameters = typing.TypedDict('V3dinfillParameters', {
-    "__STYXTYPE__": typing.Literal["3dinfill"],
+    "@type": typing.NotRequired[typing.Literal["afni/3dinfill"]],
+    "input": InputPathType,
+    "prefix": typing.NotRequired[str | None],
+    "niter": typing.NotRequired[float | None],
+    "blend": typing.NotRequired[typing.Literal["MODE", "AVG", "AUTO", "SOLID", "SOLID_CLEAN"] | None],
+    "minhits": typing.NotRequired[float | None],
+    "ed": typing.NotRequired[list[float] | None],
+    "mask": typing.NotRequired[InputPathType | None],
+    "mask_range": typing.NotRequired[list[float] | None],
+    "mrange": typing.NotRequired[list[float] | None],
+    "cmask": typing.NotRequired[str | None],
+})
+V3dinfillParametersTagged = typing.TypedDict('V3dinfillParametersTagged', {
+    "@type": typing.Literal["afni/3dinfill"],
     "input": InputPathType,
     "prefix": typing.NotRequired[str | None],
     "niter": typing.NotRequired[float | None],
@@ -26,43 +39,11 @@ V3dinfillParameters = typing.TypedDict('V3dinfillParameters', {
     "mrange": typing.NotRequired[list[float] | None],
     "cmask": 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 {
-        "3dinfill": v_3dinfill_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 {
-        "3dinfill": v_3dinfill_outputs,
-    }.get(t)
 
 
 class V3dinfillOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_3dinfill(...)`.
+    Output object returned when calling `V3dinfillParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -81,7 +62,7 @@ def v_3dinfill_params(
     mask_range: list[float] | None = None,
     mrange: list[float] | None = None,
     cmask: str | None = None,
-) -> V3dinfillParameters:
+) -> V3dinfillParametersTagged:
     """
     Build parameters.
     
@@ -103,7 +84,7 @@ def v_3dinfill_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "3dinfill",
+        "@type": "afni/3dinfill",
         "input": input_,
     }
     if prefix is not None:
@@ -144,52 +125,52 @@ def v_3dinfill_cargs(
     cargs.append("3dinfill")
     cargs.extend([
         "-input",
-        execution.input_file(params.get("input"))
+        execution.input_file(params.get("input", 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("niter") is not None:
+    if params.get("niter", None) is not None:
         cargs.extend([
             "-Niter",
-            str(params.get("niter"))
+            str(params.get("niter", None))
         ])
-    if params.get("blend") is not None:
+    if params.get("blend", None) is not None:
         cargs.extend([
             "-blend",
-            params.get("blend")
+            params.get("blend", None)
         ])
-    if params.get("minhits") is not None:
+    if params.get("minhits", None) is not None:
         cargs.extend([
             "-minhits",
-            str(params.get("minhits"))
+            str(params.get("minhits", None))
         ])
-    if params.get("ed") is not None:
+    if params.get("ed", None) is not None:
         cargs.extend([
             "-ed",
-            *map(str, params.get("ed"))
+            *map(str, params.get("ed", 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("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("mrange") is not None:
+    if params.get("mrange", None) is not None:
         cargs.extend([
             "-mrange",
-            *map(str, params.get("mrange"))
+            *map(str, params.get("mrange", 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)
         ])
     return cargs
 
@@ -209,16 +190,18 @@ def v_3dinfill_outputs(
     """
     ret = V3dinfillOutputs(
         root=execution.output_file("."),
-        output_filled=execution.output_file(params.get("prefix") + "_filled.nii.gz") if (params.get("prefix") is not None) else None,
+        output_filled=execution.output_file(params.get("prefix", None) + "_filled.nii.gz") if (params.get("prefix") is not None) else None,
     )
     return ret
 
 
 def v_3dinfill_execute(
     params: V3dinfillParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V3dinfillOutputs:
     """
+    3dinfill
+    
     A program to fill holes in volumes.
     
     Author: AFNI Developers
@@ -227,10 +210,12 @@ def v_3dinfill_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V3dinfillOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_3DINFILL_METADATA)
     params = execution.params(params)
     cargs = v_3dinfill_cargs(params, execution)
     ret = v_3dinfill_outputs(params, execution)
@@ -252,6 +237,8 @@ def v_3dinfill(
     runner: Runner | None = None,
 ) -> V3dinfillOutputs:
     """
+    3dinfill
+    
     A program to fill holes in volumes.
     
     Author: AFNI Developers
@@ -276,8 +263,6 @@ def v_3dinfill(
     Returns:
         NamedTuple of outputs (described in `V3dinfillOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_3DINFILL_METADATA)
     params = v_3dinfill_params(
         input_=input_,
         prefix=prefix,
@@ -290,13 +275,13 @@ def v_3dinfill(
         mrange=mrange,
         cmask=cmask,
     )
-    return v_3dinfill_execute(params, execution)
+    return v_3dinfill_execute(params, runner)
 
 
 __all__ = [
     "V3dinfillOutputs",
-    "V3dinfillParameters",
     "V_3DINFILL_METADATA",
     "v_3dinfill",
+    "v_3dinfill_execute",
     "v_3dinfill_params",
 ]