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

niwrap_afni/afni/build_afni_py.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 BUILD_AFNI_PY_METADATA = Metadata(
-    id="86382e00a46401d4ac069f12c3111c8bba268536.boutiques",
+    id="a6b65e6fa762c332efd5d39d0bb4c55e05e3452f.boutiques",
     name="build_afni.py",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,26 @@ BUILD_AFNI_PY_METADATA = Metadata(
 
 
 BuildAfniPyParameters = typing.TypedDict('BuildAfniPyParameters', {
-    "__STYXTYPE__": typing.Literal["build_afni.py"],
+    "@type": typing.NotRequired[typing.Literal["afni/build_afni.py"]],
+    "build_root": str,
+    "clean_root": typing.NotRequired[str | None],
+    "git_branch": typing.NotRequired[str | None],
+    "git_tag": typing.NotRequired[str | None],
+    "git_update": typing.NotRequired[str | None],
+    "make_target": typing.NotRequired[str | None],
+    "makefile": typing.NotRequired[str | None],
+    "package": typing.NotRequired[str | None],
+    "prep_only": bool,
+    "run_cmake": typing.NotRequired[str | None],
+    "run_make": typing.NotRequired[str | None],
+    "verbose_level": typing.NotRequired[float | None],
+    "help": bool,
+    "history": bool,
+    "show_valid_opts": bool,
+    "version": bool,
+})
+BuildAfniPyParametersTagged = typing.TypedDict('BuildAfniPyParametersTagged', {
+    "@type": typing.Literal["afni/build_afni.py"],
     "build_root": str,
     "clean_root": typing.NotRequired[str | None],
     "git_branch": typing.NotRequired[str | None],
@@ -32,43 +51,11 @@ BuildAfniPyParameters = typing.TypedDict('BuildAfniPyParameters', {
     "show_valid_opts": bool,
     "version": bool,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "build_afni.py": build_afni_py_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 {
-        "build_afni.py": build_afni_py_outputs,
-    }.get(t)
 
 
 class BuildAfniPyOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `build_afni_py(...)`.
+    Output object returned when calling `BuildAfniPyParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -95,7 +82,7 @@ def build_afni_py_params(
     history: bool = False,
     show_valid_opts: bool = False,
     version: bool = False,
-) -> BuildAfniPyParameters:
+) -> BuildAfniPyParametersTagged:
     """
     Build parameters.
     
@@ -120,7 +107,7 @@ def build_afni_py_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "build_afni.py",
+        "@type": "afni/build_afni.py",
         "build_root": build_root,
         "prep_only": prep_only,
         "help": help_,
@@ -168,67 +155,67 @@ def build_afni_py_cargs(
     cargs.append("build_afni.py")
     cargs.extend([
         "-build_root",
-        params.get("build_root")
+        params.get("build_root", None)
     ])
-    if params.get("clean_root") is not None:
+    if params.get("clean_root", None) is not None:
         cargs.extend([
             "-clean_root",
-            params.get("clean_root")
+            params.get("clean_root", None)
         ])
-    if params.get("git_branch") is not None:
+    if params.get("git_branch", None) is not None:
         cargs.extend([
             "-git_branch",
-            params.get("git_branch")
+            params.get("git_branch", None)
         ])
-    if params.get("git_tag") is not None:
+    if params.get("git_tag", None) is not None:
         cargs.extend([
             "-git_tag",
-            params.get("git_tag")
+            params.get("git_tag", None)
         ])
-    if params.get("git_update") is not None:
+    if params.get("git_update", None) is not None:
         cargs.extend([
             "-git_update",
-            params.get("git_update")
+            params.get("git_update", None)
         ])
-    if params.get("make_target") is not None:
+    if params.get("make_target", None) is not None:
         cargs.extend([
             "-make_target",
-            params.get("make_target")
+            params.get("make_target", None)
         ])
-    if params.get("makefile") is not None:
+    if params.get("makefile", None) is not None:
         cargs.extend([
             "-makefile",
-            params.get("makefile")
+            params.get("makefile", None)
         ])
-    if params.get("package") is not None:
+    if params.get("package", None) is not None:
         cargs.extend([
             "-package",
-            params.get("package")
+            params.get("package", None)
         ])
-    if params.get("prep_only"):
+    if params.get("prep_only", False):
         cargs.append("-prep_only")
-    if params.get("run_cmake") is not None:
+    if params.get("run_cmake", None) is not None:
         cargs.extend([
             "-run_cmake",
-            params.get("run_cmake")
+            params.get("run_cmake", None)
         ])
-    if params.get("run_make") is not None:
+    if params.get("run_make", None) is not None:
         cargs.extend([
             "-run_make",
-            params.get("run_make")
+            params.get("run_make", None)
         ])
-    if params.get("verbose_level") is not None:
+    if params.get("verbose_level", None) is not None:
         cargs.extend([
             "-verb",
-            str(params.get("verbose_level"))
+            str(params.get("verbose_level", None))
         ])
-    if params.get("help"):
+    if params.get("help", False):
         cargs.append("-help")
-    if params.get("history"):
+    if params.get("history", False):
         cargs.append("-hist")
-    if params.get("show_valid_opts"):
+    if params.get("show_valid_opts", False):
         cargs.append("-show_valid_opts")
-    if params.get("version"):
+    if params.get("version", False):
         cargs.append("-ver")
     return cargs
 
@@ -248,17 +235,19 @@ def build_afni_py_outputs(
     """
     ret = BuildAfniPyOutputs(
         root=execution.output_file("."),
-        command_history_file=execution.output_file(params.get("build_root") + "/hist_commands.txt"),
-        screen_output_history=execution.output_file(params.get("build_root") + "/screen_output_history.txt"),
+        command_history_file=execution.output_file(params.get("build_root", None) + "/hist_commands.txt"),
+        screen_output_history=execution.output_file(params.get("build_root", None) + "/screen_output_history.txt"),
     )
     return ret
 
 
 def build_afni_py_execute(
     params: BuildAfniPyParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> BuildAfniPyOutputs:
     """
+    build_afni.py
+    
     Compile an AFNI package from the git repository.
     
     Author: AFNI Developers
@@ -267,10 +256,12 @@ def build_afni_py_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `BuildAfniPyOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(BUILD_AFNI_PY_METADATA)
     params = execution.params(params)
     cargs = build_afni_py_cargs(params, execution)
     ret = build_afni_py_outputs(params, execution)
@@ -298,6 +289,8 @@ def build_afni_py(
     runner: Runner | None = None,
 ) -> BuildAfniPyOutputs:
     """
+    build_afni.py
+    
     Compile an AFNI package from the git repository.
     
     Author: AFNI Developers
@@ -325,8 +318,6 @@ def build_afni_py(
     Returns:
         NamedTuple of outputs (described in `BuildAfniPyOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(BUILD_AFNI_PY_METADATA)
     params = build_afni_py_params(
         build_root=build_root,
         clean_root=clean_root,
@@ -345,13 +336,13 @@ def build_afni_py(
         show_valid_opts=show_valid_opts,
         version=version,
     )
-    return build_afni_py_execute(params, execution)
+    return build_afni_py_execute(params, runner)
 
 
 __all__ = [
     "BUILD_AFNI_PY_METADATA",
     "BuildAfniPyOutputs",
-    "BuildAfniPyParameters",
     "build_afni_py",
+    "build_afni_py_execute",
     "build_afni_py_params",
 ]

niwrap_afni/afni/cat_matvec.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 CAT_MATVEC_METADATA = Metadata(
-    id="61e7c2b9d7eb804f1420ce54e105f89806022415.boutiques",
+    id="4af4fdd04807f20b13d358c19c75c2b343fba421.boutiques",
     name="cat_matvec",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,48 +14,24 @@ CAT_MATVEC_METADATA = Metadata(
 
 
 CatMatvecParameters = typing.TypedDict('CatMatvecParameters', {
-    "__STYXTYPE__": typing.Literal["cat_matvec"],
+    "@type": typing.NotRequired[typing.Literal["afni/cat_matvec"]],
+    "matrix_format": bool,
+    "oneline_format": bool,
+    "four_by_four_format": bool,
+    "matvec_spec": list[str],
+})
+CatMatvecParametersTagged = typing.TypedDict('CatMatvecParametersTagged', {
+    "@type": typing.Literal["afni/cat_matvec"],
     "matrix_format": bool,
     "oneline_format": bool,
     "four_by_four_format": bool,
     "matvec_spec": list[str],
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "cat_matvec": cat_matvec_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 CatMatvecOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `cat_matvec(...)`.
+    Output object returned when calling `CatMatvecParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -66,7 +42,7 @@ def cat_matvec_params(
     matrix_format: bool = False,
     oneline_format: bool = False,
     four_by_four_format: bool = False,
-) -> CatMatvecParameters:
+) -> CatMatvecParametersTagged:
     """
     Build parameters.
     
@@ -83,7 +59,7 @@ def cat_matvec_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "cat_matvec",
+        "@type": "afni/cat_matvec",
         "matrix_format": matrix_format,
         "oneline_format": oneline_format,
         "four_by_four_format": four_by_four_format,
@@ -107,13 +83,13 @@ def cat_matvec_cargs(
     """
     cargs = []
     cargs.append("cat_matvec")
-    if params.get("matrix_format"):
+    if params.get("matrix_format", False):
         cargs.append("-MATRIX")
-    if params.get("oneline_format"):
+    if params.get("oneline_format", False):
         cargs.append("-ONELINE")
-    if params.get("four_by_four_format"):
+    if params.get("four_by_four_format", False):
         cargs.append("-4x4")
-    cargs.extend(params.get("matvec_spec"))
+    cargs.extend(params.get("matvec_spec", None))
     return cargs
 
 
@@ -138,9 +114,11 @@ def cat_matvec_outputs(
 
 def cat_matvec_execute(
     params: CatMatvecParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> CatMatvecOutputs:
     """
+    cat_matvec
+    
     Catenates 3D rotation+shift matrix+vector transformations.
     
     Author: AFNI Developers
@@ -149,10 +127,12 @@ def cat_matvec_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `CatMatvecOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(CAT_MATVEC_METADATA)
     params = execution.params(params)
     cargs = cat_matvec_cargs(params, execution)
     ret = cat_matvec_outputs(params, execution)
@@ -168,6 +148,8 @@ def cat_matvec(
     runner: Runner | None = None,
 ) -> CatMatvecOutputs:
     """
+    cat_matvec
+    
     Catenates 3D rotation+shift matrix+vector transformations.
     
     Author: AFNI Developers
@@ -187,21 +169,19 @@ def cat_matvec(
     Returns:
         NamedTuple of outputs (described in `CatMatvecOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(CAT_MATVEC_METADATA)
     params = cat_matvec_params(
         matrix_format=matrix_format,
         oneline_format=oneline_format,
         four_by_four_format=four_by_four_format,
         matvec_spec=matvec_spec,
     )
-    return cat_matvec_execute(params, execution)
+    return cat_matvec_execute(params, runner)
 
 
 __all__ = [
     "CAT_MATVEC_METADATA",
     "CatMatvecOutputs",
-    "CatMatvecParameters",
     "cat_matvec",
+    "cat_matvec_execute",
     "cat_matvec_params",
 ]

niwrap_afni/afni/ccalc.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 CCALC_METADATA = Metadata(
-    id="858c935b6b57b9962c3e64fe8202799fde8e6c22.boutiques",
+    id="b145289273191dd83b1fd1959696713496ba9bee.boutiques",
     name="ccalc",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,46 +14,20 @@ CCALC_METADATA = Metadata(
 
 
 CcalcParameters = typing.TypedDict('CcalcParameters', {
-    "__STYXTYPE__": typing.Literal["ccalc"],
+    "@type": typing.NotRequired[typing.Literal["afni/ccalc"]],
+    "format": typing.NotRequired[str | None],
+    "expr": str,
+})
+CcalcParametersTagged = typing.TypedDict('CcalcParametersTagged', {
+    "@type": typing.Literal["afni/ccalc"],
     "format": typing.NotRequired[str | None],
     "expr": str,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "ccalc": ccalc_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 CcalcOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `ccalc(...)`.
+    Output object returned when calling `CcalcParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -62,7 +36,7 @@ class CcalcOutputs(typing.NamedTuple):
 def ccalc_params(
     expr: str,
     format_: str | None = None,
-) -> CcalcParameters:
+) -> CcalcParametersTagged:
     """
     Build parameters.
     
@@ -75,7 +49,7 @@ def ccalc_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "ccalc",
+        "@type": "afni/ccalc",
         "expr": expr,
     }
     if format_ is not None:
@@ -98,14 +72,14 @@ def ccalc_cargs(
     """
     cargs = []
     cargs.append("ccalc")
-    if params.get("format") is not None:
+    if params.get("format", None) is not None:
         cargs.extend([
             "-form",
-            params.get("format")
+            params.get("format", None)
         ])
     cargs.extend([
         "-eval",
-        params.get("expr")
+        params.get("expr", None)
     ])
     return cargs
 
@@ -131,9 +105,11 @@ def ccalc_outputs(
 
 def ccalc_execute(
     params: CcalcParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> CcalcOutputs:
     """
+    ccalc
+    
     Command line calculator with formatted output options.
     
     Author: AFNI Developers
@@ -142,10 +118,12 @@ def ccalc_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `CcalcOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(CCALC_METADATA)
     params = execution.params(params)
     cargs = ccalc_cargs(params, execution)
     ret = ccalc_outputs(params, execution)
@@ -159,6 +137,8 @@ def ccalc(
     runner: Runner | None = None,
 ) -> CcalcOutputs:
     """
+    ccalc
+    
     Command line calculator with formatted output options.
     
     Author: AFNI Developers
@@ -174,19 +154,17 @@ def ccalc(
     Returns:
         NamedTuple of outputs (described in `CcalcOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(CCALC_METADATA)
     params = ccalc_params(
         format_=format_,
         expr=expr,
     )
-    return ccalc_execute(params, execution)
+    return ccalc_execute(params, runner)
 
 
 __all__ = [
     "CCALC_METADATA",
     "CcalcOutputs",
-    "CcalcParameters",
     "ccalc",
+    "ccalc_execute",
     "ccalc_params",
 ]