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

niwrap_afni/afni/count.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 COUNT_METADATA = Metadata(
-    id="988ff55fdaad56036baf2929faf8abe20f54fb03.boutiques",
+    id="12da58ce0df53dbf18689eebeddd8ea53ea970cf.boutiques",
     name="count",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,24 @@ COUNT_METADATA = Metadata(
 
 
 CountParameters = typing.TypedDict('CountParameters', {
-    "__STYXTYPE__": typing.Literal["count"],
+    "@type": typing.NotRequired[typing.Literal["afni/count"]],
+    "bot": str,
+    "top": str,
+    "step": typing.NotRequired[str | None],
+    "seed": typing.NotRequired[float | None],
+    "sseed": typing.NotRequired[str | None],
+    "column": bool,
+    "digits": typing.NotRequired[float | None],
+    "form": typing.NotRequired[str | None],
+    "root": typing.NotRequired[str | None],
+    "sep": typing.NotRequired[str | None],
+    "suffix": typing.NotRequired[str | None],
+    "scale": typing.NotRequired[float | None],
+    "comma": bool,
+    "skipnmodm": typing.NotRequired[str | None],
+})
+CountParametersTagged = typing.TypedDict('CountParametersTagged', {
+    "@type": typing.Literal["afni/count"],
     "bot": str,
     "top": str,
     "step": typing.NotRequired[str | None],
@@ -30,42 +47,11 @@ CountParameters = typing.TypedDict('CountParameters', {
     "comma": bool,
     "skipnmodm": 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 {
-        "count": count_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 CountOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `count(...)`.
+    Output object returned when calling `CountParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -86,7 +72,7 @@ def count_params(
     scale: float | None = None,
     comma: bool = False,
     skipnmodm: str | None = None,
-) -> CountParameters:
+) -> CountParametersTagged:
     """
     Build parameters.
     
@@ -109,7 +95,7 @@ def count_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "count",
+        "@type": "afni/count",
         "bot": bot,
         "top": top,
         "column": column,
@@ -153,58 +139,58 @@ def count_cargs(
     """
     cargs = []
     cargs.append("count")
-    cargs.append(params.get("bot"))
-    cargs.append(params.get("top"))
-    if params.get("step") is not None:
-        cargs.append(params.get("step"))
-    if params.get("seed") is not None:
+    cargs.append(params.get("bot", None))
+    cargs.append(params.get("top", None))
+    if params.get("step", None) is not None:
+        cargs.append(params.get("step", None))
+    if params.get("seed", None) is not None:
         cargs.extend([
             "-seed",
-            str(params.get("seed"))
+            str(params.get("seed", None))
         ])
-    if params.get("sseed") is not None:
+    if params.get("sseed", None) is not None:
         cargs.extend([
             "-sseed",
-            params.get("sseed")
+            params.get("sseed", None)
         ])
-    if params.get("column"):
+    if params.get("column", False):
         cargs.append("-column")
-    if params.get("digits") is not None:
+    if params.get("digits", None) is not None:
         cargs.extend([
             "-digits",
-            str(params.get("digits"))
+            str(params.get("digits", None))
         ])
-    if params.get("form") is not None:
+    if params.get("form", None) is not None:
         cargs.extend([
             "-form",
-            params.get("form")
+            params.get("form", None)
         ])
-    if params.get("root") is not None:
+    if params.get("root", None) is not None:
         cargs.extend([
             "-root",
-            params.get("root")
+            params.get("root", None)
         ])
-    if params.get("sep") is not None:
+    if params.get("sep", None) is not None:
         cargs.extend([
             "-sep",
-            params.get("sep")
+            params.get("sep", None)
         ])
-    if params.get("suffix") is not None:
+    if params.get("suffix", None) is not None:
         cargs.extend([
             "-suffix",
-            params.get("suffix")
+            params.get("suffix", None)
         ])
-    if params.get("scale") is not None:
+    if params.get("scale", None) is not None:
         cargs.extend([
             "-scale",
-            str(params.get("scale"))
+            str(params.get("scale", None))
         ])
-    if params.get("comma"):
+    if params.get("comma", False):
         cargs.append("-comma")
-    if params.get("skipnmodm") is not None:
+    if params.get("skipnmodm", None) is not None:
         cargs.extend([
             "-skipnmodm",
-            params.get("skipnmodm")
+            params.get("skipnmodm", None)
         ])
     return cargs
 
@@ -230,9 +216,11 @@ def count_outputs(
 
 def count_execute(
     params: CountParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> CountOutputs:
     """
+    count
+    
     Numbered copies generator with custom format support and random sequence
     options.
     
@@ -242,10 +230,12 @@ def count_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `CountOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(COUNT_METADATA)
     params = execution.params(params)
     cargs = count_cargs(params, execution)
     ret = count_outputs(params, execution)
@@ -271,6 +261,8 @@ def count(
     runner: Runner | None = None,
 ) -> CountOutputs:
     """
+    count
+    
     Numbered copies generator with custom format support and random sequence
     options.
     
@@ -297,8 +289,6 @@ def count(
     Returns:
         NamedTuple of outputs (described in `CountOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(COUNT_METADATA)
     params = count_params(
         bot=bot,
         top=top,
@@ -315,13 +305,13 @@ def count(
         comma=comma,
         skipnmodm=skipnmodm,
     )
-    return count_execute(params, execution)
+    return count_execute(params, runner)
 
 
 __all__ = [
     "COUNT_METADATA",
     "CountOutputs",
-    "CountParameters",
     "count",
+    "count_execute",
     "count_params",
 ]

niwrap_afni/afni/create_icosahedron.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 CREATE_ICOSAHEDRON_METADATA = Metadata(
-    id="7e97ac60c3ab73084c4724cc7515e703d2c1bdde.boutiques",
+    id="96e2d49d3eefc8b7ccf8343e61f4a58a876cac50.boutiques",
     name="CreateIcosahedron",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,20 @@ CREATE_ICOSAHEDRON_METADATA = Metadata(
 
 
 CreateIcosahedronParameters = typing.TypedDict('CreateIcosahedronParameters', {
-    "__STYXTYPE__": typing.Literal["CreateIcosahedron"],
+    "@type": typing.NotRequired[typing.Literal["afni/CreateIcosahedron"]],
+    "rad": typing.NotRequired[float | None],
+    "rec_depth": typing.NotRequired[float | None],
+    "lin_depth": typing.NotRequired[float | None],
+    "min_nodes": typing.NotRequired[float | None],
+    "nums": bool,
+    "nums_quiet": bool,
+    "center_coordinates": typing.NotRequired[list[float] | None],
+    "to_sphere": bool,
+    "output_prefix": typing.NotRequired[str | None],
+    "help": bool,
+})
+CreateIcosahedronParametersTagged = typing.TypedDict('CreateIcosahedronParametersTagged', {
+    "@type": typing.Literal["afni/CreateIcosahedron"],
     "rad": typing.NotRequired[float | None],
     "rec_depth": typing.NotRequired[float | None],
     "lin_depth": typing.NotRequired[float | None],
@@ -26,42 +39,11 @@ CreateIcosahedronParameters = typing.TypedDict('CreateIcosahedronParameters', {
     "output_prefix": typing.NotRequired[str | None],
     "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 {
-        "CreateIcosahedron": create_icosahedron_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 CreateIcosahedronOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `create_icosahedron(...)`.
+    Output object returned when calling `CreateIcosahedronParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -78,7 +60,7 @@ def create_icosahedron_params(
     to_sphere: bool = False,
     output_prefix: str | None = None,
     help_: bool = False,
-) -> CreateIcosahedronParameters:
+) -> CreateIcosahedronParametersTagged:
     """
     Build parameters.
     
@@ -99,7 +81,7 @@ def create_icosahedron_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "CreateIcosahedron",
+        "@type": "afni/CreateIcosahedron",
         "nums": nums,
         "nums_quiet": nums_quiet,
         "to_sphere": to_sphere,
@@ -135,43 +117,43 @@ def create_icosahedron_cargs(
     """
     cargs = []
     cargs.append("CreateIcosahedron")
-    if params.get("rad") is not None:
+    if params.get("rad", None) is not None:
         cargs.extend([
             "-rad",
-            str(params.get("rad"))
+            str(params.get("rad", None))
         ])
-    if params.get("rec_depth") is not None:
+    if params.get("rec_depth", None) is not None:
         cargs.extend([
             "-rd",
-            str(params.get("rec_depth"))
+            str(params.get("rec_depth", None))
         ])
-    if params.get("lin_depth") is not None:
+    if params.get("lin_depth", None) is not None:
         cargs.extend([
             "-ld",
-            str(params.get("lin_depth"))
+            str(params.get("lin_depth", None))
         ])
-    if params.get("min_nodes") is not None:
+    if params.get("min_nodes", None) is not None:
         cargs.extend([
             "-min_nodes",
-            str(params.get("min_nodes"))
+            str(params.get("min_nodes", None))
         ])
-    if params.get("nums"):
+    if params.get("nums", False):
         cargs.append("-nums")
-    if params.get("nums_quiet"):
+    if params.get("nums_quiet", False):
         cargs.append("-nums_quiet")
-    if params.get("center_coordinates") is not None:
+    if params.get("center_coordinates", None) is not None:
         cargs.extend([
             "-ctr",
-            *map(str, params.get("center_coordinates"))
+            *map(str, params.get("center_coordinates", None))
         ])
-    if params.get("to_sphere"):
+    if params.get("to_sphere", False):
         cargs.append("-tosphere")
-    if params.get("output_prefix") is not None:
+    if params.get("output_prefix", None) is not None:
         cargs.extend([
             "-prefix",
-            params.get("output_prefix")
+            params.get("output_prefix", None)
         ])
-    if params.get("help"):
+    if params.get("help", False):
         cargs.append("-help")
     return cargs
 
@@ -197,9 +179,11 @@ def create_icosahedron_outputs(
 
 def create_icosahedron_execute(
     params: CreateIcosahedronParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> CreateIcosahedronOutputs:
     """
+    CreateIcosahedron
+    
     Tool to create an icosahedron with optional tessellation.
     
     Author: AFNI Developers
@@ -208,10 +192,12 @@ def create_icosahedron_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `CreateIcosahedronOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(CREATE_ICOSAHEDRON_METADATA)
     params = execution.params(params)
     cargs = create_icosahedron_cargs(params, execution)
     ret = create_icosahedron_outputs(params, execution)
@@ -233,6 +219,8 @@ def create_icosahedron(
     runner: Runner | None = None,
 ) -> CreateIcosahedronOutputs:
     """
+    CreateIcosahedron
+    
     Tool to create an icosahedron with optional tessellation.
     
     Author: AFNI Developers
@@ -256,8 +244,6 @@ def create_icosahedron(
     Returns:
         NamedTuple of outputs (described in `CreateIcosahedronOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(CREATE_ICOSAHEDRON_METADATA)
     params = create_icosahedron_params(
         rad=rad,
         rec_depth=rec_depth,
@@ -270,13 +256,13 @@ def create_icosahedron(
         output_prefix=output_prefix,
         help_=help_,
     )
-    return create_icosahedron_execute(params, execution)
+    return create_icosahedron_execute(params, runner)
 
 
 __all__ = [
     "CREATE_ICOSAHEDRON_METADATA",
     "CreateIcosahedronOutputs",
-    "CreateIcosahedronParameters",
     "create_icosahedron",
+    "create_icosahedron_execute",
     "create_icosahedron_params",
 ]