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

niwrap_afni/afni/surf_clust.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 SURF_CLUST_METADATA = Metadata(
-    id="7db6f82a57760f7846747e87ee25e2273bf54f9f.boutiques",
+    id="af3d67f2fd2388454b25618145b4abdd170406fc.boutiques",
     name="SurfClust",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,49 @@ SURF_CLUST_METADATA = Metadata(
 
 
 SurfClustParameters = typing.TypedDict('SurfClustParameters', {
-    "__STYXTYPE__": typing.Literal["SurfClust"],
+    "@type": typing.NotRequired[typing.Literal["afni/SurfClust"]],
+    "specfile": typing.NotRequired[InputPathType | None],
+    "input_surface": typing.NotRequired[str | None],
+    "input_surf_name": typing.NotRequired[InputPathType | None],
+    "input_dataset": list[InputPathType],
+    "rmm": float,
+    "amm2": typing.NotRequired[float | None],
+    "min_nodes": typing.NotRequired[float | None],
+    "prefix": typing.NotRequired[str | None],
+    "out_clusterdset": bool,
+    "out_roidset": bool,
+    "out_fulllist": bool,
+    "sort_none": bool,
+    "sort_n_nodes": bool,
+    "sort_area": bool,
+    "thresh_col": typing.NotRequired[float | None],
+    "thresh": typing.NotRequired[float | None],
+    "athresh": typing.NotRequired[float | None],
+    "ir_range": typing.NotRequired[list[float] | None],
+    "ex_range": typing.NotRequired[list[float] | None],
+    "prepend_node_index": bool,
+    "update": typing.NotRequired[float | None],
+    "no_cent": bool,
+    "cent": bool,
+    "novolreg": bool,
+    "noxform": bool,
+    "set_env": typing.NotRequired[str | None],
+    "trace": bool,
+    "trace_extreme": bool,
+    "no_memory_trace": bool,
+    "yes_memory_trace": bool,
+    "mini_help": bool,
+    "help": bool,
+    "extreme_help": bool,
+    "view_help": bool,
+    "web_help": bool,
+    "find_help": typing.NotRequired[str | None],
+    "raw_help": bool,
+    "spx_help": bool,
+    "aspx_help": bool,
+})
+SurfClustParametersTagged = typing.TypedDict('SurfClustParametersTagged', {
+    "@type": typing.Literal["afni/SurfClust"],
     "specfile": typing.NotRequired[InputPathType | None],
     "input_surface": typing.NotRequired[str | None],
     "input_surf_name": typing.NotRequired[InputPathType | None],
@@ -55,43 +97,11 @@ SurfClustParameters = typing.TypedDict('SurfClustParameters', {
     "spx_help": bool,
     "aspx_help": bool,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "SurfClust": surf_clust_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 {
-        "SurfClust": surf_clust_outputs,
-    }.get(t)
 
 
 class SurfClustOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `surf_clust(...)`.
+    Output object returned when calling `SurfClustParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -143,7 +153,7 @@ def surf_clust_params(
     raw_help: bool = False,
     spx_help: bool = False,
     aspx_help: bool = False,
-) -> SurfClustParameters:
+) -> SurfClustParametersTagged:
     """
     Build parameters.
     
@@ -204,7 +214,7 @@ def surf_clust_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "SurfClust",
+        "@type": "afni/SurfClust",
         "input_dataset": input_dataset,
         "rmm": rmm,
         "out_clusterdset": out_clusterdset,
@@ -277,129 +287,129 @@ def surf_clust_cargs(
     """
     cargs = []
     cargs.append("SurfClust")
-    if params.get("specfile") is not None:
+    if params.get("specfile", None) is not None:
         cargs.extend([
             "-spec",
-            execution.input_file(params.get("specfile"))
+            execution.input_file(params.get("specfile", None))
         ])
-    if params.get("input_surface") is not None:
+    if params.get("input_surface", None) is not None:
         cargs.extend([
             "-surf_A",
-            params.get("input_surface")
+            params.get("input_surface", None)
         ])
-    if params.get("input_surf_name") is not None:
+    if params.get("input_surf_name", None) is not None:
         cargs.extend([
             "-i",
-            execution.input_file(params.get("input_surf_name"))
+            execution.input_file(params.get("input_surf_name", None))
         ])
     cargs.extend([
         "-input",
-        *[execution.input_file(f) for f in params.get("input_dataset")]
+        *[execution.input_file(f) for f in params.get("input_dataset", None)]
     ])
     cargs.extend([
         "-rmm",
-        str(params.get("rmm"))
+        str(params.get("rmm", None))
     ])
-    if params.get("amm2") is not None:
+    if params.get("amm2", None) is not None:
         cargs.extend([
             "-amm2",
-            str(params.get("amm2"))
+            str(params.get("amm2", None))
         ])
-    if params.get("min_nodes") is not None:
+    if params.get("min_nodes", None) is not None:
         cargs.extend([
             "-n",
-            str(params.get("min_nodes"))
+            str(params.get("min_nodes", 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("out_clusterdset"):
+    if params.get("out_clusterdset", False):
         cargs.append("-out_clusterdset")
-    if params.get("out_roidset"):
+    if params.get("out_roidset", False):
         cargs.append("-out_roidset")
-    if params.get("out_fulllist"):
+    if params.get("out_fulllist", False):
         cargs.append("-out_fulllist")
-    if params.get("sort_none"):
+    if params.get("sort_none", False):
         cargs.append("-sort_none")
-    if params.get("sort_n_nodes"):
+    if params.get("sort_n_nodes", False):
         cargs.append("-sort_n_nodes")
-    if params.get("sort_area"):
+    if params.get("sort_area", False):
         cargs.append("-sort_area")
-    if params.get("thresh_col") is not None:
+    if params.get("thresh_col", None) is not None:
         cargs.extend([
             "-thresh_col",
-            str(params.get("thresh_col"))
+            str(params.get("thresh_col", None))
         ])
-    if params.get("thresh") is not None:
+    if params.get("thresh", None) is not None:
         cargs.extend([
             "-thresh",
-            str(params.get("thresh"))
+            str(params.get("thresh", None))
         ])
-    if params.get("athresh") is not None:
+    if params.get("athresh", None) is not None:
         cargs.extend([
             "-athresh",
-            str(params.get("athresh"))
+            str(params.get("athresh", None))
         ])
-    if params.get("ir_range") is not None:
+    if params.get("ir_range", None) is not None:
         cargs.extend([
             "-ir_range",
-            *map(str, params.get("ir_range"))
+            *map(str, params.get("ir_range", None))
         ])
-    if params.get("ex_range") is not None:
+    if params.get("ex_range", None) is not None:
         cargs.extend([
             "-ex_range",
-            *map(str, params.get("ex_range"))
+            *map(str, params.get("ex_range", None))
         ])
-    if params.get("prepend_node_index"):
+    if params.get("prepend_node_index", False):
         cargs.append("-prepend_node_index")
-    if params.get("update") is not None:
+    if params.get("update", None) is not None:
         cargs.extend([
             "-update",
-            str(params.get("update"))
+            str(params.get("update", None))
         ])
-    if params.get("no_cent"):
+    if params.get("no_cent", False):
         cargs.append("-no_cent")
-    if params.get("cent"):
+    if params.get("cent", False):
         cargs.append("-cent")
-    if params.get("novolreg"):
+    if params.get("novolreg", False):
         cargs.append("-novolreg")
-    if params.get("noxform"):
+    if params.get("noxform", False):
         cargs.append("-noxform")
-    if params.get("set_env") is not None:
+    if params.get("set_env", None) is not None:
         cargs.extend([
             "-setenv",
-            params.get("set_env")
+            params.get("set_env", None)
         ])
-    if params.get("trace"):
+    if params.get("trace", False):
         cargs.append("-trace")
-    if params.get("trace_extreme"):
+    if params.get("trace_extreme", False):
         cargs.append("-TRACE")
-    if params.get("no_memory_trace"):
+    if params.get("no_memory_trace", False):
         cargs.append("-nomall")
-    if params.get("yes_memory_trace"):
+    if params.get("yes_memory_trace", False):
         cargs.append("-yesmall")
-    if params.get("mini_help"):
+    if params.get("mini_help", False):
         cargs.append("-h")
-    if params.get("help"):
+    if params.get("help", False):
         cargs.append("-help")
-    if params.get("extreme_help"):
+    if params.get("extreme_help", False):
         cargs.append("-HELP")
-    if params.get("view_help"):
+    if params.get("view_help", False):
         cargs.append("-h_view")
-    if params.get("web_help"):
+    if params.get("web_help", False):
         cargs.append("-h_web")
-    if params.get("find_help") is not None:
+    if params.get("find_help", None) is not None:
         cargs.extend([
             "-h_find",
-            params.get("find_help")
+            params.get("find_help", None)
         ])
-    if params.get("raw_help"):
+    if params.get("raw_help", False):
         cargs.append("-h_raw")
-    if params.get("spx_help"):
+    if params.get("spx_help", False):
         cargs.append("-h_spx")
-    if params.get("aspx_help"):
+    if params.get("aspx_help", False):
         cargs.append("-h_aspx")
     return cargs
 
@@ -419,18 +429,20 @@ def surf_clust_outputs(
     """
     ret = SurfClustOutputs(
         root=execution.output_file("."),
-        cluster_table=execution.output_file(params.get("prefix") + "_ClstTable_rXX_aXX.1D") if (params.get("prefix") is not None) else None,
-        clustered_dataset=execution.output_file(params.get("prefix") + "_Clustered_rXX_aXX.dset") if (params.get("prefix") is not None) else None,
-        roi_dataset=execution.output_file(params.get("prefix") + "_ClstMsk_rXX_aXX.dset") if (params.get("prefix") is not None) else None,
+        cluster_table=execution.output_file(params.get("prefix", None) + "_ClstTable_rXX_aXX.1D") if (params.get("prefix") is not None) else None,
+        clustered_dataset=execution.output_file(params.get("prefix", None) + "_Clustered_rXX_aXX.dset") if (params.get("prefix") is not None) else None,
+        roi_dataset=execution.output_file(params.get("prefix", None) + "_ClstMsk_rXX_aXX.dset") if (params.get("prefix") is not None) else None,
     )
     return ret
 
 
 def surf_clust_execute(
     params: SurfClustParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> SurfClustOutputs:
     """
+    SurfClust
+    
     A program to perform clustering analysis surfaces.
     
     Author: AFNI Developers
@@ -439,10 +451,12 @@ def surf_clust_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `SurfClustOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(SURF_CLUST_METADATA)
     params = execution.params(params)
     cargs = surf_clust_cargs(params, execution)
     ret = surf_clust_outputs(params, execution)
@@ -493,6 +507,8 @@ def surf_clust(
     runner: Runner | None = None,
 ) -> SurfClustOutputs:
     """
+    SurfClust
+    
     A program to perform clustering analysis surfaces.
     
     Author: AFNI Developers
@@ -556,8 +572,6 @@ def surf_clust(
     Returns:
         NamedTuple of outputs (described in `SurfClustOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(SURF_CLUST_METADATA)
     params = surf_clust_params(
         specfile=specfile,
         input_surface=input_surface,
@@ -599,13 +613,13 @@ def surf_clust(
         spx_help=spx_help,
         aspx_help=aspx_help,
     )
-    return surf_clust_execute(params, execution)
+    return surf_clust_execute(params, runner)
 
 
 __all__ = [
     "SURF_CLUST_METADATA",
     "SurfClustOutputs",
-    "SurfClustParameters",
     "surf_clust",
+    "surf_clust_execute",
     "surf_clust_params",
 ]

niwrap_afni/afni/surf_dist.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 SURF_DIST_METADATA = Metadata(
-    id="1440f0671a85a23be73cba7aba7157807f5c4c6f.boutiques",
+    id="7f3e1e5bd0ffdc30a311197966d575a0b39f1269.boutiques",
     name="SurfDist",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,18 @@ SURF_DIST_METADATA = Metadata(
 
 
 SurfDistParameters = typing.TypedDict('SurfDistParameters', {
-    "__STYXTYPE__": typing.Literal["SurfDist"],
+    "@type": typing.NotRequired[typing.Literal["afni/SurfDist"]],
+    "surface": InputPathType,
+    "nodepairs": InputPathType,
+    "node_path_do": typing.NotRequired[str | None],
+    "euclidean": bool,
+    "euclidian": bool,
+    "graph": bool,
+    "from_node": typing.NotRequired[str | None],
+    "to_nodes": typing.NotRequired[InputPathType | None],
+})
+SurfDistParametersTagged = typing.TypedDict('SurfDistParametersTagged', {
+    "@type": typing.Literal["afni/SurfDist"],
     "surface": InputPathType,
     "nodepairs": InputPathType,
     "node_path_do": typing.NotRequired[str | None],
@@ -24,43 +35,11 @@ SurfDistParameters = typing.TypedDict('SurfDistParameters', {
     "from_node": typing.NotRequired[str | None],
     "to_nodes": typing.NotRequired[InputPathType | None],
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "SurfDist": surf_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 {
-        "SurfDist": surf_dist_outputs,
-    }.get(t)
 
 
 class SurfDistOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `surf_dist(...)`.
+    Output object returned when calling `SurfDistParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -77,7 +56,7 @@ def surf_dist_params(
     graph: bool = False,
     from_node: str | None = None,
     to_nodes: InputPathType | None = None,
-) -> SurfDistParameters:
+) -> SurfDistParametersTagged:
     """
     Build parameters.
     
@@ -96,7 +75,7 @@ def surf_dist_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "SurfDist",
+        "@type": "afni/SurfDist",
         "surface": surface,
         "nodepairs": nodepairs,
         "euclidean": euclidean,
@@ -127,28 +106,28 @@ def surf_dist_cargs(
     """
     cargs = []
     cargs.append("SurfDist")
-    cargs.append(execution.input_file(params.get("surface")))
-    cargs.append(execution.input_file(params.get("nodepairs")))
-    if params.get("node_path_do") is not None:
+    cargs.append(execution.input_file(params.get("surface", None)))
+    cargs.append(execution.input_file(params.get("nodepairs", None)))
+    if params.get("node_path_do", None) is not None:
         cargs.extend([
             "-node_path_do",
-            params.get("node_path_do")
+            params.get("node_path_do", None)
         ])
-    if params.get("euclidean"):
+    if params.get("euclidean", False):
         cargs.append("-Euclidean")
-    if params.get("euclidian"):
+    if params.get("euclidian", False):
         cargs.append("-Euclidian")
-    if params.get("graph"):
+    if params.get("graph", False):
         cargs.append("-graph")
-    if params.get("from_node") is not None:
+    if params.get("from_node", None) is not None:
         cargs.extend([
             "-from_node",
-            params.get("from_node")
+            params.get("from_node", None)
         ])
-    if params.get("to_nodes") is not None:
+    if params.get("to_nodes", None) is not None:
         cargs.extend([
             "-input",
-            execution.input_file(params.get("to_nodes"))
+            execution.input_file(params.get("to_nodes", None))
         ])
     return cargs
 
@@ -175,9 +154,11 @@ def surf_dist_outputs(
 
 def surf_dist_execute(
     params: SurfDistParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> SurfDistOutputs:
     """
+    SurfDist
+    
     Calculate shortest distance between node pairs on a surface mesh.
     
     Author: AFNI Developers
@@ -186,10 +167,12 @@ def surf_dist_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `SurfDistOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(SURF_DIST_METADATA)
     params = execution.params(params)
     cargs = surf_dist_cargs(params, execution)
     ret = surf_dist_outputs(params, execution)
@@ -209,6 +192,8 @@ def surf_dist(
     runner: Runner | None = None,
 ) -> SurfDistOutputs:
     """
+    SurfDist
+    
     Calculate shortest distance between node pairs on a surface mesh.
     
     Author: AFNI Developers
@@ -230,8 +215,6 @@ def surf_dist(
     Returns:
         NamedTuple of outputs (described in `SurfDistOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(SURF_DIST_METADATA)
     params = surf_dist_params(
         surface=surface,
         nodepairs=nodepairs,
@@ -242,13 +225,13 @@ def surf_dist(
         from_node=from_node,
         to_nodes=to_nodes,
     )
-    return surf_dist_execute(params, execution)
+    return surf_dist_execute(params, runner)
 
 
 __all__ = [
     "SURF_DIST_METADATA",
     "SurfDistOutputs",
-    "SurfDistParameters",
     "surf_dist",
+    "surf_dist_execute",
     "surf_dist_params",
 ]