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

niwrap_afni/afni/im2niml.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 IM2NIML_METADATA = Metadata(
-    id="2a0436ee9182dd43de4cbf9c42cb1f57c2e1fb60.boutiques",
+    id="eda05f20006bcc319f13cf8ffa9492641613d316.boutiques",
     name="im2niml",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,46 +14,18 @@ IM2NIML_METADATA = Metadata(
 
 
 Im2nimlParameters = typing.TypedDict('Im2nimlParameters', {
-    "__STYXTYPE__": typing.Literal["im2niml"],
+    "@type": typing.NotRequired[typing.Literal["afni/im2niml"]],
+    "input_files": list[InputPathType],
+})
+Im2nimlParametersTagged = typing.TypedDict('Im2nimlParametersTagged', {
+    "@type": typing.Literal["afni/im2niml"],
     "input_files": list[InputPathType],
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "im2niml": im2niml_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 {
-        "im2niml": im2niml_outputs,
-    }.get(t)
 
 
 class Im2nimlOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `im2niml(...)`.
+    Output object returned when calling `Im2nimlParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -63,7 +35,7 @@ class Im2nimlOutputs(typing.NamedTuple):
 
 def im2niml_params(
     input_files: list[InputPathType],
-) -> Im2nimlParameters:
+) -> Im2nimlParametersTagged:
     """
     Build parameters.
     
@@ -73,7 +45,7 @@ def im2niml_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "im2niml",
+        "@type": "afni/im2niml",
         "input_files": input_files,
     }
     return params
@@ -94,7 +66,7 @@ def im2niml_cargs(
     """
     cargs = []
     cargs.append("im2niml")
-    cargs.extend([execution.input_file(f) for f in params.get("input_files")])
+    cargs.extend([execution.input_file(f) for f in params.get("input_files", None)])
     return cargs
 
 
@@ -120,11 +92,13 @@ def im2niml_outputs(
 
 def im2niml_execute(
     params: Im2nimlParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> Im2nimlOutputs:
     """
-    Converts the input image(s) to a text-based NIML element and writes the result
-    to stdout.
+    im2niml
+    
+    Converts the input image(s) to a text-based NIML element and writes the
+    result to stdout.
     
     Author: AFNI Developers
     
@@ -132,10 +106,12 @@ def im2niml_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `Im2nimlOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(IM2NIML_METADATA)
     params = execution.params(params)
     cargs = im2niml_cargs(params, execution)
     ret = im2niml_outputs(params, execution)
@@ -148,8 +124,10 @@ def im2niml(
     runner: Runner | None = None,
 ) -> Im2nimlOutputs:
     """
-    Converts the input image(s) to a text-based NIML element and writes the result
-    to stdout.
+    im2niml
+    
+    Converts the input image(s) to a text-based NIML element and writes the
+    result to stdout.
     
     Author: AFNI Developers
     
@@ -161,18 +139,16 @@ def im2niml(
     Returns:
         NamedTuple of outputs (described in `Im2nimlOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(IM2NIML_METADATA)
     params = im2niml_params(
         input_files=input_files,
     )
-    return im2niml_execute(params, execution)
+    return im2niml_execute(params, runner)
 
 
 __all__ = [
     "IM2NIML_METADATA",
     "Im2nimlOutputs",
-    "Im2nimlParameters",
     "im2niml",
+    "im2niml_execute",
     "im2niml_params",
 ]

niwrap_afni/afni/images_equal.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 IMAGES_EQUAL_METADATA = Metadata(
-    id="9bd5ef4657b2f5b3565b21538cdce22656191bb6.boutiques",
+    id="56cce9d5304404daa9e4fb664f00f690b28c9d64.boutiques",
     name="images_equal",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,48 +14,22 @@ IMAGES_EQUAL_METADATA = Metadata(
 
 
 ImagesEqualParameters = typing.TypedDict('ImagesEqualParameters', {
-    "__STYXTYPE__": typing.Literal["images_equal"],
+    "@type": typing.NotRequired[typing.Literal["afni/images_equal"]],
+    "file_a": InputPathType,
+    "file_b": InputPathType,
+    "all_flag": bool,
+})
+ImagesEqualParametersTagged = typing.TypedDict('ImagesEqualParametersTagged', {
+    "@type": typing.Literal["afni/images_equal"],
     "file_a": InputPathType,
     "file_b": InputPathType,
     "all_flag": bool,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "images_equal": images_equal_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 {
-        "images_equal": images_equal_outputs,
-    }.get(t)
 
 
 class ImagesEqualOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `images_equal(...)`.
+    Output object returned when calling `ImagesEqualParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -67,7 +41,7 @@ def images_equal_params(
     file_a: InputPathType,
     file_b: InputPathType,
     all_flag: bool = False,
-) -> ImagesEqualParameters:
+) -> ImagesEqualParametersTagged:
     """
     Build parameters.
     
@@ -80,7 +54,7 @@ def images_equal_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "images_equal",
+        "@type": "afni/images_equal",
         "file_a": file_a,
         "file_b": file_b,
         "all_flag": all_flag,
@@ -103,9 +77,9 @@ def images_equal_cargs(
     """
     cargs = []
     cargs.append("images_equal")
-    cargs.append(execution.input_file(params.get("file_a")))
-    cargs.append(execution.input_file(params.get("file_b")))
-    if params.get("all_flag"):
+    cargs.append(execution.input_file(params.get("file_a", None)))
+    cargs.append(execution.input_file(params.get("file_b", None)))
+    if params.get("all_flag", False):
         cargs.append("-all")
     return cargs
 
@@ -132,9 +106,11 @@ def images_equal_outputs(
 
 def images_equal_execute(
     params: ImagesEqualParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> ImagesEqualOutputs:
     """
+    images_equal
+    
     A simple program to test if two 2D images are identical.
     
     Author: AFNI Developers
@@ -143,10 +119,12 @@ def images_equal_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `ImagesEqualOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(IMAGES_EQUAL_METADATA)
     params = execution.params(params)
     cargs = images_equal_cargs(params, execution)
     ret = images_equal_outputs(params, execution)
@@ -161,6 +139,8 @@ def images_equal(
     runner: Runner | None = None,
 ) -> ImagesEqualOutputs:
     """
+    images_equal
+    
     A simple program to test if two 2D images are identical.
     
     Author: AFNI Developers
@@ -176,20 +156,18 @@ def images_equal(
     Returns:
         NamedTuple of outputs (described in `ImagesEqualOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(IMAGES_EQUAL_METADATA)
     params = images_equal_params(
         file_a=file_a,
         file_b=file_b,
         all_flag=all_flag,
     )
-    return images_equal_execute(params, execution)
+    return images_equal_execute(params, runner)
 
 
 __all__ = [
     "IMAGES_EQUAL_METADATA",
     "ImagesEqualOutputs",
-    "ImagesEqualParameters",
     "images_equal",
+    "images_equal_execute",
     "images_equal_params",
 ]

niwrap_afni/afni/imand.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 IMAND_METADATA = Metadata(
-    id="b40e806d98777d64f69b492452a28ccfcaf0b51d.boutiques",
+    id="987cb10db225be56d6e8bb2ec32c65ec1c02e5c3.boutiques",
     name="imand",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,48 +14,22 @@ IMAND_METADATA = Metadata(
 
 
 ImandParameters = typing.TypedDict('ImandParameters', {
-    "__STYXTYPE__": typing.Literal["imand"],
+    "@type": typing.NotRequired[typing.Literal["afni/imand"]],
+    "threshold": typing.NotRequired[float | None],
+    "input_images": list[InputPathType],
+    "output_image": str,
+})
+ImandParametersTagged = typing.TypedDict('ImandParametersTagged', {
+    "@type": typing.Literal["afni/imand"],
     "threshold": typing.NotRequired[float | None],
     "input_images": list[InputPathType],
     "output_image": str,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "imand": imand_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 {
-        "imand": imand_outputs,
-    }.get(t)
 
 
 class ImandOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `imand(...)`.
+    Output object returned when calling `ImandParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -67,7 +41,7 @@ def imand_params(
     input_images: list[InputPathType],
     output_image: str,
     threshold: float | None = None,
-) -> ImandParameters:
+) -> ImandParametersTagged:
     """
     Build parameters.
     
@@ -81,7 +55,7 @@ def imand_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "imand",
+        "@type": "afni/imand",
         "input_images": input_images,
         "output_image": output_image,
     }
@@ -105,13 +79,13 @@ def imand_cargs(
     """
     cargs = []
     cargs.append("imand")
-    if params.get("threshold") is not None:
+    if params.get("threshold", None) is not None:
         cargs.extend([
             "--thresh",
-            str(params.get("threshold"))
+            str(params.get("threshold", None))
         ])
-    cargs.extend([execution.input_file(f) for f in params.get("input_images")])
-    cargs.append(params.get("output_image"))
+    cargs.extend([execution.input_file(f) for f in params.get("input_images", None)])
+    cargs.append(params.get("output_image", None))
     return cargs
 
 
@@ -130,18 +104,20 @@ def imand_outputs(
     """
     ret = ImandOutputs(
         root=execution.output_file("."),
-        outfile=execution.output_file(params.get("output_image")),
+        outfile=execution.output_file(params.get("output_image", None)),
     )
     return ret
 
 
 def imand_execute(
     params: ImandParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> ImandOutputs:
     """
-    Image AND operation tool. Only pixels nonzero in all input images (and above the
-    threshold, if given) will be output.
+    imand
+    
+    Image AND operation tool. Only pixels nonzero in all input images (and above
+    the threshold, if given) will be output.
     
     Author: AFNI Developers
     
@@ -149,10 +125,12 @@ def imand_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `ImandOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(IMAND_METADATA)
     params = execution.params(params)
     cargs = imand_cargs(params, execution)
     ret = imand_outputs(params, execution)
@@ -167,8 +145,10 @@ def imand(
     runner: Runner | None = None,
 ) -> ImandOutputs:
     """
-    Image AND operation tool. Only pixels nonzero in all input images (and above the
-    threshold, if given) will be output.
+    imand
+    
+    Image AND operation tool. Only pixels nonzero in all input images (and above
+    the threshold, if given) will be output.
     
     Author: AFNI Developers
     
@@ -184,20 +164,18 @@ def imand(
     Returns:
         NamedTuple of outputs (described in `ImandOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(IMAND_METADATA)
     params = imand_params(
         threshold=threshold,
         input_images=input_images,
         output_image=output_image,
     )
-    return imand_execute(params, execution)
+    return imand_execute(params, runner)
 
 
 __all__ = [
     "IMAND_METADATA",
     "ImandOutputs",
-    "ImandParameters",
     "imand",
+    "imand_execute",
     "imand_params",
 ]

niwrap_afni/afni/imaver.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 IMAVER_METADATA = Metadata(
-    id="8d8afa638c5562c34495b2bfecf8b92253a461cf.boutiques",
+    id="3aa2facfc11de3cac6e144e60e5558a9cf652b9f.boutiques",
     name="imaver",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,48 +14,22 @@ IMAVER_METADATA = Metadata(
 
 
 ImaverParameters = typing.TypedDict('ImaverParameters', {
-    "__STYXTYPE__": typing.Literal["imaver"],
+    "@type": typing.NotRequired[typing.Literal["afni/imaver"]],
+    "out_ave": typing.NotRequired[str | None],
+    "out_sig": typing.NotRequired[str | None],
+    "input_images": list[InputPathType],
+})
+ImaverParametersTagged = typing.TypedDict('ImaverParametersTagged', {
+    "@type": typing.Literal["afni/imaver"],
     "out_ave": typing.NotRequired[str | None],
     "out_sig": typing.NotRequired[str | None],
     "input_images": list[InputPathType],
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "imaver": imaver_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 {
-        "imaver": imaver_outputs,
-    }.get(t)
 
 
 class ImaverOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `imaver(...)`.
+    Output object returned when calling `ImaverParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -69,7 +43,7 @@ def imaver_params(
     input_images: list[InputPathType],
     out_ave: str | None = None,
     out_sig: str | None = None,
-) -> ImaverParameters:
+) -> ImaverParametersTagged:
     """
     Build parameters.
     
@@ -81,7 +55,7 @@ def imaver_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "imaver",
+        "@type": "afni/imaver",
         "input_images": input_images,
     }
     if out_ave is not None:
@@ -106,11 +80,11 @@ def imaver_cargs(
     """
     cargs = []
     cargs.append("imaver")
-    if params.get("out_ave") is not None:
-        cargs.append(params.get("out_ave"))
-    if params.get("out_sig") is not None:
-        cargs.append(params.get("out_sig"))
-    cargs.extend([execution.input_file(f) for f in params.get("input_images")])
+    if params.get("out_ave", None) is not None:
+        cargs.append(params.get("out_ave", None))
+    if params.get("out_sig", None) is not None:
+        cargs.append(params.get("out_sig", None))
+    cargs.extend([execution.input_file(f) for f in params.get("input_images", None)])
     return cargs
 
 
@@ -129,19 +103,21 @@ def imaver_outputs(
     """
     ret = ImaverOutputs(
         root=execution.output_file("."),
-        out_ave_output=execution.output_file(params.get("out_ave")) if (params.get("out_ave") is not None) else None,
-        out_sig_output=execution.output_file(params.get("out_sig")) if (params.get("out_sig") is not None) else None,
+        out_ave_output=execution.output_file(params.get("out_ave", None)) if (params.get("out_ave") is not None) else None,
+        out_sig_output=execution.output_file(params.get("out_sig", None)) if (params.get("out_sig") is not None) else None,
     )
     return ret
 
 
 def imaver_execute(
     params: ImaverParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> ImaverOutputs:
     """
-    Computes the mean and standard deviation, pixel-by-pixel, of a whole bunch of
-    images.
+    imaver
+    
+    Computes the mean and standard deviation, pixel-by-pixel, of a whole bunch
+    of images.
     
     Author: AFNI Developers
     
@@ -149,10 +125,12 @@ def imaver_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `ImaverOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(IMAVER_METADATA)
     params = execution.params(params)
     cargs = imaver_cargs(params, execution)
     ret = imaver_outputs(params, execution)
@@ -167,8 +145,10 @@ def imaver(
     runner: Runner | None = None,
 ) -> ImaverOutputs:
     """
-    Computes the mean and standard deviation, pixel-by-pixel, of a whole bunch of
-    images.
+    imaver
+    
+    Computes the mean and standard deviation, pixel-by-pixel, of a whole bunch
+    of images.
     
     Author: AFNI Developers
     
@@ -182,20 +162,18 @@ def imaver(
     Returns:
         NamedTuple of outputs (described in `ImaverOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(IMAVER_METADATA)
     params = imaver_params(
         out_ave=out_ave,
         out_sig=out_sig,
         input_images=input_images,
     )
-    return imaver_execute(params, execution)
+    return imaver_execute(params, runner)
 
 
 __all__ = [
     "IMAVER_METADATA",
     "ImaverOutputs",
-    "ImaverParameters",
     "imaver",
+    "imaver_execute",
     "imaver_params",
 ]