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

niwrap_afni/afni/v_1dgrayplot.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_1DGRAYPLOT_METADATA = Metadata(
-    id="19cd85a5a31be03ff742d13e871815986799cf05.boutiques",
+    id="1671e36eb3ebce31da681edce7afe7614f8969c2.boutiques",
     name="1dgrayplot",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,17 @@ V_1DGRAYPLOT_METADATA = Metadata(
 
 
 V1dgrayplotParameters = typing.TypedDict('V1dgrayplotParameters', {
-    "__STYXTYPE__": typing.Literal["1dgrayplot"],
+    "@type": typing.NotRequired[typing.Literal["afni/1dgrayplot"]],
+    "tsfile": InputPathType,
+    "install": bool,
+    "ignore": typing.NotRequired[float | None],
+    "flip": bool,
+    "sep": bool,
+    "use": typing.NotRequired[float | None],
+    "ps": bool,
+})
+V1dgrayplotParametersTagged = typing.TypedDict('V1dgrayplotParametersTagged', {
+    "@type": typing.Literal["afni/1dgrayplot"],
     "tsfile": InputPathType,
     "install": bool,
     "ignore": typing.NotRequired[float | None],
@@ -23,42 +33,11 @@ V1dgrayplotParameters = typing.TypedDict('V1dgrayplotParameters', {
     "use": typing.NotRequired[float | None],
     "ps": bool,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "1dgrayplot": v_1dgrayplot_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 V1dgrayplotOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_1dgrayplot(...)`.
+    Output object returned when calling `V1dgrayplotParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -72,7 +51,7 @@ def v_1dgrayplot_params(
     sep: bool = False,
     use: float | None = None,
     ps: bool = False,
-) -> V1dgrayplotParameters:
+) -> V1dgrayplotParametersTagged:
     """
     Build parameters.
     
@@ -90,7 +69,7 @@ def v_1dgrayplot_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "1dgrayplot",
+        "@type": "afni/1dgrayplot",
         "tsfile": tsfile,
         "install": install,
         "flip": flip,
@@ -119,24 +98,24 @@ def v_1dgrayplot_cargs(
     """
     cargs = []
     cargs.append("1dgrayplot")
-    cargs.append(execution.input_file(params.get("tsfile")))
-    if params.get("install"):
+    cargs.append(execution.input_file(params.get("tsfile", None)))
+    if params.get("install", False):
         cargs.append("-install")
-    if params.get("ignore") is not None:
+    if params.get("ignore", None) is not None:
         cargs.extend([
             "-ignore",
-            str(params.get("ignore"))
+            str(params.get("ignore", None))
         ])
-    if params.get("flip"):
+    if params.get("flip", False):
         cargs.append("-flip")
-    if params.get("sep"):
+    if params.get("sep", False):
         cargs.append("-sep")
-    if params.get("use") is not None:
+    if params.get("use", None) is not None:
         cargs.extend([
             "-use",
-            str(params.get("use"))
+            str(params.get("use", None))
         ])
-    if params.get("ps"):
+    if params.get("ps", False):
         cargs.append("-ps")
     return cargs
 
@@ -162,10 +141,13 @@ def v_1dgrayplot_outputs(
 
 def v_1dgrayplot_execute(
     params: V1dgrayplotParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V1dgrayplotOutputs:
     """
-    Graphs the columns of a *.1D type time series file to the screen in grayscale.
+    1dgrayplot
+    
+    Graphs the columns of a *.1D type time series file to the screen in
+    grayscale.
     
     Author: AFNI Developers
     
@@ -173,10 +155,12 @@ def v_1dgrayplot_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V1dgrayplotOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_1DGRAYPLOT_METADATA)
     params = execution.params(params)
     cargs = v_1dgrayplot_cargs(params, execution)
     ret = v_1dgrayplot_outputs(params, execution)
@@ -195,7 +179,10 @@ def v_1dgrayplot(
     runner: Runner | None = None,
 ) -> V1dgrayplotOutputs:
     """
-    Graphs the columns of a *.1D type time series file to the screen in grayscale.
+    1dgrayplot
+    
+    Graphs the columns of a *.1D type time series file to the screen in
+    grayscale.
     
     Author: AFNI Developers
     
@@ -215,8 +202,6 @@ def v_1dgrayplot(
     Returns:
         NamedTuple of outputs (described in `V1dgrayplotOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_1DGRAYPLOT_METADATA)
     params = v_1dgrayplot_params(
         tsfile=tsfile,
         install=install,
@@ -226,13 +211,13 @@ def v_1dgrayplot(
         use=use,
         ps=ps,
     )
-    return v_1dgrayplot_execute(params, execution)
+    return v_1dgrayplot_execute(params, runner)
 
 
 __all__ = [
     "V1dgrayplotOutputs",
-    "V1dgrayplotParameters",
     "V_1DGRAYPLOT_METADATA",
     "v_1dgrayplot",
+    "v_1dgrayplot_execute",
     "v_1dgrayplot_params",
 ]

niwrap_afni/afni/v_1dmatcalc.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_1DMATCALC_METADATA = Metadata(
-    id="39dfacdca25eb6ed111a4b0aece4bcb728d9b08a.boutiques",
+    id="3d885ad283a58a557b3d058e1282611af7f67092.boutiques",
     name="1dmatcalc",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,46 +14,18 @@ V_1DMATCALC_METADATA = Metadata(
 
 
 V1dmatcalcParameters = typing.TypedDict('V1dmatcalcParameters', {
-    "__STYXTYPE__": typing.Literal["1dmatcalc"],
+    "@type": typing.NotRequired[typing.Literal["afni/1dmatcalc"]],
+    "expression": typing.NotRequired[str | None],
+})
+V1dmatcalcParametersTagged = typing.TypedDict('V1dmatcalcParametersTagged', {
+    "@type": typing.Literal["afni/1dmatcalc"],
     "expression": 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 {
-        "1dmatcalc": v_1dmatcalc_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 {
-        "1dmatcalc": v_1dmatcalc_outputs,
-    }.get(t)
 
 
 class V1dmatcalcOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_1dmatcalc(...)`.
+    Output object returned when calling `V1dmatcalcParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -63,7 +35,7 @@ class V1dmatcalcOutputs(typing.NamedTuple):
 
 def v_1dmatcalc_params(
     expression: str | None = None,
-) -> V1dmatcalcParameters:
+) -> V1dmatcalcParametersTagged:
     """
     Build parameters.
     
@@ -73,7 +45,7 @@ def v_1dmatcalc_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "1dmatcalc",
+        "@type": "afni/1dmatcalc",
     }
     if expression is not None:
         params["expression"] = expression
@@ -95,8 +67,8 @@ def v_1dmatcalc_cargs(
     """
     cargs = []
     cargs.append("1dmatcalc")
-    if params.get("expression") is not None:
-        cargs.append(params.get("expression"))
+    if params.get("expression", None) is not None:
+        cargs.append(params.get("expression", None))
     return cargs
 
 
@@ -122,11 +94,13 @@ def v_1dmatcalc_outputs(
 
 def v_1dmatcalc_execute(
     params: V1dmatcalcParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V1dmatcalcOutputs:
     """
-    A tool to evaluate space-delimited RPN (Reverse Polish Notation) matrix-valued
-    expressions.
+    1dmatcalc
+    
+    A tool to evaluate space-delimited RPN (Reverse Polish Notation)
+    matrix-valued expressions.
     
     Author: AFNI Developers
     
@@ -134,10 +108,12 @@ def v_1dmatcalc_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V1dmatcalcOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_1DMATCALC_METADATA)
     params = execution.params(params)
     cargs = v_1dmatcalc_cargs(params, execution)
     ret = v_1dmatcalc_outputs(params, execution)
@@ -150,8 +126,10 @@ def v_1dmatcalc(
     runner: Runner | None = None,
 ) -> V1dmatcalcOutputs:
     """
-    A tool to evaluate space-delimited RPN (Reverse Polish Notation) matrix-valued
-    expressions.
+    1dmatcalc
+    
+    A tool to evaluate space-delimited RPN (Reverse Polish Notation)
+    matrix-valued expressions.
     
     Author: AFNI Developers
     
@@ -163,18 +141,16 @@ def v_1dmatcalc(
     Returns:
         NamedTuple of outputs (described in `V1dmatcalcOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_1DMATCALC_METADATA)
     params = v_1dmatcalc_params(
         expression=expression,
     )
-    return v_1dmatcalc_execute(params, execution)
+    return v_1dmatcalc_execute(params, runner)
 
 
 __all__ = [
     "V1dmatcalcOutputs",
-    "V1dmatcalcParameters",
     "V_1DMATCALC_METADATA",
     "v_1dmatcalc",
+    "v_1dmatcalc_execute",
     "v_1dmatcalc_params",
 ]

niwrap_afni/afni/v_1dnorm.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_1DNORM_METADATA = Metadata(
-    id="b18f2b7151430c04db8fdedd32593dbc7242dda1.boutiques",
+    id="15dcd8c41b014ddb744b9e0974867a0a1033d09c.boutiques",
     name="1dnorm",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,16 @@ V_1DNORM_METADATA = Metadata(
 
 
 V1dnormParameters = typing.TypedDict('V1dnormParameters', {
-    "__STYXTYPE__": typing.Literal["1dnorm"],
+    "@type": typing.NotRequired[typing.Literal["afni/1dnorm"]],
+    "infile": InputPathType,
+    "outfile": str,
+    "norm1": bool,
+    "normx": bool,
+    "demean": bool,
+    "demed": bool,
+})
+V1dnormParametersTagged = typing.TypedDict('V1dnormParametersTagged', {
+    "@type": typing.Literal["afni/1dnorm"],
     "infile": InputPathType,
     "outfile": str,
     "norm1": bool,
@@ -22,43 +31,11 @@ V1dnormParameters = typing.TypedDict('V1dnormParameters', {
     "demean": bool,
     "demed": bool,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "1dnorm": v_1dnorm_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 {
-        "1dnorm": v_1dnorm_outputs,
-    }.get(t)
 
 
 class V1dnormOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_1dnorm(...)`.
+    Output object returned when calling `V1dnormParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -73,7 +50,7 @@ def v_1dnorm_params(
     normx: bool = False,
     demean: bool = False,
     demed: bool = False,
-) -> V1dnormParameters:
+) -> V1dnormParametersTagged:
     """
     Build parameters.
     
@@ -90,7 +67,7 @@ def v_1dnorm_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "1dnorm",
+        "@type": "afni/1dnorm",
         "infile": infile,
         "outfile": outfile,
         "norm1": norm1,
@@ -116,15 +93,15 @@ def v_1dnorm_cargs(
     """
     cargs = []
     cargs.append("1dnorm")
-    cargs.append(execution.input_file(params.get("infile")))
-    cargs.append(params.get("outfile"))
-    if params.get("norm1"):
+    cargs.append(execution.input_file(params.get("infile", None)))
+    cargs.append(params.get("outfile", None))
+    if params.get("norm1", False):
         cargs.append("-norm1")
-    if params.get("normx"):
+    if params.get("normx", False):
         cargs.append("-normx")
-    if params.get("demean"):
+    if params.get("demean", False):
         cargs.append("-demean")
-    if params.get("demed"):
+    if params.get("demed", False):
         cargs.append("-demed")
     return cargs
 
@@ -144,16 +121,18 @@ def v_1dnorm_outputs(
     """
     ret = V1dnormOutputs(
         root=execution.output_file("."),
-        normalized_output=execution.output_file(params.get("outfile")),
+        normalized_output=execution.output_file(params.get("outfile", None)),
     )
     return ret
 
 
 def v_1dnorm_execute(
     params: V1dnormParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V1dnormOutputs:
     """
+    1dnorm
+    
     Normalize columns of a 1D file (AFNI ASCII list of numbers).
     
     Author: AFNI Developers
@@ -162,10 +141,12 @@ def v_1dnorm_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V1dnormOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_1DNORM_METADATA)
     params = execution.params(params)
     cargs = v_1dnorm_cargs(params, execution)
     ret = v_1dnorm_outputs(params, execution)
@@ -183,6 +164,8 @@ def v_1dnorm(
     runner: Runner | None = None,
 ) -> V1dnormOutputs:
     """
+    1dnorm
+    
     Normalize columns of a 1D file (AFNI ASCII list of numbers).
     
     Author: AFNI Developers
@@ -202,8 +185,6 @@ def v_1dnorm(
     Returns:
         NamedTuple of outputs (described in `V1dnormOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_1DNORM_METADATA)
     params = v_1dnorm_params(
         infile=infile,
         outfile=outfile,
@@ -212,13 +193,13 @@ def v_1dnorm(
         demean=demean,
         demed=demed,
     )
-    return v_1dnorm_execute(params, execution)
+    return v_1dnorm_execute(params, runner)
 
 
 __all__ = [
     "V1dnormOutputs",
-    "V1dnormParameters",
     "V_1DNORM_METADATA",
     "v_1dnorm",
+    "v_1dnorm_execute",
     "v_1dnorm_params",
 ]