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

niwrap_afni/afni/imcalc.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 IMCALC_METADATA = Metadata(
-    id="0f1c33e4f0b22c6e5934a76021bc78779977e799.boutiques",
+    id="fad3aec9b2fc467edeb3c2adf90642af21b5542d.boutiques",
     name="imcalc",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,49 +14,24 @@ IMCALC_METADATA = Metadata(
 
 
 ImcalcParameters = typing.TypedDict('ImcalcParameters', {
-    "__STYXTYPE__": typing.Literal["imcalc"],
+    "@type": typing.NotRequired[typing.Literal["afni/imcalc"]],
+    "datum_type": typing.NotRequired[str | None],
+    "image_inputs": typing.NotRequired[list[InputPathType] | None],
+    "expression": str,
+    "output_name": typing.NotRequired[str | None],
+})
+ImcalcParametersTagged = typing.TypedDict('ImcalcParametersTagged', {
+    "@type": typing.Literal["afni/imcalc"],
     "datum_type": typing.NotRequired[str | None],
     "image_inputs": typing.NotRequired[list[InputPathType] | None],
     "expression": str,
     "output_name": 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 {
-        "imcalc": imcalc_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 {
-        "imcalc": imcalc_outputs,
-    }.get(t)
 
 
 class ImcalcOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `imcalc(...)`.
+    Output object returned when calling `ImcalcParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -70,7 +45,7 @@ def imcalc_params(
     datum_type: str | None = None,
     image_inputs: list[InputPathType] | None = None,
     output_name: str | None = None,
-) -> ImcalcParameters:
+) -> ImcalcParametersTagged:
     """
     Build parameters.
     
@@ -91,7 +66,7 @@ def imcalc_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "imcalc",
+        "@type": "afni/imcalc",
         "expression": expression,
     }
     if datum_type is not None:
@@ -118,24 +93,24 @@ def imcalc_cargs(
     """
     cargs = []
     cargs.append("imcalc")
-    if params.get("datum_type") is not None:
+    if params.get("datum_type", None) is not None:
         cargs.extend([
             "-datum type",
-            params.get("datum_type")
+            params.get("datum_type", None)
         ])
-    if params.get("image_inputs") is not None:
+    if params.get("image_inputs", None) is not None:
         cargs.extend([
             "-a",
-            *[execution.input_file(f) for f in params.get("image_inputs")]
+            *[execution.input_file(f) for f in params.get("image_inputs", None)]
         ])
     cargs.extend([
         "-expr",
-        params.get("expression")
+        params.get("expression", None)
     ])
-    if params.get("output_name") is not None:
+    if params.get("output_name", None) is not None:
         cargs.extend([
             "-output",
-            params.get("output_name")
+            params.get("output_name", None)
         ])
     return cargs
 
@@ -155,16 +130,18 @@ def imcalc_outputs(
     """
     ret = ImcalcOutputs(
         root=execution.output_file("."),
-        output_image=execution.output_file(params.get("output_name")) if (params.get("output_name") is not None) else None,
+        output_image=execution.output_file(params.get("output_name", None)) if (params.get("output_name") is not None) else None,
     )
     return ret
 
 
 def imcalc_execute(
     params: ImcalcParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> ImcalcOutputs:
     """
+    imcalc
+    
     Tool for arithmetic operations on 2D images, pixel-by-pixel.
     
     Author: AFNI Developers
@@ -173,10 +150,12 @@ def imcalc_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `ImcalcOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(IMCALC_METADATA)
     params = execution.params(params)
     cargs = imcalc_cargs(params, execution)
     ret = imcalc_outputs(params, execution)
@@ -192,6 +171,8 @@ def imcalc(
     runner: Runner | None = None,
 ) -> ImcalcOutputs:
     """
+    imcalc
+    
     Tool for arithmetic operations on 2D images, pixel-by-pixel.
     
     Author: AFNI Developers
@@ -215,21 +196,19 @@ def imcalc(
     Returns:
         NamedTuple of outputs (described in `ImcalcOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(IMCALC_METADATA)
     params = imcalc_params(
         datum_type=datum_type,
         image_inputs=image_inputs,
         expression=expression,
         output_name=output_name,
     )
-    return imcalc_execute(params, execution)
+    return imcalc_execute(params, runner)
 
 
 __all__ = [
     "IMCALC_METADATA",
     "ImcalcOutputs",
-    "ImcalcParameters",
     "imcalc",
+    "imcalc_execute",
     "imcalc_params",
 ]

niwrap_afni/afni/imcat.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 IMCAT_METADATA = Metadata(
-    id="bce786a5067ed7717ffe2af0c0412eb468654e62.boutiques",
+    id="6a0a0bce655557ed4d9e4948bfaf9cd151a149da.boutiques",
     name="imcat",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,35 @@ IMCAT_METADATA = Metadata(
 
 
 ImcatParameters = typing.TypedDict('ImcatParameters', {
-    "__STYXTYPE__": typing.Literal["imcat"],
+    "@type": typing.NotRequired[typing.Literal["afni/imcat"]],
+    "input_files": list[InputPathType],
+    "scale_image": typing.NotRequired[InputPathType | None],
+    "scale_pixels": typing.NotRequired[InputPathType | None],
+    "scale_intensity": bool,
+    "gscale": typing.NotRequired[float | None],
+    "rgb_out": bool,
+    "res_in": typing.NotRequired[list[float] | None],
+    "respad_in": typing.NotRequired[list[float] | None],
+    "pad_val": typing.NotRequired[float | None],
+    "crop": typing.NotRequired[list[float] | None],
+    "autocrop_ctol": typing.NotRequired[float | None],
+    "autocrop_atol": typing.NotRequired[float | None],
+    "autocrop": bool,
+    "zero_wrap": bool,
+    "white_wrap": bool,
+    "gray_wrap": typing.NotRequired[float | None],
+    "image_wrap": bool,
+    "rand_wrap": bool,
+    "prefix": typing.NotRequired[str | None],
+    "matrix": typing.NotRequired[list[float] | None],
+    "nx": typing.NotRequired[float | None],
+    "ny": typing.NotRequired[float | None],
+    "matrix_from_scale": bool,
+    "gap": typing.NotRequired[float | None],
+    "gap_col": typing.NotRequired[list[float] | None],
+})
+ImcatParametersTagged = typing.TypedDict('ImcatParametersTagged', {
+    "@type": typing.Literal["afni/imcat"],
     "input_files": list[InputPathType],
     "scale_image": typing.NotRequired[InputPathType | None],
     "scale_pixels": typing.NotRequired[InputPathType | None],
@@ -41,43 +69,11 @@ ImcatParameters = typing.TypedDict('ImcatParameters', {
     "gap": typing.NotRequired[float | None],
     "gap_col": typing.NotRequired[list[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 {
-        "imcat": imcat_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 {
-        "imcat": imcat_outputs,
-    }.get(t)
 
 
 class ImcatOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `imcat(...)`.
+    Output object returned when calling `ImcatParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -111,7 +107,7 @@ def imcat_params(
     matrix_from_scale: bool = False,
     gap: float | None = None,
     gap_col: list[float] | None = None,
-) -> ImcatParameters:
+) -> ImcatParametersTagged:
     """
     Build parameters.
     
@@ -166,7 +162,7 @@ def imcat_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "imcat",
+        "@type": "afni/imcat",
         "input_files": input_files,
         "scale_intensity": scale_intensity,
         "rgb_out": rgb_out,
@@ -227,102 +223,102 @@ def imcat_cargs(
     """
     cargs = []
     cargs.append("imcat")
-    cargs.extend([execution.input_file(f) for f in params.get("input_files")])
-    if params.get("scale_image") is not None:
+    cargs.extend([execution.input_file(f) for f in params.get("input_files", None)])
+    if params.get("scale_image", None) is not None:
         cargs.extend([
             "-scale_image",
-            execution.input_file(params.get("scale_image"))
+            execution.input_file(params.get("scale_image", None))
         ])
-    if params.get("scale_pixels") is not None:
+    if params.get("scale_pixels", None) is not None:
         cargs.extend([
             "-scale_pixels",
-            execution.input_file(params.get("scale_pixels"))
+            execution.input_file(params.get("scale_pixels", None))
         ])
-    if params.get("scale_intensity"):
+    if params.get("scale_intensity", False):
         cargs.append("-scale_intensity")
-    if params.get("gscale") is not None:
+    if params.get("gscale", None) is not None:
         cargs.extend([
             "-gscale",
-            str(params.get("gscale"))
+            str(params.get("gscale", None))
         ])
-    if params.get("rgb_out"):
+    if params.get("rgb_out", False):
         cargs.append("-rgb_out")
-    if params.get("res_in") is not None:
+    if params.get("res_in", None) is not None:
         cargs.extend([
             "-res_in",
-            *map(str, params.get("res_in"))
+            *map(str, params.get("res_in", None))
         ])
-    if params.get("respad_in") is not None:
+    if params.get("respad_in", None) is not None:
         cargs.extend([
             "-respad_in",
-            *map(str, params.get("respad_in"))
+            *map(str, params.get("respad_in", None))
         ])
-    if params.get("pad_val") is not None:
+    if params.get("pad_val", None) is not None:
         cargs.extend([
             "-pad_val",
-            str(params.get("pad_val"))
+            str(params.get("pad_val", None))
         ])
-    if params.get("crop") is not None:
+    if params.get("crop", None) is not None:
         cargs.extend([
             "-crop",
-            *map(str, params.get("crop"))
+            *map(str, params.get("crop", None))
         ])
-    if params.get("autocrop_ctol") is not None:
+    if params.get("autocrop_ctol", None) is not None:
         cargs.extend([
             "-autocrop_ctol",
-            str(params.get("autocrop_ctol"))
+            str(params.get("autocrop_ctol", None))
         ])
-    if params.get("autocrop_atol") is not None:
+    if params.get("autocrop_atol", None) is not None:
         cargs.extend([
             "-autocrop_atol",
-            str(params.get("autocrop_atol"))
+            str(params.get("autocrop_atol", None))
         ])
-    if params.get("autocrop"):
+    if params.get("autocrop", False):
         cargs.append("-autocrop")
-    if params.get("zero_wrap"):
+    if params.get("zero_wrap", False):
         cargs.append("-zero_wrap")
-    if params.get("white_wrap"):
+    if params.get("white_wrap", False):
         cargs.append("-white_wrap")
-    if params.get("gray_wrap") is not None:
+    if params.get("gray_wrap", None) is not None:
         cargs.extend([
             "-gray_wrap",
-            str(params.get("gray_wrap"))
+            str(params.get("gray_wrap", None))
         ])
-    if params.get("image_wrap"):
+    if params.get("image_wrap", False):
         cargs.append("-image_wrap")
-    if params.get("rand_wrap"):
+    if params.get("rand_wrap", False):
         cargs.append("-rand_wrap")
-    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("matrix") is not None:
+    if params.get("matrix", None) is not None:
         cargs.extend([
             "-matrix",
-            *map(str, params.get("matrix"))
+            *map(str, params.get("matrix", None))
         ])
-    if params.get("nx") is not None:
+    if params.get("nx", None) is not None:
         cargs.extend([
             "-nx",
-            str(params.get("nx"))
+            str(params.get("nx", None))
         ])
-    if params.get("ny") is not None:
+    if params.get("ny", None) is not None:
         cargs.extend([
             "-ny",
-            str(params.get("ny"))
+            str(params.get("ny", None))
         ])
-    if params.get("matrix_from_scale"):
+    if params.get("matrix_from_scale", False):
         cargs.append("-matrix_from_scale")
-    if params.get("gap") is not None:
+    if params.get("gap", None) is not None:
         cargs.extend([
             "-gap",
-            str(params.get("gap"))
+            str(params.get("gap", None))
         ])
-    if params.get("gap_col") is not None:
+    if params.get("gap_col", None) is not None:
         cargs.extend([
             "-gap_col",
-            *map(str, params.get("gap_col"))
+            *map(str, params.get("gap_col", None))
         ])
     return cargs
 
@@ -342,17 +338,20 @@ def imcat_outputs(
     """
     ret = ImcatOutputs(
         root=execution.output_file("."),
-        output_image_file=execution.output_file(params.get("prefix") + "output_image.[EXT]") if (params.get("prefix") is not None) else None,
+        output_image_file=execution.output_file(params.get("prefix", None) + "output_image.[EXT]") if (params.get("prefix") is not None) else None,
     )
     return ret
 
 
 def imcat_execute(
     params: ImcatParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> ImcatOutputs:
     """
-    Assembles a set of images into an image matrix (IM) montage of NX by NY images.
+    imcat
+    
+    Assembles a set of images into an image matrix (IM) montage of NX by NY
+    images.
     
     Author: AFNI Developers
     
@@ -360,10 +359,12 @@ def imcat_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `ImcatOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(IMCAT_METADATA)
     params = execution.params(params)
     cargs = imcat_cargs(params, execution)
     ret = imcat_outputs(params, execution)
@@ -400,7 +401,10 @@ def imcat(
     runner: Runner | None = None,
 ) -> ImcatOutputs:
     """
-    Assembles a set of images into an image matrix (IM) montage of NX by NY images.
+    imcat
+    
+    Assembles a set of images into an image matrix (IM) montage of NX by NY
+    images.
     
     Author: AFNI Developers
     
@@ -457,8 +461,6 @@ def imcat(
     Returns:
         NamedTuple of outputs (described in `ImcatOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(IMCAT_METADATA)
     params = imcat_params(
         input_files=input_files,
         scale_image=scale_image,
@@ -486,13 +488,13 @@ def imcat(
         gap=gap,
         gap_col=gap_col,
     )
-    return imcat_execute(params, execution)
+    return imcat_execute(params, runner)
 
 
 __all__ = [
     "IMCAT_METADATA",
     "ImcatOutputs",
-    "ImcatParameters",
     "imcat",
+    "imcat_execute",
     "imcat_params",
 ]