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

niwrap_afni/afni/v_1d_nlfit.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_1D_NLFIT_METADATA = Metadata(
-    id="07821b44f40b4c899e165791769521e0adbe5c7b.boutiques",
+    id="50e1582cabc0e72153f6a424b8282b812a6f26e5.boutiques",
     name="1dNLfit",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,50 +14,26 @@ V_1D_NLFIT_METADATA = Metadata(
 
 
 V1dNlfitParameters = typing.TypedDict('V1dNlfitParameters', {
-    "__STYXTYPE__": typing.Literal["1dNLfit"],
+    "@type": typing.NotRequired[typing.Literal["afni/1dNLfit"]],
+    "expression": str,
+    "independent_variable": str,
+    "parameters": list[str],
+    "dependent_data": InputPathType,
+    "method": typing.NotRequired[int | None],
+})
+V1dNlfitParametersTagged = typing.TypedDict('V1dNlfitParametersTagged', {
+    "@type": typing.Literal["afni/1dNLfit"],
     "expression": str,
     "independent_variable": str,
     "parameters": list[str],
     "dependent_data": InputPathType,
     "method": typing.NotRequired[int | None],
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "1dNLfit": v_1d_nlfit_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 {
-        "1dNLfit": v_1d_nlfit_outputs,
-    }.get(t)
 
 
 class V1dNlfitOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_1d_nlfit(...)`.
+    Output object returned when calling `V1dNlfitParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -72,7 +48,7 @@ def v_1d_nlfit_params(
     parameters: list[str],
     dependent_data: InputPathType,
     method: int | None = None,
-) -> V1dNlfitParameters:
+) -> V1dNlfitParametersTagged:
     """
     Build parameters.
     
@@ -99,7 +75,7 @@ def v_1d_nlfit_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "1dNLfit",
+        "@type": "afni/1dNLfit",
         "expression": expression,
         "independent_variable": independent_variable,
         "parameters": parameters,
@@ -127,24 +103,24 @@ def v_1d_nlfit_cargs(
     cargs.append("1dNLfit")
     cargs.extend([
         "-expr",
-        params.get("expression")
+        params.get("expression", None)
     ])
     cargs.extend([
         "-indvar",
-        params.get("independent_variable")
+        params.get("independent_variable", None)
     ])
     cargs.extend([
         "-param",
-        *params.get("parameters")
+        *params.get("parameters", None)
     ])
     cargs.extend([
         "-depdata",
-        execution.input_file(params.get("dependent_data"))
+        execution.input_file(params.get("dependent_data", None))
     ])
-    if params.get("method") is not None:
+    if params.get("method", None) is not None:
         cargs.extend([
             "-meth",
-            str(params.get("method"))
+            str(params.get("method", None))
         ])
     return cargs
 
@@ -171,9 +147,11 @@ def v_1d_nlfit_outputs(
 
 def v_1d_nlfit_execute(
     params: V1dNlfitParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V1dNlfitOutputs:
     """
+    1dNLfit
+    
     Program to fit a model to a vector of data. The model is given by a symbolic
     expression, with parameters to be estimated.
     
@@ -183,10 +161,12 @@ def v_1d_nlfit_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V1dNlfitOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_1D_NLFIT_METADATA)
     params = execution.params(params)
     cargs = v_1d_nlfit_cargs(params, execution)
     ret = v_1d_nlfit_outputs(params, execution)
@@ -203,6 +183,8 @@ def v_1d_nlfit(
     runner: Runner | None = None,
 ) -> V1dNlfitOutputs:
     """
+    1dNLfit
+    
     Program to fit a model to a vector of data. The model is given by a symbolic
     expression, with parameters to be estimated.
     
@@ -233,8 +215,6 @@ def v_1d_nlfit(
     Returns:
         NamedTuple of outputs (described in `V1dNlfitOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_1D_NLFIT_METADATA)
     params = v_1d_nlfit_params(
         expression=expression,
         independent_variable=independent_variable,
@@ -242,13 +222,13 @@ def v_1d_nlfit(
         dependent_data=dependent_data,
         method=method,
     )
-    return v_1d_nlfit_execute(params, execution)
+    return v_1d_nlfit_execute(params, runner)
 
 
 __all__ = [
     "V1dNlfitOutputs",
-    "V1dNlfitParameters",
     "V_1D_NLFIT_METADATA",
     "v_1d_nlfit",
+    "v_1d_nlfit_execute",
     "v_1d_nlfit_params",
 ]

niwrap_afni/afni/v_1d_rplot.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_1D_RPLOT_METADATA = Metadata(
-    id="27480b27710c773f065fbed14ca57509c39a6ae0.boutiques",
+    id="ada833cf3639916d08dbfba7a7122aa08a2a9451.boutiques",
     name="1dRplot",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,29 @@ V_1D_RPLOT_METADATA = Metadata(
 
 
 V1dRplotParameters = typing.TypedDict('V1dRplotParameters', {
-    "__STYXTYPE__": typing.Literal["1dRplot"],
+    "@type": typing.NotRequired[typing.Literal["afni/1dRplot"]],
+    "input_file": InputPathType,
+    "output_prefix": typing.NotRequired[str | None],
+    "save_size": typing.NotRequired[list[float] | None],
+    "TR": typing.NotRequired[float | None],
+    "title": typing.NotRequired[str | None],
+    "input_type": typing.NotRequired[typing.Literal["VOLREG", "XMAT"] | None],
+    "legend_font_size": typing.NotRequired[float | None],
+    "left_y_margin_text": typing.NotRequired[str | None],
+    "right_y_margin_text": typing.NotRequired[str | None],
+    "x_axis_label": typing.NotRequired[str | None],
+    "y_axis_label": typing.NotRequired[str | None],
+    "x_axis_range": typing.NotRequired[list[float] | None],
+    "y_axis_range": typing.NotRequired[list[float] | None],
+    "plot_char": typing.NotRequired[list[str] | None],
+    "group_labels": typing.NotRequired[list[str] | None],
+    "legend_show": bool,
+    "legend_position": typing.NotRequired[typing.Literal["bottomright", "bottom", "bottomleft", "left", "topleft", "top", "topright", "right", "center"] | None],
+    "save_plot": bool,
+    "column_name_show": bool,
+})
+V1dRplotParametersTagged = typing.TypedDict('V1dRplotParametersTagged', {
+    "@type": typing.Literal["afni/1dRplot"],
     "input_file": InputPathType,
     "output_prefix": typing.NotRequired[str | None],
     "save_size": typing.NotRequired[list[float] | None],
@@ -35,43 +57,11 @@ V1dRplotParameters = typing.TypedDict('V1dRplotParameters', {
     "save_plot": bool,
     "column_name_show": bool,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "1dRplot": v_1d_rplot_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 {
-        "1dRplot": v_1d_rplot_outputs,
-    }.get(t)
 
 
 class V1dRplotOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_1d_rplot(...)`.
+    Output object returned when calling `V1dRplotParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -99,7 +89,7 @@ def v_1d_rplot_params(
     legend_position: typing.Literal["bottomright", "bottom", "bottomleft", "left", "topleft", "top", "topright", "right", "center"] | None = None,
     save_plot: bool = False,
     column_name_show: bool = False,
-) -> V1dRplotParameters:
+) -> V1dRplotParametersTagged:
     """
     Build parameters.
     
@@ -131,7 +121,7 @@ def v_1d_rplot_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "1dRplot",
+        "@type": "afni/1dRplot",
         "input_file": input_file,
         "legend_show": legend_show,
         "save_plot": save_plot,
@@ -187,88 +177,88 @@ def v_1d_rplot_cargs(
     cargs.append("1dRplot")
     cargs.extend([
         "-input",
-        execution.input_file(params.get("input_file"))
+        execution.input_file(params.get("input_file", None))
     ])
-    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("save_size") is not None:
+    if params.get("save_size", None) is not None:
         cargs.extend([
             "-save.size",
-            *map(str, params.get("save_size"))
+            *map(str, params.get("save_size", None))
         ])
-    if params.get("TR") is not None:
+    if params.get("TR", None) is not None:
         cargs.extend([
             "-TR",
-            str(params.get("TR"))
+            str(params.get("TR", None))
         ])
-    if params.get("title") is not None:
+    if params.get("title", None) is not None:
         cargs.extend([
             "-title",
-            params.get("title")
+            params.get("title", None)
         ])
-    if params.get("input_type") is not None:
+    if params.get("input_type", None) is not None:
         cargs.extend([
             "-input_type",
-            params.get("input_type")
+            params.get("input_type", None)
         ])
-    if params.get("legend_font_size") is not None:
+    if params.get("legend_font_size", None) is not None:
         cargs.extend([
             "-leg.fontsize",
-            str(params.get("legend_font_size"))
+            str(params.get("legend_font_size", None))
         ])
-    if params.get("left_y_margin_text") is not None:
+    if params.get("left_y_margin_text", None) is not None:
         cargs.extend([
             "-col.text.lym",
-            params.get("left_y_margin_text")
+            params.get("left_y_margin_text", None)
         ])
-    if params.get("right_y_margin_text") is not None:
+    if params.get("right_y_margin_text", None) is not None:
         cargs.extend([
             "-col.text.rym",
-            params.get("right_y_margin_text")
+            params.get("right_y_margin_text", None)
         ])
-    if params.get("x_axis_label") is not None:
+    if params.get("x_axis_label", None) is not None:
         cargs.extend([
             "-xax.label",
-            params.get("x_axis_label")
+            params.get("x_axis_label", None)
         ])
-    if params.get("y_axis_label") is not None:
+    if params.get("y_axis_label", None) is not None:
         cargs.extend([
             "-yax.label",
-            params.get("y_axis_label")
+            params.get("y_axis_label", None)
         ])
-    if params.get("x_axis_range") is not None:
+    if params.get("x_axis_range", None) is not None:
         cargs.extend([
             "-xax.lim",
-            *map(str, params.get("x_axis_range"))
+            *map(str, params.get("x_axis_range", None))
         ])
-    if params.get("y_axis_range") is not None:
+    if params.get("y_axis_range", None) is not None:
         cargs.extend([
             "-yax.lim",
-            *map(str, params.get("y_axis_range"))
+            *map(str, params.get("y_axis_range", None))
         ])
-    if params.get("plot_char") is not None:
+    if params.get("plot_char", None) is not None:
         cargs.extend([
             "-col.plot.char",
-            *params.get("plot_char")
+            *params.get("plot_char", None)
         ])
-    if params.get("group_labels") is not None:
+    if params.get("group_labels", None) is not None:
         cargs.extend([
             "-grp.label",
-            *params.get("group_labels")
+            *params.get("group_labels", None)
         ])
-    if params.get("legend_show"):
+    if params.get("legend_show", False):
         cargs.append("-leg.show")
-    if params.get("legend_position") is not None:
+    if params.get("legend_position", None) is not None:
         cargs.extend([
             "-leg.position",
-            params.get("legend_position")
+            params.get("legend_position", None)
         ])
-    if params.get("save_plot"):
+    if params.get("save_plot", False):
         cargs.append("-save")
-    if params.get("column_name_show"):
+    if params.get("column_name_show", False):
         cargs.append("-col.name.show")
     return cargs
 
@@ -288,16 +278,18 @@ def v_1d_rplot_outputs(
     """
     ret = V1dRplotOutputs(
         root=execution.output_file("."),
-        output_plot=execution.output_file(params.get("output_prefix") + "*.jpg") if (params.get("output_prefix") is not None) else None,
+        output_plot=execution.output_file(params.get("output_prefix", None) + ".jpg") if (params.get("output_prefix") is not None) else None,
     )
     return ret
 
 
 def v_1d_rplot_execute(
     params: V1dRplotParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V1dRplotOutputs:
     """
+    1dRplot
+    
     Program for plotting a 1D file.
     
     Author: AFNI Developers
@@ -306,10 +298,12 @@ def v_1d_rplot_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V1dRplotOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_1D_RPLOT_METADATA)
     params = execution.params(params)
     cargs = v_1d_rplot_cargs(params, execution)
     ret = v_1d_rplot_outputs(params, execution)
@@ -340,6 +334,8 @@ def v_1d_rplot(
     runner: Runner | None = None,
 ) -> V1dRplotOutputs:
     """
+    1dRplot
+    
     Program for plotting a 1D file.
     
     Author: AFNI Developers
@@ -374,8 +370,6 @@ def v_1d_rplot(
     Returns:
         NamedTuple of outputs (described in `V1dRplotOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_1D_RPLOT_METADATA)
     params = v_1d_rplot_params(
         input_file=input_file,
         output_prefix=output_prefix,
@@ -397,13 +391,13 @@ def v_1d_rplot(
         save_plot=save_plot,
         column_name_show=column_name_show,
     )
-    return v_1d_rplot_execute(params, execution)
+    return v_1d_rplot_execute(params, runner)
 
 
 __all__ = [
     "V1dRplotOutputs",
-    "V1dRplotParameters",
     "V_1D_RPLOT_METADATA",
     "v_1d_rplot",
+    "v_1d_rplot_execute",
     "v_1d_rplot_params",
 ]